commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmi...@apache.org
Subject cvs commit: jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/container ContainerPointerFactory.java
Date Wed, 24 Apr 2002 04:05:41 GMT
dmitri      02/04/23 21:05:41

  Modified:    jxpath/src/java/org/apache/commons/jxpath/ri/compiler
                        VariableReference.java TreeCompiler.java Step.java
                        ProcessingInstructionTest.java Path.java
                        Operation.java NodeTypeTest.java NodeTest.java
                        NodeNameTest.java LocationPath.java
                        ExtensionFunction.java ExpressionPath.java
                        Expression.java CoreOperation.java
                        CoreFunction.java Constant.java
               jxpath/src/java/org/apache/commons/jxpath/ri/model
                        VariablePointer.java NodePointerFactory.java
               jxpath/src/java/org/apache/commons/jxpath/util
                        ValueUtils.java TypeUtils.java
               jxpath/src/java/org/apache/commons/jxpath/servlet
                        ServletRequestHandler.java
                        ServletContextHandler.java
                        PageScopeContextHandler.java PageScopeContext.java
                        PageContextHandler.java KeywordVariables.java
                        JXPathServletContexts.java HttpSessionHandler.java
                        Constants.java
               jxpath/src/java/org/apache/commons/jxpath/ri/axes
                        UnionContext.java SelfContext.java RootContext.java
                        PredicateContext.java
                        PrecedingOrFollowingContext.java ParentContext.java
                        NamespaceContext.java InitialContext.java
                        DescendantContext.java ChildContext.java
               jxpath/src/java/org/apache/commons/jxpath/ri QName.java
                        Parser.java JXPathContextReferenceImpl.java
                        EvalContext.java Compiler.java
               jxpath/src/java/org/apache/commons/jxpath/ri/model/beans
                        PropertyPointer.java PropertyOwnerPointer.java
                        PropertyIterator.java NullPropertyPointer.java
                        NullPointer.java NullElementPointer.java
                        LangAttributePointer.java
                        DynamicPropertyPointer.java
                        DynamicPointerFactory.java DynamicPointer.java
                        CollectionPointerFactory.java
                        CollectionPointer.java
               jxpath/src/java/org/apache/commons/jxpath/ri/model/dom
                        NamespacePointer.java DOMPointerFactory.java
                        DOMNodePointer.java DOMNodeIterator.java
                        DOMNamespaceIterator.java DOMAttributePointer.java
                        DOMAttributeIterator.java
               jxpath/src/java/org/apache/commons/jxpath/functions
                        MethodFunction.java ConstructorFunction.java
               jxpath/src/java/org/apache/commons/jxpath
                        JXPathContextFactory.java Functions.java
                        Function.java ExpressionContext.java Container.java
               jxpath/src/java/org/apache/commons/jxpath/ri/model/container
                        ContainerPointerFactory.java
  Log:
  Organized imports
  
  Revision  Changes    Path
  1.3       +5 -7      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/VariableReference.java
  
  Index: VariableReference.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/VariableReference.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VariableReference.java	21 Apr 2002 21:52:32 -0000	1.2
  +++ VariableReference.java	24 Apr 2002 04:05:38 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/VariableReference.java,v 1.2 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/VariableReference.java,v 1.3 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,15 +61,13 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
  -
  -import org.apache.commons.jxpath.ri.*;
  +import org.apache.commons.jxpath.ri.QName;
   
   /**
    * An element of the compile tree holding a variable reference.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.2 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.3 $ $Date: 2002/04/24 04:05:38 $
    */
   public class VariableReference extends Expression {
   
  
  
  
  1.4       +5 -7      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/TreeCompiler.java
  
  Index: TreeCompiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/TreeCompiler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TreeCompiler.java	21 Apr 2002 21:52:32 -0000	1.3
  +++ TreeCompiler.java	24 Apr 2002 04:05:38 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/TreeCompiler.java,v 1.3 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.3 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/TreeCompiler.java,v 1.4 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.4 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,14 +61,12 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
  -
  -import org.apache.commons.jxpath.ri.*;
   import org.apache.commons.jxpath.ri.Compiler;
  +import org.apache.commons.jxpath.ri.QName;
   
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.3 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.4 $ $Date: 2002/04/24 04:05:38 $
    */
   public class TreeCompiler implements Compiler {
   
  
  
  
  1.3       +4 -6      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Step.java
  
  Index: Step.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Step.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Step.java	21 Sep 2001 23:22:44 -0000	1.2
  +++ Step.java	24 Apr 2002 04:05:38 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Step.java,v 1.2 2001/09/21 23:22:44 dmitri Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/09/21 23:22:44 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Step.java,v 1.3 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,13 +61,11 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
  -
   import org.apache.commons.jxpath.ri.Compiler;
   
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.2 $ $Date: 2001/09/21 23:22:44 $
  + * @version $Revision: 1.3 $ $Date: 2002/04/24 04:05:38 $
    */
   public class Step {
       private int axis;
  
  
  
  1.3       +4 -6      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/ProcessingInstructionTest.java
  
  Index: ProcessingInstructionTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/ProcessingInstructionTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProcessingInstructionTest.java	21 Sep 2001 23:22:44 -0000	1.2
  +++ ProcessingInstructionTest.java	24 Apr 2002 04:05:38 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/ProcessingInstructionTest.java,v 1.2 2001/09/21 23:22:44 dmitri Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/09/21 23:22:44 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/ProcessingInstructionTest.java,v 1.3 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,11 +61,9 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
  -
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.2 $ $Date: 2001/09/21 23:22:44 $
  + * @version $Revision: 1.3 $ $Date: 2002/04/24 04:05:38 $
    */
   public class ProcessingInstructionTest extends NodeTest {
       private String target;
  
  
  
  1.3       +4 -5      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Path.java
  
  Index: Path.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Path.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Path.java	10 Apr 2002 03:40:20 -0000	1.2
  +++ Path.java	24 Apr 2002 04:05:38 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Path.java,v 1.2 2002/04/10 03:40:20 dmitri Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/04/10 03:40:20 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Path.java,v 1.3 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,12 +61,11 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
   import org.apache.commons.jxpath.ri.Compiler;
   
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.2 $ $Date: 2002/04/10 03:40:20 $
  + * @version $Revision: 1.3 $ $Date: 2002/04/24 04:05:38 $
    */
   public class Path extends Expression {
   
  
  
  
  1.2       +4 -6      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Operation.java
  
  Index: Operation.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Operation.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Operation.java	23 Aug 2001 00:46:59 -0000	1.1
  +++ Operation.java	24 Apr 2002 04:05:38 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Operation.java,v 1.1 2001/08/23 00:46:59 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/08/23 00:46:59 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Operation.java,v 1.2 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,11 +61,9 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
  -
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2001/08/23 00:46:59 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:38 $
    */
   public class Operation extends Expression {
   
  
  
  
  1.3       +4 -5      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/NodeTypeTest.java
  
  Index: NodeTypeTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/NodeTypeTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NodeTypeTest.java	21 Sep 2001 23:22:44 -0000	1.2
  +++ NodeTypeTest.java	24 Apr 2002 04:05:38 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/NodeTypeTest.java,v 1.2 2001/09/21 23:22:44 dmitri Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/09/21 23:22:44 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/NodeTypeTest.java,v 1.3 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,12 +61,11 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
   import org.apache.commons.jxpath.ri.Compiler;
   
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.2 $ $Date: 2001/09/21 23:22:44 $
  + * @version $Revision: 1.3 $ $Date: 2002/04/24 04:05:38 $
    */
   public class NodeTypeTest extends NodeTest {
       private int nodeType;
  
  
  
  1.2       +3 -6      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/NodeTest.java
  
  Index: NodeTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/NodeTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NodeTest.java	21 Sep 2001 23:22:44 -0000	1.1
  +++ NodeTest.java	24 Apr 2002 04:05:38 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/NodeTest.java,v 1.1 2001/09/21 23:22:44 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/09/21 23:22:44 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/NodeTest.java,v 1.2 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,12 +61,9 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
  -import org.apache.commons.jxpath.ri.Compiler;
  -
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2001/09/21 23:22:44 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:38 $
    */
   public abstract class NodeTest {
   }
  
  
  
  1.4       +5 -7      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/NodeNameTest.java
  
  Index: NodeNameTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/NodeNameTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NodeNameTest.java	21 Apr 2002 21:52:32 -0000	1.3
  +++ NodeNameTest.java	24 Apr 2002 04:05:38 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/NodeNameTest.java,v 1.3 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.3 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/NodeNameTest.java,v 1.4 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.4 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,13 +61,11 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
  -
  -import org.apache.commons.jxpath.ri.*;
  +import org.apache.commons.jxpath.ri.QName;
   
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.3 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.4 $ $Date: 2002/04/24 04:05:38 $
    */
   public class NodeNameTest extends NodeTest {
       private QName qname;
  
  
  
  1.4       +4 -6      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/LocationPath.java
  
  Index: LocationPath.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/LocationPath.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LocationPath.java	10 Apr 2002 03:40:20 -0000	1.3
  +++ LocationPath.java	24 Apr 2002 04:05:38 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/LocationPath.java,v 1.3 2002/04/10 03:40:20 dmitri Exp $
  - * $Revision: 1.3 $
  - * $Date: 2002/04/10 03:40:20 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/LocationPath.java,v 1.4 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.4 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,11 +61,9 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
  -
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.3 $ $Date: 2002/04/10 03:40:20 $
  + * @version $Revision: 1.4 $ $Date: 2002/04/24 04:05:38 $
    */
   public class LocationPath extends Path {
   
  
  
  
  1.4       +5 -7      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java
  
  Index: ExtensionFunction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ExtensionFunction.java	21 Apr 2002 21:52:32 -0000	1.3
  +++ ExtensionFunction.java	24 Apr 2002 04:05:38 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java,v 1.3 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.3 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java,v 1.4 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.4 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,15 +61,13 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
  -
  -import org.apache.commons.jxpath.ri.*;
  +import org.apache.commons.jxpath.ri.QName;
   
   /**
    * Represents an element of the parse tree representing an extension function call.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.3 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.4 $ $Date: 2002/04/24 04:05:38 $
    */
   public class ExtensionFunction extends Operation {
   
  
  
  
  1.3       +4 -6      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java
  
  Index: ExpressionPath.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExpressionPath.java	10 Apr 2002 03:40:20 -0000	1.2
  +++ ExpressionPath.java	24 Apr 2002 04:05:38 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java,v 1.2 2002/04/10 03:40:20 dmitri Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/04/10 03:40:20 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java,v 1.3 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,14 +61,12 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
  -
   /**
    * An element of the parse tree that represents an expression path, which is
    * a path that starts with an expression like a function call: <code>getFoo(.)/bar</code>.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.2 $ $Date: 2002/04/10 03:40:20 $
  + * @version $Revision: 1.3 $ $Date: 2002/04/24 04:05:38 $
    */
   public class ExpressionPath extends Path {
   
  
  
  
  1.2       +4 -6      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Expression.java
  
  Index: Expression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Expression.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Expression.java	23 Aug 2001 00:46:59 -0000	1.1
  +++ Expression.java	24 Apr 2002 04:05:38 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Expression.java,v 1.1 2001/08/23 00:46:59 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/08/23 00:46:59 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Expression.java,v 1.2 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,8 +61,6 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
  -
   /**
    * Common superclass for several types of nodes in the parse tree. Provides
    * APIs for optimization of evaluation of expressions.  Specifically, an
  @@ -71,7 +69,7 @@
    * provides that hint.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2001/08/23 00:46:59 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:38 $
    */
   public abstract class Expression {
   
  
  
  
  1.4       +5 -7      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperation.java
  
  Index: CoreOperation.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperation.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CoreOperation.java	21 Apr 2002 21:52:32 -0000	1.3
  +++ CoreOperation.java	24 Apr 2002 04:05:38 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperation.java,v 1.3 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.3 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/CoreOperation.java,v 1.4 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.4 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,17 +61,15 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
  -
  -import org.apache.commons.jxpath.ri.*;
   import org.apache.commons.jxpath.ri.Compiler;
  +import org.apache.commons.jxpath.ri.QName;
   
   /**
    * A compile tree element representing one of the core operations like "+",
    * "-", "*" etc.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.3 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.4 $ $Date: 2002/04/24 04:05:38 $
    */
   public class CoreOperation extends Operation {
   
  
  
  
  1.3       +4 -6      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/CoreFunction.java
  
  Index: CoreFunction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/CoreFunction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CoreFunction.java	21 Apr 2002 21:52:32 -0000	1.2
  +++ CoreFunction.java	24 Apr 2002 04:05:38 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/CoreFunction.java,v 1.2 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/CoreFunction.java,v 1.3 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,8 +61,6 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
  -
   import org.apache.commons.jxpath.ri.Compiler;
   
   /**
  @@ -70,7 +68,7 @@
    * like "position()" or "number()".
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.2 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.3 $ $Date: 2002/04/24 04:05:38 $
    */
   public class CoreFunction extends Operation {
   
  
  
  
  1.2       +4 -6      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Constant.java
  
  Index: Constant.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Constant.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Constant.java	23 Aug 2001 00:46:59 -0000	1.1
  +++ Constant.java	24 Apr 2002 04:05:38 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Constant.java,v 1.1 2001/08/23 00:46:59 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/08/23 00:46:59 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Constant.java,v 1.2 2002/04/24 04:05:38 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:38 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,13 +61,11 @@
    */
   package org.apache.commons.jxpath.ri.compiler;
   
  -import java.util.*;
  -
   /**
    * A compile tree element containing a constant number or string.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2001/08/23 00:46:59 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:38 $
    */
   public class Constant extends Expression {
   
  
  
  
  1.2       +10 -11    jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/VariablePointer.java
  
  Index: VariablePointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/VariablePointer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- VariablePointer.java	21 Apr 2002 21:52:32 -0000	1.1
  +++ VariablePointer.java	24 Apr 2002 04:05:39 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/VariablePointer.java,v 1.1 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/VariablePointer.java,v 1.2 2002/04/24 04:05:39 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:39 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,19 +61,18 @@
    */
   package org.apache.commons.jxpath.ri.model;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.*;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.ri.model.beans.*;
  -import org.apache.commons.jxpath.util.*;
  -
  -import java.util.*;
  +import org.apache.commons.jxpath.AbstractFactory;
  +import org.apache.commons.jxpath.JXPathContext;
  +import org.apache.commons.jxpath.Variables;
  +import org.apache.commons.jxpath.ri.QName;
  +import org.apache.commons.jxpath.ri.compiler.NodeTest;
  +import org.apache.commons.jxpath.util.ValueUtils;
   
   /**
    * Pointer to a context variable.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:39 $
    */
   public class VariablePointer extends NodePointer {
       private Variables variables;
  
  
  
  1.2       +5 -5      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/NodePointerFactory.java
  
  Index: NodePointerFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/NodePointerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NodePointerFactory.java	21 Apr 2002 21:52:32 -0000	1.1
  +++ NodePointerFactory.java	24 Apr 2002 04:05:39 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/NodePointerFactory.java,v 1.1 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/NodePointerFactory.java,v 1.2 2002/04/24 04:05:39 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:39 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,9 +61,9 @@
    */
   package org.apache.commons.jxpath.ri.model;
   
  -import org.apache.commons.jxpath.ri.QName;
  +import java.util.Locale;
   
  -import java.util.*;
  +import org.apache.commons.jxpath.ri.QName;
   
   /**
    * Creates NodePointers for objects of a certain type.
  @@ -71,7 +71,7 @@
    * by the "getOrder" method and always queried in that order.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:39 $
    */
   public interface NodePointerFactory {
   
  
  
  
  1.2       +8 -10     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/util/ValueUtils.java
  
  Index: ValueUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/util/ValueUtils.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ValueUtils.java	21 Apr 2002 21:52:34 -0000	1.1
  +++ ValueUtils.java	24 Apr 2002 04:05:39 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/util/ValueUtils.java,v 1.1 2002/04/21 21:52:34 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:34 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/util/ValueUtils.java,v 1.2 2002/04/24 04:05:39 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:39 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,18 +61,16 @@
    */
   package org.apache.commons.jxpath.util;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.functions.*;
  -
  +import java.beans.IndexedPropertyDescriptor;
  +import java.beans.PropertyDescriptor;
   import java.lang.reflect.*;
   import java.util.*;
  -import java.beans.*;
  +
  +import org.apache.commons.jxpath.DynamicPropertyHandler;
   
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:34 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:39 $
    */
   public class ValueUtils {
       private static Map dynamicPropertyHandlerMap = new HashMap();
  
  
  
  1.2       +8 -6      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/util/TypeUtils.java
  
  Index: TypeUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/util/TypeUtils.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TypeUtils.java	21 Apr 2002 21:52:34 -0000	1.1
  +++ TypeUtils.java	24 Apr 2002 04:05:39 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/util/TypeUtils.java,v 1.1 2002/04/21 21:52:34 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:34 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/util/TypeUtils.java,v 1.2 2002/04/24 04:05:39 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:39 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,13 +61,15 @@
    */
   package org.apache.commons.jxpath.util;
   
  -import java.util.*;
   import java.lang.reflect.*;
  -import org.apache.commons.jxpath.*;
  +import java.util.*;
  +
  +import org.apache.commons.jxpath.ExpressionContext;
  +import org.apache.commons.jxpath.Pointer;
   
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:34 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:39 $
    */
   public class TypeUtils {
   
  
  
  
  1.2       +4 -3      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/ServletRequestHandler.java
  
  Index: ServletRequestHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/ServletRequestHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServletRequestHandler.java	8 Sep 2001 21:01:00 -0000	1.1
  +++ ServletRequestHandler.java	24 Apr 2002 04:05:39 -0000	1.2
  @@ -55,16 +55,17 @@
   
   package org.apache.commons.jxpath.servlet;
   
  -import org.apache.commons.jxpath.*;
  +import java.util.Enumeration;
  +
   import javax.servlet.ServletRequest;
  -import java.util.*;
  +import org.apache.commons.jxpath.DynamicPropertyHandler;
   
   /**
    * Implementation of the DynamicPropertyHandler interface that provides
    * access to attributes of a ServletRequest.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2001/09/08 21:01:00 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:39 $
    */
   public class ServletRequestHandler implements DynamicPropertyHandler {
   
  
  
  
  1.2       +4 -3      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java
  
  Index: ServletContextHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServletContextHandler.java	8 Sep 2001 21:01:00 -0000	1.1
  +++ ServletContextHandler.java	24 Apr 2002 04:05:39 -0000	1.2
  @@ -55,16 +55,17 @@
   
   package org.apache.commons.jxpath.servlet;
   
  -import org.apache.commons.jxpath.*;
  +import java.util.Enumeration;
  +
   import javax.servlet.ServletContext;
  -import java.util.*;
  +import org.apache.commons.jxpath.DynamicPropertyHandler;
   
   /**
    * Implementation of the DynamicPropertyHandler interface that provides
    * access to attributes of a ServletContext.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2001/09/08 21:01:00 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:39 $
    */
   public class ServletContextHandler implements DynamicPropertyHandler {
   
  
  
  
  1.2       +4 -4      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/PageScopeContextHandler.java
  
  Index: PageScopeContextHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/PageScopeContextHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PageScopeContextHandler.java	8 Sep 2001 21:01:00 -0000	1.1
  +++ PageScopeContextHandler.java	24 Apr 2002 04:05:39 -0000	1.2
  @@ -55,16 +55,16 @@
   
   package org.apache.commons.jxpath.servlet;
   
  -import org.apache.commons.jxpath.*;
  -import javax.servlet.jsp.*;
  -import java.util.*;
  +import java.util.Enumeration;
  +
  +import org.apache.commons.jxpath.DynamicPropertyHandler;
   
   /**
    * Implementation of the DynamicPropertyHandler interface that provides
    * access to attributes of a PageScopeContext.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2001/09/08 21:01:00 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:39 $
    */
   public class PageScopeContextHandler implements DynamicPropertyHandler {
   
  
  
  
  1.2       +4 -4      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/PageScopeContext.java
  
  Index: PageScopeContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/PageScopeContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PageScopeContext.java	8 Sep 2001 21:01:00 -0000	1.1
  +++ PageScopeContext.java	24 Apr 2002 04:05:39 -0000	1.2
  @@ -55,9 +55,9 @@
   
   package org.apache.commons.jxpath.servlet;
   
  -import org.apache.commons.jxpath.*;
  -import javax.servlet.jsp.*;
  -import java.util.*;
  +import java.util.Enumeration;
  +
  +import javax.servlet.jsp.PageContext;
   
   /**
    * A lightweight wrapper for PageContext that restricts access
  @@ -66,7 +66,7 @@
    * "$page/foo" would only look in the "page" scope.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2001/09/08 21:01:00 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:39 $
    */
   public class PageScopeContext {
       private PageContext pageContext;
  
  
  
  1.2       +6 -4      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/PageContextHandler.java
  
  Index: PageContextHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/PageContextHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PageContextHandler.java	8 Sep 2001 21:01:00 -0000	1.1
  +++ PageContextHandler.java	24 Apr 2002 04:05:39 -0000	1.2
  @@ -55,16 +55,18 @@
   
   package org.apache.commons.jxpath.servlet;
   
  -import org.apache.commons.jxpath.*;
  -import javax.servlet.jsp.*;
  -import java.util.*;
  +import java.util.ArrayList;
  +import java.util.Enumeration;
  +
  +import javax.servlet.jsp.PageContext;
  +import org.apache.commons.jxpath.DynamicPropertyHandler;
   
   /**
    * Implementation of the DynamicPropertyHandler interface that provides
    * access to attributes of a PageContext in all scopes.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2001/09/08 21:01:00 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:39 $
    */
   public class PageContextHandler implements DynamicPropertyHandler {
   
  
  
  
  1.2       +2 -4      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/KeywordVariables.java
  
  Index: KeywordVariables.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/KeywordVariables.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- KeywordVariables.java	8 Sep 2001 21:01:00 -0000	1.1
  +++ KeywordVariables.java	24 Apr 2002 04:05:39 -0000	1.2
  @@ -55,16 +55,14 @@
   
   package org.apache.commons.jxpath.servlet;
   
  -import org.apache.commons.jxpath.*;
  -import javax.servlet.ServletContext;
  -import java.util.*;
  +import org.apache.commons.jxpath.Variables;
   
   /**
    * Implementation of the Variables interface that provides access
    * to a single object using a reserved name (keyword).
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2001/09/08 21:01:00 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:39 $
    */
   public class KeywordVariables implements Variables {
   
  
  
  
  1.2       +5 -3      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/JXPathServletContexts.java
  
  Index: JXPathServletContexts.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/JXPathServletContexts.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JXPathServletContexts.java	8 Sep 2001 21:01:00 -0000	1.1
  +++ JXPathServletContexts.java	24 Apr 2002 04:05:39 -0000	1.2
  @@ -55,12 +55,14 @@
   
   package org.apache.commons.jxpath.servlet;
   
  -import org.apache.commons.jxpath.*;
  -import javax.servlet.ServletRequest;
   import javax.servlet.ServletContext;
  +import javax.servlet.ServletRequest;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpSession;
   import javax.servlet.jsp.PageContext;
  +import org.apache.commons.jxpath.JXPathContext;
  +import org.apache.commons.jxpath.JXPathContextFactory;
  +import org.apache.commons.jxpath.JXPathIntrospector;
   
   /**
    * Static methods that allocate and cache JXPathContexts bound to PageContext,
  @@ -100,7 +102,7 @@
    * JXPath does not automatically create sessions.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2001/09/08 21:01:00 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:39 $
    */
   public final class JXPathServletContexts {
   
  
  
  
  1.2       +4 -3      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/HttpSessionHandler.java
  
  Index: HttpSessionHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/HttpSessionHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HttpSessionHandler.java	8 Sep 2001 21:01:00 -0000	1.1
  +++ HttpSessionHandler.java	24 Apr 2002 04:05:39 -0000	1.2
  @@ -55,16 +55,17 @@
   
   package org.apache.commons.jxpath.servlet;
   
  -import org.apache.commons.jxpath.*;
  +import java.util.Enumeration;
  +
   import javax.servlet.http.HttpSession;
  -import java.util.*;
  +import org.apache.commons.jxpath.DynamicPropertyHandler;
   
   /**
    * Implementation of the DynamicPropertyHandler interface that provides
    * access to attributes of a HttpSession.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2001/09/08 21:01:00 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:39 $
    */
   public class HttpSessionHandler implements DynamicPropertyHandler {
   
  
  
  
  1.2       +1 -5      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/servlet/Constants.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Constants.java	8 Sep 2001 21:01:00 -0000	1.1
  +++ Constants.java	24 Apr 2002 04:05:39 -0000	1.2
  @@ -55,15 +55,11 @@
   
   package org.apache.commons.jxpath.servlet;
   
  -import org.apache.commons.jxpath.*;
  -import javax.servlet.ServletContext;
  -import java.util.*;
  -
   /**
    * String constants for this package.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2001/09/08 21:01:00 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:39 $
    */
   public final class Constants {
   
  
  
  
  1.5       +9 -8      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/UnionContext.java
  
  Index: UnionContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/UnionContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- UnionContext.java	21 Apr 2002 21:52:32 -0000	1.4
  +++ UnionContext.java	24 Apr 2002 04:05:39 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/UnionContext.java,v 1.4 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.4 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/UnionContext.java,v 1.5 2002/04/24 04:05:39 dmitri Exp $
  + * $Revision: 1.5 $
  + * $Date: 2002/04/24 04:05:39 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,18 +61,19 @@
    */
   package org.apache.commons.jxpath.ri.axes;
   
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.ri.model.*;
  +import java.util.ArrayList;
  +import java.util.HashSet;
  +import java.util.List;
  +
   import org.apache.commons.jxpath.ri.EvalContext;
  -import java.util.*;
  +import org.apache.commons.jxpath.ri.model.NodePointer;
   
   /**
    * EvalContext that represents a union between other contexts - result
    * of a union operation like (a | b)
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.4 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.5 $ $Date: 2002/04/24 04:05:39 $
    */
   public class UnionContext extends EvalContext {
       private boolean startedSet = false;
  
  
  
  1.6       +6 -10     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/SelfContext.java
  
  Index: SelfContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/SelfContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SelfContext.java	24 Apr 2002 03:32:48 -0000	1.5
  +++ SelfContext.java	24 Apr 2002 04:05:39 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/SelfContext.java,v 1.5 2002/04/24 03:32:48 dmitri Exp $
  - * $Revision: 1.5 $
  - * $Date: 2002/04/24 03:32:48 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/SelfContext.java,v 1.6 2002/04/24 04:05:39 dmitri Exp $
  + * $Revision: 1.6 $
  + * $Date: 2002/04/24 04:05:39 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,20 +61,16 @@
    */
   package org.apache.commons.jxpath.ri.axes;
   
  -import org.apache.commons.jxpath.ExpressionContext;
   import org.apache.commons.jxpath.Pointer;
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.ri.model.*;
   import org.apache.commons.jxpath.ri.EvalContext;
  -
  -import java.util.*;
  +import org.apache.commons.jxpath.ri.compiler.NodeTest;
  +import org.apache.commons.jxpath.ri.model.NodePointer;
   
   /**
    * EvalContext that returns the current node from the parent context if the test succeeds.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.5 $ $Date: 2002/04/24 03:32:48 $
  + * @version $Revision: 1.6 $ $Date: 2002/04/24 04:05:39 $
    */
   public class SelfContext extends EvalContext {
       private NodeTest nodeTest;
  
  
  
  1.6       +7 -10     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/RootContext.java
  
  Index: RootContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/RootContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RootContext.java	21 Apr 2002 21:52:32 -0000	1.5
  +++ RootContext.java	24 Apr 2002 04:05:39 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/RootContext.java,v 1.5 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.5 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/RootContext.java,v 1.6 2002/04/24 04:05:39 dmitri Exp $
  + * $Revision: 1.6 $
  + * $Date: 2002/04/24 04:05:39 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,21 +61,18 @@
    */
   package org.apache.commons.jxpath.ri.axes;
   
  +import org.apache.commons.jxpath.Function;
   import org.apache.commons.jxpath.JXPathContext;
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.ri.model.*;
  -import org.apache.commons.jxpath.ri.*;
   import org.apache.commons.jxpath.ri.EvalContext;
   import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
  -import org.apache.commons.jxpath.Function;
  -import java.util.*;
  +import org.apache.commons.jxpath.ri.QName;
  +import org.apache.commons.jxpath.ri.model.NodePointer;
   
   /**
    * EvalContext that is used to hold the root node for the path traversal.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.5 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.6 $ $Date: 2002/04/24 04:05:39 $
    */
   public class RootContext extends EvalContext {
       private boolean startedSet = false;
  
  
  
  1.6       +9 -10     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/PredicateContext.java
  
  Index: PredicateContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/PredicateContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PredicateContext.java	21 Apr 2002 21:52:32 -0000	1.5
  +++ PredicateContext.java	24 Apr 2002 04:05:39 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/PredicateContext.java,v 1.5 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.5 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/PredicateContext.java,v 1.6 2002/04/24 04:05:39 dmitri Exp $
  + * $Revision: 1.6 $
  + * $Date: 2002/04/24 04:05:39 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -62,19 +62,18 @@
   package org.apache.commons.jxpath.ri.axes;
   
   
  -import java.util.*;
  -
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.model.*;
  -import org.apache.commons.jxpath.ri.model.beans.*;
   import org.apache.commons.jxpath.ri.EvalContext;
  +import org.apache.commons.jxpath.ri.compiler.CoreOperation;
  +import org.apache.commons.jxpath.ri.compiler.Expression;
  +import org.apache.commons.jxpath.ri.model.NodePointer;
  +import org.apache.commons.jxpath.ri.model.beans.PropertyOwnerPointer;
  +import org.apache.commons.jxpath.ri.model.beans.PropertyPointer;
   
   /**
    * EvalContext that checks predicates.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.5 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.6 $ $Date: 2002/04/24 04:05:39 $
    */
   public class PredicateContext extends EvalContext {
       private Expression expression;
  
  
  
  1.6       +10 -12    jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/PrecedingOrFollowingContext.java
  
  Index: PrecedingOrFollowingContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/PrecedingOrFollowingContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PrecedingOrFollowingContext.java	21 Apr 2002 21:52:32 -0000	1.5
  +++ PrecedingOrFollowingContext.java	24 Apr 2002 04:05:39 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/PrecedingOrFollowingContext.java,v 1.5 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.5 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/PrecedingOrFollowingContext.java,v 1.6 2002/04/24 04:05:39 dmitri Exp $
  + * $Revision: 1.6 $
  + * $Date: 2002/04/24 04:05:39 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,21 +61,19 @@
    */
   package org.apache.commons.jxpath.ri.axes;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.ri.model.*;
  -import org.apache.commons.jxpath.ri.model.beans.*;
  +import java.util.Stack;
  +
   import org.apache.commons.jxpath.ri.EvalContext;
  -import java.lang.reflect.*;
  -import java.util.*;
  -import java.beans.*;
  +import org.apache.commons.jxpath.ri.compiler.NodeTest;
  +import org.apache.commons.jxpath.ri.model.NodeIterator;
  +import org.apache.commons.jxpath.ri.model.NodePointer;
  +import org.apache.commons.jxpath.ri.model.beans.PropertyIterator;
   
   /**
    * EvalContext that walks the "preceding::" and "following::" axes.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.5 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.6 $ $Date: 2002/04/24 04:05:39 $
    */
   public class PrecedingOrFollowingContext extends EvalContext {
       private NodeTest nodeTest;
  
  
  
  1.5       +8 -10     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/ParentContext.java
  
  Index: ParentContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/ParentContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ParentContext.java	21 Apr 2002 21:52:32 -0000	1.4
  +++ ParentContext.java	24 Apr 2002 04:05:39 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/ParentContext.java,v 1.4 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.4 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/ParentContext.java,v 1.5 2002/04/24 04:05:39 dmitri Exp $
  + * $Revision: 1.5 $
  + * $Date: 2002/04/24 04:05:39 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,19 +61,17 @@
    */
   package org.apache.commons.jxpath.ri.axes;
   
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.model.*;
  -import org.apache.commons.jxpath.ri.EvalContext;
  +import java.util.HashSet;
   
  -import java.util.*;
  +import org.apache.commons.jxpath.ri.EvalContext;
  +import org.apache.commons.jxpath.ri.compiler.NodeTest;
  +import org.apache.commons.jxpath.ri.model.NodePointer;
   
   /**
    * EvalContext that walks the "parent::" axis.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.4 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.5 $ $Date: 2002/04/24 04:05:39 $
    */
   public class ParentContext extends EvalContext {
       private NodeTest nodeTest;
  
  
  
  1.4       +9 -9      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/NamespaceContext.java
  
  Index: NamespaceContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/NamespaceContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NamespaceContext.java	21 Apr 2002 21:52:32 -0000	1.3
  +++ NamespaceContext.java	24 Apr 2002 04:05:39 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/NamespaceContext.java,v 1.3 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.3 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/NamespaceContext.java,v 1.4 2002/04/24 04:05:39 dmitri Exp $
  + * $Revision: 1.4 $
  + * $Date: 2002/04/24 04:05:39 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,18 +61,18 @@
    */
   package org.apache.commons.jxpath.ri.axes;
   
  -import org.apache.commons.jxpath.ri.*;
   import org.apache.commons.jxpath.ri.EvalContext;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.ri.model.*;
  -
  -import java.util.*;
  +import org.apache.commons.jxpath.ri.QName;
  +import org.apache.commons.jxpath.ri.compiler.NodeNameTest;
  +import org.apache.commons.jxpath.ri.compiler.NodeTest;
  +import org.apache.commons.jxpath.ri.model.NodeIterator;
  +import org.apache.commons.jxpath.ri.model.NodePointer;
   
   /**
    * EvalContext that walks the "namespace::" axis.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.3 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.4 $ $Date: 2002/04/24 04:05:39 $
    */
   public class NamespaceContext extends EvalContext {
       private NodeTest nodeTest;
  
  
  
  1.6       +5 -8      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/InitialContext.java
  
  Index: InitialContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/InitialContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- InitialContext.java	24 Apr 2002 03:32:48 -0000	1.5
  +++ InitialContext.java	24 Apr 2002 04:05:39 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/InitialContext.java,v 1.5 2002/04/24 03:32:48 dmitri Exp $
  - * $Revision: 1.5 $
  - * $Date: 2002/04/24 03:32:48 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/InitialContext.java,v 1.6 2002/04/24 04:05:39 dmitri Exp $
  + * $Revision: 1.6 $
  + * $Date: 2002/04/24 04:05:39 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -62,11 +62,8 @@
   package org.apache.commons.jxpath.ri.axes;
   
   import org.apache.commons.jxpath.Pointer;
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.ri.model.*;
   import org.apache.commons.jxpath.ri.EvalContext;
  -import java.util.*;
  +import org.apache.commons.jxpath.ri.model.NodePointer;
   
   /**
    * A single-set EvalContext that provides access to the current node of
  @@ -74,7 +71,7 @@
    * on to the parent context.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.5 $ $Date: 2002/04/24 03:32:48 $
  + * @version $Revision: 1.6 $ $Date: 2002/04/24 04:05:39 $
    */
   public class InitialContext extends EvalContext {
       private boolean startedSet = false;
  
  
  
  1.6       +9 -9      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/DescendantContext.java
  
  Index: DescendantContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/DescendantContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DescendantContext.java	21 Apr 2002 21:52:32 -0000	1.5
  +++ DescendantContext.java	24 Apr 2002 04:05:39 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/DescendantContext.java,v 1.5 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.5 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/DescendantContext.java,v 1.6 2002/04/24 04:05:39 dmitri Exp $
  + * $Revision: 1.6 $
  + * $Date: 2002/04/24 04:05:39 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,19 +61,19 @@
    */
   package org.apache.commons.jxpath.ri.axes;
   
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.model.*;
  +import java.util.Stack;
  +
   import org.apache.commons.jxpath.ri.EvalContext;
  -import java.util.*;
  +import org.apache.commons.jxpath.ri.compiler.NodeTest;
  +import org.apache.commons.jxpath.ri.model.NodeIterator;
  +import org.apache.commons.jxpath.ri.model.NodePointer;
   
   /**
    * An EvalContext that walks the "descendant::" and "descendant-or-self::"
    * axes.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.5 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.6 $ $Date: 2002/04/24 04:05:39 $
    */
   public class DescendantContext extends EvalContext {
       private NodeTest nodeTest;
  
  
  
  1.7       +8 -12     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/ChildContext.java
  
  Index: ChildContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/ChildContext.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ChildContext.java	24 Apr 2002 03:32:48 -0000	1.6
  +++ ChildContext.java	24 Apr 2002 04:05:39 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/ChildContext.java,v 1.6 2002/04/24 03:32:48 dmitri Exp $
  - * $Revision: 1.6 $
  - * $Date: 2002/04/24 03:32:48 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/ChildContext.java,v 1.7 2002/04/24 04:05:39 dmitri Exp $
  + * $Revision: 1.7 $
  + * $Date: 2002/04/24 04:05:39 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,22 +61,18 @@
    */
   package org.apache.commons.jxpath.ri.axes;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.ri.model.*;
  +import org.apache.commons.jxpath.Pointer;
   import org.apache.commons.jxpath.ri.EvalContext;
  -
  -import java.lang.reflect.*;
  -import java.util.*;
  -import java.beans.*;
  +import org.apache.commons.jxpath.ri.compiler.NodeTest;
  +import org.apache.commons.jxpath.ri.model.NodeIterator;
  +import org.apache.commons.jxpath.ri.model.NodePointer;
   
   /**
    * EvalContext that can walk the "child::", "following-sibling::" and
    * "preceding-sibling::" axes.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.6 $ $Date: 2002/04/24 03:32:48 $
  + * @version $Revision: 1.7 $ $Date: 2002/04/24 04:05:39 $
    */
   public class ChildContext extends EvalContext {
       private NodeTest nodeTest;
  
  
  
  1.2       +4 -6      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/QName.java
  
  Index: QName.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/QName.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- QName.java	21 Apr 2002 21:52:32 -0000	1.1
  +++ QName.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/QName.java,v 1.1 2002/04/21 21:52:32 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:32 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/QName.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,11 +61,9 @@
    */
   package org.apache.commons.jxpath.ri;
   
  -import java.util.*;
  -
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class QName {
       private String prefix;
  
  
  
  1.3       +9 -8      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/Parser.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Parser.java	10 Apr 2002 03:40:19 -0000	1.2
  +++ Parser.java	24 Apr 2002 04:05:40 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/Parser.java,v 1.2 2002/04/10 03:40:19 dmitri Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/04/10 03:40:19 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/Parser.java,v 1.3 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,15 +61,16 @@
    */
   package org.apache.commons.jxpath.ri;
   
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.parser.XPathParser;
  -import org.apache.commons.jxpath.ri.parser.ParseException;
  -import java.util.*;
   import java.io.StringReader;
   
  +import org.apache.commons.jxpath.ri.parser.ParseException;
  +import org.apache.commons.jxpath.ri.parser.XPathParser;
  +
   /**
  + * XPath parser
  + * 
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.2 $ $Date: 2002/04/10 03:40:19 $
  + * @version $Revision: 1.3 $ $Date: 2002/04/24 04:05:40 $
    */
   public class Parser {
   
  
  
  
  1.11      +9 -14     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java
  
  Index: JXPathContextReferenceImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JXPathContextReferenceImpl.java	24 Apr 2002 03:32:48 -0000	1.10
  +++ JXPathContextReferenceImpl.java	24 Apr 2002 04:05:40 -0000	1.11
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java,v 1.10 2002/04/24 03:32:48 dmitri Exp $
  - * $Revision: 1.10 $
  - * $Date: 2002/04/24 03:32:48 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java,v 1.11 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.11 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -65,12 +65,7 @@
   import java.lang.ref.SoftReference;
   import java.util.*;
   
  -import org.apache.commons.jxpath.Function;
  -import org.apache.commons.jxpath.Functions;
  -import org.apache.commons.jxpath.JXPathContext;
  -import org.apache.commons.jxpath.PackageFunctions;
  -import org.apache.commons.jxpath.Pointer;
  -import org.apache.commons.jxpath.Variables;
  +import org.apache.commons.jxpath.*;
   import org.apache.commons.jxpath.ri.axes.RootContext;
   import org.apache.commons.jxpath.ri.compiler.Expression;
   import org.apache.commons.jxpath.ri.compiler.TreeCompiler;
  @@ -86,7 +81,7 @@
   
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.10 $ $Date: 2002/04/24 03:32:48 $
  + * @version $Revision: 1.11 $ $Date: 2002/04/24 04:05:40 $
    */
   public class JXPathContextReferenceImpl extends JXPathContext
   {
  @@ -238,8 +233,8 @@
           List list = new ArrayList();
           if (result instanceof EvalContext){
               EvalContext context = (EvalContext)result;
  -            while(context.nextSet()){
  -                while(context.next()){
  +            while (context.nextSet()){
  +                while (context.next()){
                       Pointer pointer = context.getCurrentNodePointer();
                       list.add(pointer.getValue());
                   }
  @@ -323,8 +318,8 @@
           List list = new ArrayList();
           if (result instanceof EvalContext){
               EvalContext context = (EvalContext)result;
  -            while(context.nextSet()){
  -                while(context.next()){
  +            while (context.nextSet()){
  +                while (context.next()){
                       Pointer pointer = context.getCurrentNodePointer();
                       list.add(pointer);
                   }
  
  
  
  1.10      +10 -11    jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/EvalContext.java
  
  Index: EvalContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/EvalContext.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- EvalContext.java	24 Apr 2002 03:32:48 -0000	1.9
  +++ EvalContext.java	24 Apr 2002 04:05:40 -0000	1.10
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/EvalContext.java,v 1.9 2002/04/24 03:32:48 dmitri Exp $
  - * $Revision: 1.9 $
  - * $Date: 2002/04/24 03:32:48 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/EvalContext.java,v 1.10 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.10 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,15 +61,14 @@
    */
   package org.apache.commons.jxpath.ri;
   
  -import org.apache.commons.jxpath.JXPathContext;
  +import java.util.*;
  +
  +import org.apache.commons.jxpath.*;
  +import org.apache.commons.jxpath.ri.axes.*;
   import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.ri.model.*;
  +import org.apache.commons.jxpath.ri.model.NodeIterator;
  +import org.apache.commons.jxpath.ri.model.NodePointer;
   import org.apache.commons.jxpath.ri.model.beans.*;
  -import org.apache.commons.jxpath.ri.axes.*;
  -import org.apache.commons.jxpath.Function;
  -import org.apache.commons.jxpath.ExpressionContext;
  -import org.apache.commons.jxpath.Pointer;
  -import java.util.*;
   
   /**
    * An XPath evaluation context.
  @@ -79,7 +78,7 @@
    * implement behavior of various XPath axes: "child::", "parent::" etc.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.9 $ $Date: 2002/04/24 03:32:48 $
  + * @version $Revision: 1.10 $ $Date: 2002/04/24 04:05:40 $
    */
   public abstract class EvalContext implements ExpressionContext {
       protected EvalContext parentContext;
  
  
  
  1.3       +4 -6      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/Compiler.java
  
  Index: Compiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/Compiler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Compiler.java	21 Sep 2001 23:22:43 -0000	1.2
  +++ Compiler.java	24 Apr 2002 04:05:40 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/Compiler.java,v 1.2 2001/09/21 23:22:43 dmitri Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/09/21 23:22:43 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/Compiler.java,v 1.3 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,8 +61,6 @@
    */
   package org.apache.commons.jxpath.ri;
   
  -import java.util.*;
  -
   /**
    * The Compiler APIs are completely agnostic to the actual types of objects
    * produced and consumed by the APIs.  Arguments and return values are
  @@ -88,7 +86,7 @@
    * </pre></blockquote>
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.2 $ $Date: 2001/09/21 23:22:43 $
  + * @version $Revision: 1.3 $ $Date: 2002/04/24 04:05:40 $
    */
   public interface Compiler {
   
  
  
  
  1.2       +6 -11     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyPointer.java
  
  Index: PropertyPointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyPointer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PropertyPointer.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ PropertyPointer.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyPointer.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyPointer.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,21 +61,16 @@
    */
   package org.apache.commons.jxpath.ri.model.beans;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.*;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.ri.model.*;
  +import org.apache.commons.jxpath.ri.QName;
   import org.apache.commons.jxpath.ri.model.NodePointer;
  -import org.apache.commons.jxpath.util.*;
  -
  -import java.util.*;
  +import org.apache.commons.jxpath.util.ValueUtils;
   
   /**
    * A pointer allocated by a PropertyOwnerPointer to represent the value of
    * a property of the parent object.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public abstract class PropertyPointer extends NodePointer {
       public static int UNSPECIFIED_PROPERTY = Integer.MIN_VALUE;
  
  
  
  1.2       +12 -11    jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyOwnerPointer.java
  
  Index: PropertyOwnerPointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyOwnerPointer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PropertyOwnerPointer.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ PropertyOwnerPointer.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyOwnerPointer.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyOwnerPointer.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,16 +61,17 @@
    */
   package org.apache.commons.jxpath.ri.model.beans;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.*;
  +import java.util.Locale;
  +
  +import org.apache.commons.jxpath.JXPathContext;
   import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.ri.model.*;
  +import org.apache.commons.jxpath.ri.QName;
  +import org.apache.commons.jxpath.ri.compiler.NodeNameTest;
  +import org.apache.commons.jxpath.ri.compiler.NodeTest;
  +import org.apache.commons.jxpath.ri.compiler.NodeTypeTest;
   import org.apache.commons.jxpath.ri.model.NodeIterator;
   import org.apache.commons.jxpath.ri.model.NodePointer;
  -import org.apache.commons.jxpath.util.*;
  -
  -import java.util.*;
  +import org.apache.commons.jxpath.util.ValueUtils;
   
   
   /**
  @@ -78,7 +79,7 @@
    * a collection.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public abstract class PropertyOwnerPointer extends NodePointer {
   
  
  
  
  1.2       +5 -5      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyIterator.java
  
  Index: PropertyIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyIterator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PropertyIterator.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ PropertyIterator.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyIterator.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/PropertyIterator.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -69,10 +69,10 @@
    * Examples of such objects are JavaBeans and objects with Dynamic Properties.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class PropertyIterator implements NodeIterator {
  -    boolean empty = false;
  +    private boolean empty = false;
       private boolean reverse;
       private String name;
       private int startIndex = 0;
  
  
  
  1.2       +6 -13     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/NullPropertyPointer.java
  
  Index: NullPropertyPointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/NullPropertyPointer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NullPropertyPointer.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ NullPropertyPointer.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/NullPropertyPointer.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/NullPropertyPointer.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,20 +61,13 @@
    */
   package org.apache.commons.jxpath.ri.model.beans;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.*;
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  +import org.apache.commons.jxpath.JXPathContext;
  +import org.apache.commons.jxpath.ri.QName;
   import org.apache.commons.jxpath.ri.model.NodePointer;
  -import org.apache.commons.jxpath.ri.model.beans.*;
  -
  -import java.lang.reflect.*;
  -import java.util.*;
  -import java.beans.*;
   
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class NullPropertyPointer extends PropertyPointer {
   
  
  
  
  1.2       +8 -13     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/NullPointer.java
  
  Index: NullPointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/NullPointer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NullPointer.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ NullPointer.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/NullPointer.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/NullPointer.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,20 +61,15 @@
    */
   package org.apache.commons.jxpath.ri.model.beans;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.*;
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.ri.model.NodePointer;
  -import org.apache.commons.jxpath.ri.model.beans.*;
  +import java.util.Locale;
   
  -import java.lang.reflect.*;
  -import java.util.*;
  -import java.beans.*;
  +import org.apache.commons.jxpath.JXPathContext;
  +import org.apache.commons.jxpath.ri.QName;
  +import org.apache.commons.jxpath.ri.model.NodePointer;
   
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class NullPointer extends PropertyOwnerPointer {
       private QName name;
  
  
  
  1.2       +5 -12     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/NullElementPointer.java
  
  Index: NullElementPointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/NullElementPointer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NullElementPointer.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ NullElementPointer.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/NullElementPointer.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/NullElementPointer.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,16 +61,9 @@
    */
   package org.apache.commons.jxpath.ri.model.beans;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.*;
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  +import org.apache.commons.jxpath.JXPathContext;
  +import org.apache.commons.jxpath.ri.QName;
   import org.apache.commons.jxpath.ri.model.NodePointer;
  -import org.apache.commons.jxpath.ri.model.beans.*;
  -
  -import java.lang.reflect.*;
  -import java.util.*;
  -import java.beans.*;
   
   /**
    * Used when there is a need to construct a Pointer for
  @@ -83,7 +76,7 @@
    * as the parent.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class NullElementPointer extends PropertyOwnerPointer {
   
  
  
  
  1.2       +6 -8      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/LangAttributePointer.java
  
  Index: LangAttributePointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/LangAttributePointer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LangAttributePointer.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ LangAttributePointer.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/LangAttributePointer.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/LangAttributePointer.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,18 +61,16 @@
    */
   package org.apache.commons.jxpath.ri.model.beans;
   
  -import org.apache.commons.jxpath.ri.*;
  -import org.apache.commons.jxpath.ri.compiler.*;
  +import org.apache.commons.jxpath.ri.QName;
  +import org.apache.commons.jxpath.ri.compiler.NodeTest;
   import org.apache.commons.jxpath.ri.model.NodePointer;
   
  -import java.util.*;
  -
   /**
    * A Pointer that points to the "lang" attribute of a JavaBean. The value
    * of the attribute is based on the locale supplied to it in the constructor.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class LangAttributePointer extends NodePointer {
       public LangAttributePointer(NodePointer parent){
  
  
  
  1.2       +11 -10    jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/DynamicPropertyPointer.java
  
  Index: DynamicPropertyPointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/DynamicPropertyPointer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DynamicPropertyPointer.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ DynamicPropertyPointer.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/DynamicPropertyPointer.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/DynamicPropertyPointer.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,19 +61,20 @@
    */
   package org.apache.commons.jxpath.ri.model.beans;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.QName;
  -import org.apache.commons.jxpath.ri.model.*;
  -import org.apache.commons.jxpath.util.*;
  +import java.util.Arrays;
   
  -import java.util.*;
  -import java.beans.*;
  +import org.apache.commons.jxpath.AbstractFactory;
  +import org.apache.commons.jxpath.DynamicPropertyHandler;
  +import org.apache.commons.jxpath.JXPathContext;
  +import org.apache.commons.jxpath.ri.QName;
  +import org.apache.commons.jxpath.ri.model.NodePointer;
  +import org.apache.commons.jxpath.util.ValueUtils;
   
   /**
    * Pointer pointing to a property of an object with dynamic properties.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class DynamicPropertyPointer extends PropertyPointer {
       private DynamicPropertyHandler handler;
  
  
  
  1.2       +10 -9     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/DynamicPointerFactory.java
  
  Index: DynamicPointerFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/DynamicPointerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DynamicPointerFactory.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ DynamicPointerFactory.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/DynamicPointerFactory.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/DynamicPointerFactory.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,20 +61,21 @@
    */
   package org.apache.commons.jxpath.ri.model.beans;
   
  -import org.apache.commons.jxpath.*;
  +import java.util.Locale;
  +
  +import org.apache.commons.jxpath.DynamicPropertyHandler;
  +import org.apache.commons.jxpath.JXPathBeanInfo;
  +import org.apache.commons.jxpath.JXPathIntrospector;
   import org.apache.commons.jxpath.ri.QName;
  -import org.apache.commons.jxpath.ri.model.*;
   import org.apache.commons.jxpath.ri.model.NodePointer;
   import org.apache.commons.jxpath.ri.model.NodePointerFactory;
  -import org.apache.commons.jxpath.util.*;
  -
  -import java.util.*;
  +import org.apache.commons.jxpath.util.ValueUtils;
   
   /**
    * Implements NodePointerFactory for Dynamic classes like Map.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class DynamicPointerFactory implements NodePointerFactory {
   
  
  
  
  1.2       +9 -14     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/DynamicPointer.java
  
  Index: DynamicPointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/DynamicPointer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DynamicPointer.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ DynamicPointer.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/DynamicPointer.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/DynamicPointer.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,24 +61,19 @@
    */
   package org.apache.commons.jxpath.ri.model.beans;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.*;
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.ri.model.*;
  -import org.apache.commons.jxpath.ri.model.NodePointer;
  -import org.apache.commons.jxpath.util.*;
  +import java.util.Locale;
   
  -import java.lang.reflect.*;
  -import java.util.*;
  -import java.beans.*;
  +import org.apache.commons.jxpath.DynamicPropertyHandler;
  +import org.apache.commons.jxpath.ri.QName;
  +import org.apache.commons.jxpath.ri.model.NodePointer;
  +import org.apache.commons.jxpath.util.ValueUtils;
   
   /**
    * A Pointer that points to an object with Dynamic Properties. It is used
    * for the first element of a path; following elements will by of type PropertyPointer.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class DynamicPointer extends PropertyOwnerPointer {
       private QName name;
  
  
  
  1.2       +6 -8      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointerFactory.java
  
  Index: CollectionPointerFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CollectionPointerFactory.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ CollectionPointerFactory.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointerFactory.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointerFactory.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,20 +61,18 @@
    */
   package org.apache.commons.jxpath.ri.model.beans;
   
  -import org.apache.commons.jxpath.Container;
  +import java.util.Locale;
  +
   import org.apache.commons.jxpath.ri.QName;
  -import org.apache.commons.jxpath.ri.model.*;
   import org.apache.commons.jxpath.ri.model.NodePointer;
   import org.apache.commons.jxpath.ri.model.NodePointerFactory;
  -import org.apache.commons.jxpath.util.*;
  -
  -import java.util.*;
  +import org.apache.commons.jxpath.util.ValueUtils;
   
   /**
    * Implements NodePointerFactory for stand-alone collections.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class CollectionPointerFactory implements NodePointerFactory {
   
  
  
  
  1.2       +10 -11    jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointer.java
  
  Index: CollectionPointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CollectionPointer.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ CollectionPointer.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointer.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointer.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,21 +61,20 @@
    */
   package org.apache.commons.jxpath.ri.model.beans;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.*;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.ri.model.*;
  +import java.util.Locale;
  +
  +import org.apache.commons.jxpath.JXPathContext;
  +import org.apache.commons.jxpath.ri.QName;
  +import org.apache.commons.jxpath.ri.compiler.NodeTest;
   import org.apache.commons.jxpath.ri.model.NodeIterator;
   import org.apache.commons.jxpath.ri.model.NodePointer;
  -import org.apache.commons.jxpath.util.*;
  -
  -import java.util.*;
  +import org.apache.commons.jxpath.util.ValueUtils;
   
   /**
    * Transparent pointer to a collection (array or Collection).
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class CollectionPointer extends NodePointer {
       private Object collection;
  
  
  
  1.2       +7 -8      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java
  
  Index: NamespacePointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NamespacePointer.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ NamespacePointer.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,18 +61,17 @@
    */
   package org.apache.commons.jxpath.ri.model.dom;
   
  -import org.apache.commons.jxpath.ri.*;
   import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  +import org.apache.commons.jxpath.ri.QName;
  +import org.apache.commons.jxpath.ri.compiler.NodeTest;
  +import org.apache.commons.jxpath.ri.compiler.NodeTypeTest;
   import org.apache.commons.jxpath.ri.model.NodePointer;
   
  -import java.util.*;
  -
   /**
    * Represents a namespace node.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class NamespacePointer extends NodePointer {
       private String prefix;
  
  
  
  1.2       +5 -5      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMPointerFactory.java
  
  Index: DOMPointerFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMPointerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DOMPointerFactory.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ DOMPointerFactory.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMPointerFactory.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMPointerFactory.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,18 +61,18 @@
    */
   package org.apache.commons.jxpath.ri.model.dom;
   
  +import java.util.Locale;
  +
   import org.apache.commons.jxpath.ri.QName;
   import org.apache.commons.jxpath.ri.model.NodePointer;
   import org.apache.commons.jxpath.ri.model.NodePointerFactory;
  -
  -import java.util.*;
   import org.w3c.dom.Node;
   
   /**
    * Implements NodePointerFactory for DOM elements.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class DOMPointerFactory implements NodePointerFactory {
   
  
  
  
  1.2       +21 -12    jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java
  
  Index: DOMNodePointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DOMNodePointer.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ DOMNodePointer.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,24 +61,33 @@
    */
   package org.apache.commons.jxpath.ri.model.dom;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.*;
  +import java.util.HashMap;
  +import java.util.Locale;
  +import java.util.Map;
  +
  +import org.apache.commons.jxpath.AbstractFactory;
  +import org.apache.commons.jxpath.JXPathContext;
   import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  +import org.apache.commons.jxpath.ri.QName;
  +import org.apache.commons.jxpath.ri.compiler.NodeNameTest;
  +import org.apache.commons.jxpath.ri.compiler.NodeTest;
  +import org.apache.commons.jxpath.ri.compiler.NodeTypeTest;
  +import org.apache.commons.jxpath.ri.compiler.ProcessingInstructionTest;
   import org.apache.commons.jxpath.ri.model.NodeIterator;
   import org.apache.commons.jxpath.ri.model.NodePointer;
  -
  -import java.lang.reflect.*;
  -import java.util.*;
  -import java.beans.*;
  -import org.w3c.dom.*;
   import org.apache.commons.jxpath.util.TypeUtils;
  +import org.w3c.dom.Attr;
  +import org.w3c.dom.Comment;
  +import org.w3c.dom.Element;
  +import org.w3c.dom.Node;
  +import org.w3c.dom.NodeList;
  +import org.w3c.dom.ProcessingInstruction;
   
   /**
    * A Pointer that points to a DOM node.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class DOMNodePointer extends NodePointer {
       private Node node;
  
  
  
  1.2       +6 -12     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodeIterator.java
  
  Index: DOMNodeIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodeIterator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DOMNodeIterator.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ DOMNodeIterator.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodeIterator.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodeIterator.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,22 +61,16 @@
    */
   package org.apache.commons.jxpath.ri.model.dom;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  +import org.apache.commons.jxpath.ri.compiler.NodeTest;
   import org.apache.commons.jxpath.ri.model.NodeIterator;
   import org.apache.commons.jxpath.ri.model.NodePointer;
  -
  -import java.lang.reflect.*;
  -import java.util.*;
  -import java.beans.*;
  -import org.w3c.dom.*;
  +import org.w3c.dom.Node;
   
   /**
    * An iterator of children of a DOM Node.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class DOMNodeIterator implements NodeIterator {
       private NodePointer parent;
  
  
  
  1.2       +9 -11     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNamespaceIterator.java
  
  Index: DOMNamespaceIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNamespaceIterator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DOMNamespaceIterator.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ DOMNamespaceIterator.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNamespaceIterator.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNamespaceIterator.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,22 +61,20 @@
    */
   package org.apache.commons.jxpath.ri.model.dom;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  +import java.util.ArrayList;
  +import java.util.List;
  +
   import org.apache.commons.jxpath.ri.model.NodeIterator;
   import org.apache.commons.jxpath.ri.model.NodePointer;
  -
  -import java.lang.reflect.*;
  -import java.util.*;
  -import java.beans.*;
  -import org.w3c.dom.*;
  +import org.w3c.dom.Attr;
  +import org.w3c.dom.NamedNodeMap;
  +import org.w3c.dom.Node;
   
   /**
    * An iterator of namespaces of a DOM Node.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class DOMNamespaceIterator implements NodeIterator {
       private NodePointer parent;
  
  
  
  1.2       +8 -12     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java
  
  Index: DOMAttributePointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DOMAttributePointer.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ DOMAttributePointer.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,23 +61,19 @@
    */
   package org.apache.commons.jxpath.ri.model.dom;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.*;
   import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  +import org.apache.commons.jxpath.ri.QName;
  +import org.apache.commons.jxpath.ri.compiler.NodeTest;
  +import org.apache.commons.jxpath.ri.compiler.NodeTypeTest;
   import org.apache.commons.jxpath.ri.model.NodePointer;
  -
  -import java.lang.reflect.*;
  -import java.util.*;
  -import java.beans.*;
  -import org.w3c.dom.*;
   import org.apache.commons.jxpath.util.TypeUtils;
  +import org.w3c.dom.Attr;
   
   /**
    * A Pointer that points to a DOM node.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class DOMAttributePointer extends NodePointer {
       private Attr attr;
  
  
  
  1.2       +12 -13    jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributeIterator.java
  
  Index: DOMAttributeIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributeIterator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DOMAttributeIterator.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ DOMAttributeIterator.java	24 Apr 2002 04:05:40 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributeIterator.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributeIterator.java,v 1.2 2002/04/24 04:05:40 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:40 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,23 +61,22 @@
    */
   package org.apache.commons.jxpath.ri.model.dom;
   
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.*;
  -import org.apache.commons.jxpath.ri.Compiler;
  -import org.apache.commons.jxpath.ri.compiler.*;
  +import java.util.ArrayList;
  +import java.util.List;
  +
  +import org.apache.commons.jxpath.ri.QName;
   import org.apache.commons.jxpath.ri.model.NodeIterator;
   import org.apache.commons.jxpath.ri.model.NodePointer;
  -
  -import java.lang.reflect.*;
  -import java.util.*;
  -import java.beans.*;
  -import org.w3c.dom.*;
  +import org.w3c.dom.Attr;
  +import org.w3c.dom.Element;
  +import org.w3c.dom.NamedNodeMap;
  +import org.w3c.dom.Node;
   
   /**
    * An iterator of attributes of a DOM Node.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:40 $
    */
   public class DOMAttributeIterator implements NodeIterator {
       private NodePointer parent;
  
  
  
  1.4       +10 -8     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/functions/MethodFunction.java
  
  Index: MethodFunction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/functions/MethodFunction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MethodFunction.java	21 Apr 2002 21:52:31 -0000	1.3
  +++ MethodFunction.java	24 Apr 2002 04:05:41 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/functions/MethodFunction.java,v 1.3 2002/04/21 21:52:31 dmitri Exp $
  - * $Revision: 1.3 $
  - * $Date: 2002/04/21 21:52:31 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/functions/MethodFunction.java,v 1.4 2002/04/24 04:05:41 dmitri Exp $
  + * $Revision: 1.4 $
  + * $Date: 2002/04/24 04:05:41 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,14 +61,16 @@
    */
   package org.apache.commons.jxpath.functions;
   
  -import java.util.*;
  -import java.lang.reflect.*;
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.util.*;
  +import java.lang.reflect.Method;
  +import java.lang.reflect.Modifier;
  +
  +import org.apache.commons.jxpath.ExpressionContext;
  +import org.apache.commons.jxpath.Function;
  +import org.apache.commons.jxpath.util.TypeUtils;
   
   /**
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.3 $ $Date: 2002/04/21 21:52:31 $
  + * @version $Revision: 1.4 $ $Date: 2002/04/24 04:05:41 $
    */
   public class MethodFunction implements Function {
   
  
  
  
  1.4       +9 -8      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/functions/ConstructorFunction.java
  
  Index: ConstructorFunction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/functions/ConstructorFunction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConstructorFunction.java	21 Apr 2002 21:52:31 -0000	1.3
  +++ ConstructorFunction.java	24 Apr 2002 04:05:41 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/functions/ConstructorFunction.java,v 1.3 2002/04/21 21:52:31 dmitri Exp $
  - * $Revision: 1.3 $
  - * $Date: 2002/04/21 21:52:31 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/functions/ConstructorFunction.java,v 1.4 2002/04/24 04:05:41 dmitri Exp $
  + * $Revision: 1.4 $
  + * $Date: 2002/04/24 04:05:41 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,16 +61,17 @@
    */
   package org.apache.commons.jxpath.functions;
   
  -import java.util.*;
  -import java.lang.reflect.*;
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.util.*;
  +import java.lang.reflect.Constructor;
  +
  +import org.apache.commons.jxpath.ExpressionContext;
  +import org.apache.commons.jxpath.Function;
  +import org.apache.commons.jxpath.util.TypeUtils;
   
   /**
    * An extension function that creates an instance using a constructor.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.3 $ $Date: 2002/04/21 21:52:31 $
  + * @version $Revision: 1.4 $ $Date: 2002/04/24 04:05:41 $
    */
   public class ConstructorFunction implements Function {
   
  
  
  
  1.3       +4 -5      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/JXPathContextFactory.java
  
  Index: JXPathContextFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/JXPathContextFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JXPathContextFactory.java	24 Apr 2002 03:29:33 -0000	1.2
  +++ JXPathContextFactory.java	24 Apr 2002 04:05:41 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/JXPathContextFactory.java,v 1.2 2002/04/24 03:29:33 dmitri Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/04/24 03:29:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/JXPathContextFactory.java,v 1.3 2002/04/24 04:05:41 dmitri Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/04/24 04:05:41 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -64,7 +64,6 @@
   
   import java.util.*;
   import java.io.*;
  -import javax.xml.transform.TransformerFactory;
   
   /**
    * Defines a factory API that enables applications to obtain a
  @@ -80,7 +79,7 @@
    * @see JXPathContext#newContext(JXPathContext,Object)
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.2 $ $Date: 2002/04/24 03:29:33 $
  + * @version $Revision: 1.3 $ $Date: 2002/04/24 04:05:41 $
    */
   public abstract class JXPathContextFactory {
   
  
  
  
  1.2       +4 -4      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/Functions.java
  
  Index: Functions.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/Functions.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Functions.java	23 Aug 2001 00:46:58 -0000	1.1
  +++ Functions.java	24 Apr 2002 04:05:41 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/Functions.java,v 1.1 2001/08/23 00:46:58 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/08/23 00:46:58 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/Functions.java,v 1.2 2002/04/24 04:05:41 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:41 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,7 +61,7 @@
    */
   package org.apache.commons.jxpath;
   
  -import java.util.*;
  +import java.util.Set;
   
   /**
    * A group of Function objects sharing a common namespace. Use classes
  @@ -69,7 +69,7 @@
    * to register extension functions implemented as Java methods.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2001/08/23 00:46:58 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:41 $
    */
   public interface Functions {
   
  
  
  
  1.3       +4 -6      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/Function.java
  
  Index: Function.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/Function.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Function.java	10 Apr 2002 03:40:19 -0000	1.2
  +++ Function.java	24 Apr 2002 04:05:41 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/Function.java,v 1.2 2002/04/10 03:40:19 dmitri Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/04/10 03:40:19 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/Function.java,v 1.3 2002/04/24 04:05:41 dmitri Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/04/24 04:05:41 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,8 +61,6 @@
    */
   package org.apache.commons.jxpath;
   
  -import java.util.*;
  -
   /**
    * Extension function interface. Extension functions are grouped into
    * {@link Functions Functions} objects, which are installed on
  @@ -74,7 +72,7 @@
    * See {@link ClassFunctions ClassFunctions} and {@link PackageFunctions PackageFunctions}.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.2 $ $Date: 2002/04/10 03:40:19 $
  + * @version $Revision: 1.3 $ $Date: 2002/04/24 04:05:41 $
    */
   public interface Function {
   
  
  
  
  1.4       +4 -4      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ExpressionContext.java
  
  Index: ExpressionContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ExpressionContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ExpressionContext.java	12 Apr 2002 02:28:06 -0000	1.3
  +++ ExpressionContext.java	24 Apr 2002 04:05:41 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ExpressionContext.java,v 1.3 2002/04/12 02:28:06 dmitri Exp $
  - * $Revision: 1.3 $
  - * $Date: 2002/04/12 02:28:06 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ExpressionContext.java,v 1.4 2002/04/24 04:05:41 dmitri Exp $
  + * $Revision: 1.4 $
  + * $Date: 2002/04/24 04:05:41 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,7 +61,7 @@
    */
   package org.apache.commons.jxpath;
   
  -import java.util.*;
  +import java.util.List;
   
   /**
    * If an extenstion function has an argument of type ExpressionContext,
  
  
  
  1.2       +3 -5      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/Container.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Container.java	3 Sep 2001 01:22:30 -0000	1.1
  +++ Container.java	24 Apr 2002 04:05:41 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/Container.java,v 1.1 2001/09/03 01:22:30 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/09/03 01:22:30 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/Container.java,v 1.2 2002/04/24 04:05:41 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:41 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,8 +61,6 @@
    */
   package org.apache.commons.jxpath;
   
  -import java.util.*;
  -
   /**
    * A Container is an object implementing an indirection
    * mechanism transparent to JXPath.  For example, if property
  @@ -71,7 +69,7 @@
    * not the container itself.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2001/09/03 01:22:30 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:41 $
    */
   public interface Container {
   
  
  
  
  1.2       +5 -5      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/container/ContainerPointerFactory.java
  
  Index: ContainerPointerFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/container/ContainerPointerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContainerPointerFactory.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ ContainerPointerFactory.java	24 Apr 2002 04:05:41 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/container/ContainerPointerFactory.java,v 1.1 2002/04/21 21:52:33 dmitri Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/21 21:52:33 $
  + * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/container/ContainerPointerFactory.java,v 1.2 2002/04/24 04:05:41 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:05:41 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,18 +61,18 @@
    */
   package org.apache.commons.jxpath.ri.model.container;
   
  +import java.util.Locale;
  +
   import org.apache.commons.jxpath.Container;
   import org.apache.commons.jxpath.ri.QName;
   import org.apache.commons.jxpath.ri.model.NodePointer;
   import org.apache.commons.jxpath.ri.model.NodePointerFactory;
   
  -import java.util.*;
  -
   /**
    * Implements NodePointerFactory for Container objects.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:05:41 $
    */
   public class ContainerPointerFactory implements NodePointerFactory {
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message