src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java

*** 18,41 ****
   */
  // $Id: XPathImpl.java,v 1.2 2005/08/16 22:41:08 jeffsuttor Exp $
  
  package com.sun.org.apache.xpath.internal.jaxp;
  
! import javax.xml.namespace.QName;
  import javax.xml.namespace.NamespaceContext;
! import javax.xml.xpath.XPathExpressionException;
  import javax.xml.xpath.XPathConstants;
  import javax.xml.xpath.XPathFunctionResolver;
  import javax.xml.xpath.XPathVariableResolver;
! import javax.xml.xpath.XPathExpression;
! import com.sun.org.apache.xpath.internal.*;
! import com.sun.org.apache.xpath.internal.objects.XObject;
! import com.sun.org.apache.xalan.internal.utils.FeatureManager;
  import org.w3c.dom.Document;
  import org.xml.sax.InputSource;
- import javax.xml.transform.TransformerException;
- import javax.xml.xpath.XPathEvaluationResult;
  
  /**
   * The XPathImpl class provides implementation for the methods defined  in
   * javax.xml.xpath.XPath interface. This provides simple access to the results
   * of an XPath expression.
--- 18,41 ----
   */
  // $Id: XPathImpl.java,v 1.2 2005/08/16 22:41:08 jeffsuttor Exp $
  
  package com.sun.org.apache.xpath.internal.jaxp;
  
! import com.sun.org.apache.xpath.internal.*;
! import com.sun.org.apache.xpath.internal.objects.XObject;
  import javax.xml.namespace.NamespaceContext;
! import javax.xml.namespace.QName;
! import javax.xml.transform.TransformerException;
  import javax.xml.xpath.XPathConstants;
+ import javax.xml.xpath.XPathEvaluationResult;
+ import javax.xml.xpath.XPathExpression;
+ import javax.xml.xpath.XPathExpressionException;
  import javax.xml.xpath.XPathFunctionResolver;
  import javax.xml.xpath.XPathVariableResolver;
! import jdk.xml.internal.JdkXmlFeatures;
  import org.w3c.dom.Document;
  import org.xml.sax.InputSource;
  
  /**
   * The XPathImpl class provides implementation for the methods defined  in
   * javax.xml.xpath.XPath interface. This provides simple access to the results
   * of an XPath expression.
*** 52,67 ****
      private XPathVariableResolver origVariableResolver;
      private XPathFunctionResolver origFunctionResolver;
      private NamespaceContext namespaceContext=null;
  
      XPathImpl(XPathVariableResolver vr, XPathFunctionResolver fr) {
!         this(vr, fr, false, true, new FeatureManager());
      }
  
      XPathImpl(XPathVariableResolver vr, XPathFunctionResolver fr,
              boolean featureSecureProcessing, boolean useServiceMechanism,
!             FeatureManager featureManager) {
          this.origVariableResolver = this.variableResolver = vr;
          this.origFunctionResolver = this.functionResolver = fr;
          this.featureSecureProcessing = featureSecureProcessing;
          this.useServiceMechanism = useServiceMechanism;
          this.featureManager = featureManager;
--- 52,67 ----
      private XPathVariableResolver origVariableResolver;
      private XPathFunctionResolver origFunctionResolver;
      private NamespaceContext namespaceContext=null;
  
      XPathImpl(XPathVariableResolver vr, XPathFunctionResolver fr) {
!         this(vr, fr, false, true, new JdkXmlFeatures(false));
      }
  
      XPathImpl(XPathVariableResolver vr, XPathFunctionResolver fr,
              boolean featureSecureProcessing, boolean useServiceMechanism,
!             JdkXmlFeatures featureManager) {
          this.origVariableResolver = this.variableResolver = vr;
          this.origFunctionResolver = this.functionResolver = fr;
          this.featureSecureProcessing = featureSecureProcessing;
          this.useServiceMechanism = useServiceMechanism;
          this.featureManager = featureManager;