You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by dm...@apache.org on 2002/04/24 06:06:46 UTC

cvs commit: jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes AttributeContext.java AncestorContext.java

dmitri      02/04/23 21:06:46

  Modified:    jxpath/src/java/org/apache/commons/jxpath/ri/model/beans
                        BeanPropertyPointer.java BeanPointerFactory.java
                        BeanPointer.java BeanAttributeIterator.java
               jxpath/src/java/org/apache/commons/jxpath/ri/axes
                        AttributeContext.java AncestorContext.java
  Log:
  Organized imports
  
  Revision  Changes    Path
  1.2       +11 -10    jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/BeanPropertyPointer.java
  
  Index: BeanPropertyPointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/BeanPropertyPointer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BeanPropertyPointer.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ BeanPropertyPointer.java	24 Apr 2002 04:06:46 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/BeanPropertyPointer.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/BeanPropertyPointer.java,v 1.2 2002/04/24 04:06:46 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:06:46 $
    *
    * ====================================================================
    * 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.beans.PropertyDescriptor;
   
  -import java.util.*;
  -import java.beans.*;
  +import org.apache.commons.jxpath.AbstractFactory;
  +import org.apache.commons.jxpath.JXPathBeanInfo;
  +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 a JavaBean.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:06:46 $
    */
   public class BeanPropertyPointer extends PropertyPointer {
       private String propertyName;
  
  
  
  1.2       +8 -7      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/BeanPointerFactory.java
  
  Index: BeanPointerFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/BeanPointerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BeanPointerFactory.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ BeanPointerFactory.java	24 Apr 2002 04:06:46 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/BeanPointerFactory.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/BeanPointerFactory.java,v 1.2 2002/04/24 04:06:46 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:06:46 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,18 +61,19 @@
    */
   package org.apache.commons.jxpath.ri.model.beans;
   
  -import org.apache.commons.jxpath.*;
  +import java.util.Locale;
  +
  +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.NodePointer;
   import org.apache.commons.jxpath.ri.model.NodePointerFactory;
   
  -import java.util.*;
  -
   /**
    * Implements NodePointerFactory for JavaBeans.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:06:46 $
    */
   public class BeanPointerFactory implements NodePointerFactory {
   
  
  
  
  1.2       +10 -14    jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/BeanPointer.java
  
  Index: BeanPointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/BeanPointer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BeanPointer.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ BeanPointer.java	24 Apr 2002 04:06:46 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/BeanPointer.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/BeanPointer.java,v 1.2 2002/04/24 04:06:46 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:06:46 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,24 +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.compiler.*;
  -import org.apache.commons.jxpath.ri.model.*;
  -import org.apache.commons.jxpath.ri.model.NodePointer;
  -import org.apache.commons.jxpath.util.*;
  +import java.beans.PropertyDescriptor;
  +import java.util.Locale;
   
  -import java.lang.reflect.*;
  -import java.util.*;
  -import java.beans.*;
  +import org.apache.commons.jxpath.JXPathBeanInfo;
  +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 a JavaBean or a collection. It is 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:06:46 $
    */
   public class BeanPointer extends PropertyOwnerPointer {
       private QName name;
  
  
  
  1.2       +5 -12     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/BeanAttributeIterator.java
  
  Index: BeanAttributeIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/BeanAttributeIterator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BeanAttributeIterator.java	21 Apr 2002 21:52:33 -0000	1.1
  +++ BeanAttributeIterator.java	24 Apr 2002 04:06:46 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/beans/BeanAttributeIterator.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/BeanAttributeIterator.java,v 1.2 2002/04/24 04:06:46 dmitri Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/24 04:06:46 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -61,23 +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.compiler.*;
  +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.*;
  -
   /**
    * An iterator of attributes of a JavaBean. Currently supports only one
    * attribute - "lang".
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.1 $ $Date: 2002/04/21 21:52:33 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/24 04:06:46 $
    */
   public class BeanAttributeIterator implements NodeIterator {
       private NodePointer parent;
  
  
  
  1.5       +9 -9      jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/AttributeContext.java
  
  Index: AttributeContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/AttributeContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AttributeContext.java	21 Apr 2002 21:52:32 -0000	1.4
  +++ AttributeContext.java	24 Apr 2002 04:06:46 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/AttributeContext.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/AttributeContext.java,v 1.5 2002/04/24 04:06:46 dmitri Exp $
  + * $Revision: 1.5 $
  + * $Date: 2002/04/24 04:06:46 $
    *
    * ====================================================================
    * 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 "attribute::" axis.
    *
    * @author Dmitri Plotnikov
  - * @version $Revision: 1.4 $ $Date: 2002/04/21 21:52:32 $
  + * @version $Revision: 1.5 $ $Date: 2002/04/24 04:06:46 $
    */
   public class AttributeContext extends EvalContext {
       private NodeTest nodeTest;
  
  
  
  1.6       +8 -10     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/AncestorContext.java
  
  Index: AncestorContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/AncestorContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AncestorContext.java	21 Apr 2002 21:52:32 -0000	1.5
  +++ AncestorContext.java	24 Apr 2002 04:06:46 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/AncestorContext.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/AncestorContext.java,v 1.6 2002/04/24 04:06:46 dmitri Exp $
  + * $Revision: 1.6 $
  + * $Date: 2002/04/24 04:06:46 $
    *
    * ====================================================================
    * 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.EvalContext;
  -import org.apache.commons.jxpath.ri.compiler.*;
  -import org.apache.commons.jxpath.*;
  -import org.apache.commons.jxpath.ri.model.*;
  +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 "ancestor::" and "ancestor-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:06:46 $
    */
   public class AncestorContext extends EvalContext {
       private NodeTest nodeTest;
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>