commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject cvs commit: jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/expression MethodUpdater.java
Date Mon, 30 Dec 2002 18:18:37 GMT
mvdb        2002/12/30 10:18:37

  Modified:    betwixt/src/java/org/apache/commons/betwixt/io
                        AbstractBeanWriter.java BeanCreateRule.java
                        BeanWriter.java BeanReader.java
               betwixt/src/java/org/apache/commons/betwixt/strategy
                        PluralStemmer.java HyphenatedNameMapper.java
                        DefaultPluralStemmer.java
               betwixt/src/java/org/apache/commons/betwixt/registry
                        DefaultXMLBeanInfoRegistry.java
               betwixt/src/java/org/apache/commons/betwixt/digester
                        AddDefaultsRule.java HideRule.java
                        XMLBeanInfoDigester.java XMLIntrospectorHelper.java
                        ElementRule.java AttributeRule.java InfoRule.java
                        RuleSupport.java
               betwixt/src/java/org/apache/commons/betwixt/expression
                        MethodUpdater.java
  Log:
  Fixed imports.
  
  Revision  Changes    Path
  1.8       +9 -16     jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/io/AbstractBeanWriter.java
  
  Index: AbstractBeanWriter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/io/AbstractBeanWriter.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractBeanWriter.java	15 Dec 2002 19:03:34 -0000	1.7
  +++ AbstractBeanWriter.java	30 Dec 2002 18:18:36 -0000	1.8
  @@ -62,18 +62,9 @@
   package org.apache.commons.betwixt.io;
   
   import java.beans.IntrospectionException;
  -import java.io.BufferedWriter;
   import java.io.IOException;
  -import java.io.OutputStream;
  -import java.io.OutputStreamWriter;
  -import java.io.Writer;
  -import java.util.Iterator;
   import java.util.HashMap;
  -
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  -
  -import org.apache.commons.collections.ArrayStack;
  +import java.util.Iterator;
   
   import org.apache.commons.betwixt.AttributeDescriptor;
   import org.apache.commons.betwixt.ElementDescriptor;
  @@ -82,7 +73,9 @@
   import org.apache.commons.betwixt.expression.Context;
   import org.apache.commons.betwixt.expression.Expression;
   import org.apache.commons.betwixt.io.id.SequentialIDGenerator;
  -
  +import org.apache.commons.collections.ArrayStack;
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   import org.xml.sax.SAXException;
   
   // FIX ME!!!
  
  
  
  1.14      +6 -11     jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/io/BeanCreateRule.java
  
  Index: BeanCreateRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/io/BeanCreateRule.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- BeanCreateRule.java	16 Dec 2002 21:59:21 -0000	1.13
  +++ BeanCreateRule.java	30 Dec 2002 18:18:36 -0000	1.14
  @@ -62,7 +62,6 @@
   package org.apache.commons.betwixt.io;
   
   import java.util.HashMap;
  -import java.util.Iterator;
   import java.util.List;
   import java.util.Map;
   
  @@ -70,18 +69,14 @@
   import org.apache.commons.betwixt.ElementDescriptor;
   import org.apache.commons.betwixt.XMLBeanInfo;
   import org.apache.commons.betwixt.XMLIntrospector;
  +import org.apache.commons.betwixt.digester.XMLIntrospectorHelper;
   import org.apache.commons.betwixt.expression.Context;
   import org.apache.commons.betwixt.expression.MethodUpdater;
   import org.apache.commons.betwixt.expression.Updater;
  -import org.apache.commons.betwixt.digester.XMLIntrospectorHelper;
  -
   import org.apache.commons.digester.Rule;
   import org.apache.commons.digester.Rules;
  -import org.apache.commons.digester.Digester;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -
   import org.xml.sax.Attributes;
   
   /** <p><code>BeanCreateRule</code> is a Digester Rule for creating beans
  
  
  
  1.11      +5 -16     jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/io/BeanWriter.java
  
  Index: BeanWriter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/io/BeanWriter.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- BeanWriter.java	15 Dec 2002 19:03:34 -0000	1.10
  +++ BeanWriter.java	30 Dec 2002 18:18:36 -0000	1.11
  @@ -67,20 +67,9 @@
   import java.io.OutputStream;
   import java.io.OutputStreamWriter;
   import java.io.Writer;
  -import java.util.Iterator;
  -import java.util.HashMap;
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -
  -import org.apache.commons.betwixt.AttributeDescriptor;
  -import org.apache.commons.betwixt.ElementDescriptor;
  -import org.apache.commons.betwixt.XMLBeanInfo;
  -import org.apache.commons.betwixt.XMLIntrospector;
  -import org.apache.commons.betwixt.expression.Context;
  -import org.apache.commons.betwixt.expression.Expression;
  -import org.apache.commons.betwixt.io.id.SequentialIDGenerator;
  -
   import org.xml.sax.SAXException;
   
   /** <p><code>BeanWriter</code> outputs beans as XML to an io stream.</p>
  
  
  
  1.8       +5 -12     jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/io/BeanReader.java
  
  Index: BeanReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/io/BeanReader.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- BeanReader.java	15 Dec 2002 20:28:11 -0000	1.7
  +++ BeanReader.java	30 Dec 2002 18:18:36 -0000	1.8
  @@ -63,24 +63,17 @@
   
   import java.beans.IntrospectionException;
   import java.util.HashSet;
  -import java.util.Iterator;
   import java.util.Set;
   
   import javax.xml.parsers.SAXParser;
   
  -import org.apache.commons.betwixt.AttributeDescriptor;
   import org.apache.commons.betwixt.ElementDescriptor;
   import org.apache.commons.betwixt.XMLBeanInfo;
   import org.apache.commons.betwixt.XMLIntrospector;
  -import org.apache.commons.betwixt.expression.Context;
  -import org.apache.commons.betwixt.expression.Expression;
  -
   import org.apache.commons.digester.Digester;
   import org.apache.commons.digester.Rule;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -
   import org.xml.sax.XMLReader;
   
   /** <p><code>BeanReader</code> reads a tree of beans from an XML document.</p>
  
  
  
  1.2       +7 -7      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/strategy/PluralStemmer.java
  
  Index: PluralStemmer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/strategy/PluralStemmer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PluralStemmer.java	10 Jun 2002 17:53:34 -0000	1.1
  +++ PluralStemmer.java	30 Dec 2002 18:18:37 -0000	1.2
  @@ -61,9 +61,9 @@
    */
   package org.apache.commons.betwixt.strategy;
   
  -import org.apache.commons.betwixt.ElementDescriptor;
  -
   import java.util.Map;
  +
  +import org.apache.commons.betwixt.ElementDescriptor;
   
   /** 
    * A plugin Strategy pattern which will detect the plural property which
  
  
  
  1.3       +4 -4      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/strategy/HyphenatedNameMapper.java
  
  Index: HyphenatedNameMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/strategy/HyphenatedNameMapper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HyphenatedNameMapper.java	12 Sep 2002 13:49:03 -0000	1.2
  +++ HyphenatedNameMapper.java	30 Dec 2002 18:18:37 -0000	1.3
  @@ -61,7 +61,7 @@
    */
   package org.apache.commons.betwixt.strategy;
   
  -import java.beans.Introspector;
  +
   
   /** 
    * A name mapper which converts types to a hypenated String. So
  
  
  
  1.5       +6 -7      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/strategy/DefaultPluralStemmer.java
  
  Index: DefaultPluralStemmer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/strategy/DefaultPluralStemmer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultPluralStemmer.java	8 Nov 2002 23:08:31 -0000	1.4
  +++ DefaultPluralStemmer.java	30 Dec 2002 18:18:37 -0000	1.5
  @@ -61,11 +61,10 @@
    */
   package org.apache.commons.betwixt.strategy;
   
  -import org.apache.commons.betwixt.ElementDescriptor;
  -
   import java.util.Iterator;
   import java.util.Map;
   
  +import org.apache.commons.betwixt.ElementDescriptor;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   
  
  
  
  1.2       +2 -2      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/registry/DefaultXMLBeanInfoRegistry.java
  
  Index: DefaultXMLBeanInfoRegistry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/registry/DefaultXMLBeanInfoRegistry.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultXMLBeanInfoRegistry.java	27 Nov 2002 22:19:12 -0000	1.1
  +++ DefaultXMLBeanInfoRegistry.java	30 Dec 2002 18:18:37 -0000	1.2
  @@ -56,8 +56,8 @@
    * <http://www.apache.org/>.
    */
   
  -import java.util.Map;
   import java.util.HashMap;
  +import java.util.Map;
   
   import org.apache.commons.betwixt.XMLBeanInfo;
   
  
  
  
  1.3       +5 -13     jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/AddDefaultsRule.java
  
  Index: AddDefaultsRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/AddDefaultsRule.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AddDefaultsRule.java	8 Jul 2002 16:51:38 -0000	1.2
  +++ AddDefaultsRule.java	30 Dec 2002 18:18:37 -0000	1.3
  @@ -70,16 +70,8 @@
   import org.apache.commons.betwixt.ElementDescriptor;
   import org.apache.commons.betwixt.NodeDescriptor;
   import org.apache.commons.betwixt.XMLBeanInfo;
  -import org.apache.commons.betwixt.XMLIntrospector;
  -import org.apache.commons.betwixt.expression.Context;
  -import org.apache.commons.betwixt.expression.Updater;
  -
  -import org.apache.commons.digester.Rule;
  -import org.apache.commons.digester.Digester;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   
  
  
  
  1.2       +5 -8      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/HideRule.java
  
  Index: HideRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/HideRule.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HideRule.java	10 Jun 2002 17:53:35 -0000	1.1
  +++ HideRule.java	30 Dec 2002 18:18:37 -0000	1.2
  @@ -63,11 +63,8 @@
   
   import java.util.Set;
   
  -import org.apache.commons.digester.Digester;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   
  
  
  
  1.2       +5 -9      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/XMLBeanInfoDigester.java
  
  Index: XMLBeanInfoDigester.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/XMLBeanInfoDigester.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLBeanInfoDigester.java	10 Jun 2002 17:53:34 -0000	1.1
  +++ XMLBeanInfoDigester.java	30 Dec 2002 18:18:37 -0000	1.2
  @@ -67,13 +67,9 @@
   import javax.xml.parsers.SAXParser;
   
   import org.apache.commons.betwixt.XMLIntrospector;
  -
  -import org.apache.commons.digester.Rule;
   import org.apache.commons.digester.Digester;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -
   import org.xml.sax.XMLReader;
   
   /** <p><code>XMLBeanInfoDigester</code> is a digester of XML files
  
  
  
  1.12      +4 -7      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java
  
  Index: XMLIntrospectorHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- XMLIntrospectorHelper.java	15 Dec 2002 15:03:45 -0000	1.11
  +++ XMLIntrospectorHelper.java	30 Dec 2002 18:18:37 -0000	1.12
  @@ -56,8 +56,8 @@
    * <http://www.apache.org/>.
    */
   
  -import java.beans.Introspector;
   import java.beans.IntrospectionException;
  +import java.beans.Introspector;
   import java.beans.PropertyDescriptor;
   import java.lang.reflect.Method;
   import java.util.Collection;
  @@ -67,19 +67,16 @@
   import java.util.Iterator;
   import java.util.Map;
   
  -import org.apache.commons.logging.LogFactory;
  -import org.apache.commons.logging.Log;
  -
   import org.apache.commons.betwixt.AttributeDescriptor;
   import org.apache.commons.betwixt.ElementDescriptor;
   import org.apache.commons.betwixt.NodeDescriptor;
   import org.apache.commons.betwixt.XMLIntrospector;
  -
   import org.apache.commons.betwixt.expression.IteratorExpression;
   import org.apache.commons.betwixt.expression.MethodExpression;
   import org.apache.commons.betwixt.expression.MethodUpdater;
  -
   import org.apache.commons.betwixt.strategy.PluralStemmer;
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   
   /** 
     * <p><code>XMLIntrospectorHelper</code> a helper class for 
  
  
  
  1.3       +1 -3      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/ElementRule.java
  
  Index: ElementRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/ElementRule.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ElementRule.java	1 Jul 2002 18:52:21 -0000	1.2
  +++ ElementRule.java	30 Dec 2002 18:18:37 -0000	1.3
  @@ -64,10 +64,8 @@
   import org.apache.commons.betwixt.ElementDescriptor;
   import org.apache.commons.betwixt.XMLBeanInfo;
   import org.apache.commons.betwixt.expression.ConstantExpression;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   
  
  
  
  1.2       +1 -3      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/AttributeRule.java
  
  Index: AttributeRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/AttributeRule.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AttributeRule.java	10 Jun 2002 17:53:35 -0000	1.1
  +++ AttributeRule.java	30 Dec 2002 18:18:37 -0000	1.2
  @@ -62,10 +62,8 @@
   import org.apache.commons.betwixt.AttributeDescriptor;
   import org.apache.commons.betwixt.ElementDescriptor;
   import org.apache.commons.betwixt.expression.ConstantExpression;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   
  
  
  
  1.2       +5 -15     jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/InfoRule.java
  
  Index: InfoRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/InfoRule.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InfoRule.java	10 Jun 2002 17:53:35 -0000	1.1
  +++ InfoRule.java	30 Dec 2002 18:18:37 -0000	1.2
  @@ -61,19 +61,9 @@
    */
   package org.apache.commons.betwixt.digester;
   
  -import org.apache.commons.betwixt.AttributeDescriptor;
  -import org.apache.commons.betwixt.ElementDescriptor;
   import org.apache.commons.betwixt.XMLBeanInfo;
  -import org.apache.commons.betwixt.XMLIntrospector;
  -import org.apache.commons.betwixt.expression.Context;
  -import org.apache.commons.betwixt.expression.Updater;
  -
  -import org.apache.commons.digester.Rule;
  -import org.apache.commons.digester.Digester;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -
   import org.xml.sax.Attributes;
   
   /** <p><code>InfoRule</code> the digester Rule for parsing the info element.</p>
  
  
  
  1.2       +5 -22     jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/RuleSupport.java
  
  Index: RuleSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/RuleSupport.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RuleSupport.java	10 Jun 2002 17:53:35 -0000	1.1
  +++ RuleSupport.java	30 Dec 2002 18:18:37 -0000	1.2
  @@ -61,29 +61,12 @@
    */
   package org.apache.commons.betwixt.digester;
   
  -import java.beans.BeanInfo;
  -import java.beans.Introspector;
  -import java.beans.PropertyDescriptor;
  -import java.lang.reflect.Method;
   import java.util.Set;
   
  -import org.apache.commons.betwixt.AttributeDescriptor;
  -import org.apache.commons.betwixt.ElementDescriptor;
  -import org.apache.commons.betwixt.XMLBeanInfo;
   import org.apache.commons.betwixt.XMLIntrospector;
  -import org.apache.commons.betwixt.expression.Context;
  -import org.apache.commons.betwixt.expression.Updater;
  -import org.apache.commons.betwixt.expression.MethodExpression;
  -import org.apache.commons.betwixt.expression.MethodUpdater;
  -
   import org.apache.commons.digester.Rule;
  -import org.apache.commons.digester.Digester;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -
  -import org.xml.sax.Attributes;
  -import org.xml.sax.SAXException;
   
   /** <p><code>RuleSupport</code> is an abstract base class containing
useful
     * helper methods.</p>
  
  
  
  1.5       +5 -6      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/expression/MethodUpdater.java
  
  Index: MethodUpdater.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/expression/MethodUpdater.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MethodUpdater.java	11 Dec 2002 22:12:11 -0000	1.4
  +++ MethodUpdater.java	30 Dec 2002 18:18:37 -0000	1.5
  @@ -64,7 +64,6 @@
   import java.lang.reflect.Method;
   
   import org.apache.commons.beanutils.ConvertUtils;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   
  
  
  

--
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