commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject cvs commit: jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/strategy HyphenatedNameMapper.java
Date Sun, 05 Jan 2003 17:18:33 GMT
rdonkin     2003/01/05 09:18:32

  Modified:    betwixt/src/java/org/apache/commons/betwixt
                        AttributeDescriptor.java NodeDescriptor.java
                        XMLIntrospector.java
               betwixt/src/java/org/apache/commons/betwixt/digester
                        AddDefaultsRule.java AttributeRule.java
                        ElementRule.java HideRule.java InfoRule.java
                        XMLIntrospectorHelper.java
               betwixt/src/java/org/apache/commons/betwixt/expression
                        Context.java StringExpression.java
               betwixt/src/java/org/apache/commons/betwixt/io
                        AbstractBeanWriter.java BeanCreateRule.java
                        BeanReader.java
               betwixt/src/java/org/apache/commons/betwixt/strategy
                        HyphenatedNameMapper.java
  Log:
  Split lines that were more than 100 characters long
  
  Revision  Changes    Path
  1.2       +2 -1      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/AttributeDescriptor.java
  
  Index: AttributeDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/AttributeDescriptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AttributeDescriptor.java	10 Jun 2002 17:53:34 -0000	1.1
  +++ AttributeDescriptor.java	5 Jan 2003 17:18:32 -0000	1.2
  @@ -85,6 +85,7 @@
       
       /** Return something useful for logging */
       public String toString() {
  -        return "AttributeDescriptor[qname=" + getQualifiedName() + ",class=" + getPropertyType()
+ "]";
  +        return "AttributeDescriptor[qname=" + getQualifiedName() 
  +            + ",class=" + getPropertyType() + "]";
       }
   }
  
  
  
  1.2       +14 -4     jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/NodeDescriptor.java
  
  Index: NodeDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/NodeDescriptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NodeDescriptor.java	10 Jun 2002 17:53:34 -0000	1.1
  +++ NodeDescriptor.java	5 Jan 2003 17:18:32 -0000	1.2
  @@ -64,7 +64,8 @@
   import org.apache.commons.betwixt.expression.Expression;
   import org.apache.commons.betwixt.expression.Updater;
   
  -/** <p> Common superclass for <code>ElementDescriptor</code> and <code>AttributeDescriptor</code>.</p>
  +/** <p> Common superclass for <code>ElementDescriptor</code> 
  +  * and <code>AttributeDescriptor</code>.</p>
     *
     * <p> Nodes can have just a local name
     * or they can have a local name, qualified name and a namespace uri.</p>
  @@ -136,7 +137,10 @@
           this.qualifiedName = qualifiedName;
       }    
       
  -    /** Returns the namespace URI that this node belongs to or "" if there is no namespace
defined */
  +    /**  
  +     * Returns the namespace URI that this node belongs to 
  +     * or "" if there is no namespace defined 
  +     */
       public String getURI() {
           return uri;
       }
  @@ -185,12 +189,18 @@
       }
   
       
  -    /** @return the property expression to which this node refers to, or null if it is
just a constant */
  +    /** 
  +     * @return the property expression to which this node refers to, 
  +     * or null if it is just a constant 
  +     */
       public String getPropertyName() {
           return propertyName;
       }
       
  -    /** Sets the property expression to which this node refers to, or null if it is just
a constant */
  +    /** 
  +     * Sets the property expression to which this node refers to, 
  +     * or null if it is just a constant 
  +     */
       public void setPropertyName(String propertyName) {
           this.propertyName = propertyName;
       }
  
  
  
  1.17      +14 -7     jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/XMLIntrospector.java
  
  Index: XMLIntrospector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/XMLIntrospector.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- XMLIntrospector.java	5 Jan 2003 16:27:16 -0000	1.16
  +++ XMLIntrospector.java	5 Jan 2003 17:18:32 -0000	1.17
  @@ -158,7 +158,8 @@
        * After standard introspection is complete, the instance will be passed to the registry.</p>
        *
        * <p>This allows finely grained control over the caching strategy.
  -     * It also allows the standard introspection mechanism to be overridden on a per class
basis.</p>
  +     * It also allows the standard introspection mechanism 
  +     * to be overridden on a per class basis.</p>
        */
       public XMLBeanInfoRegistry getRegistry() {
           return registry;
  @@ -171,7 +172,8 @@
        * After standard introspection is complete, the instance will be passed to the registry.</p>
        *
        * <p>This allows finely grained control over the caching strategy.
  -     * It also allows the standard introspection mechanism to be overridden on a per class
basis.</p>
  +     * It also allows the standard introspection mechanism 
  +     * to be overridden on a per class basis.</p>
        */
       public void setRegistry(XMLBeanInfoRegistry registry) {
           this.registry = registry;
  @@ -272,7 +274,8 @@
           Class beanClass = beanDescriptor.getBeanClass();
           
           ElementDescriptor elementDescriptor = new ElementDescriptor();
  -        elementDescriptor.setLocalName( getElementNameMapper().mapTypeToElementName( beanDescriptor.getName()
) );
  +        elementDescriptor.setLocalName( 
  +            getElementNameMapper().mapTypeToElementName( beanDescriptor.getName() ) );
           elementDescriptor.setPropertyType( beanInfo.getBeanDescriptor().getBeanClass()
);
           
           if (log.isTraceEnabled()) {
  @@ -386,7 +389,8 @@
   
       /** 
        * @return the strategy used to convert bean type names into element names
  -     * @deprecated getNameMapper is split up in {@link #getElementNameMapper()} and {@link
#getAttributeNameMapper()}
  +     * @deprecated getNameMapper is split up in 
  +     * {@link #getElementNameMapper()} and {@link #getAttributeNameMapper()}
        */
       public NameMapper getNameMapper() {
           return getElementNameMapper();
  @@ -395,7 +399,8 @@
       /** 
        * Sets the strategy used to convert bean type names into element names
        * @param nameMapper
  -     * @deprecated setNameMapper is split up in {@link #setElementNameMapper(NameMapper)}
and {@link #setAttributeNameMapper(NameMapper)}
  +     * @deprecated setNameMapper is split up in 
  +     * {@link #setElementNameMapper(NameMapper)} and {@link #setAttributeNameMapper(NameMapper)}
        */
       public void setNameMapper(NameMapper nameMapper) {
           setElementNameMapper(nameMapper);
  @@ -455,14 +460,16 @@
       //-------------------------------------------------------------------------       

       
       /** 
  -     * A Factory method to lazily create a new strategy to detect matching singular and
plural properties 
  +     * A Factory method to lazily create a new strategy 
  +     * to detect matching singular and plural properties.
        */
       protected PluralStemmer createPluralStemmer() {
           return new DefaultPluralStemmer();
       }
       
       /** 
  -     * A Factory method to lazily create a strategy used to convert bean type names into
element names
  +     * A Factory method to lazily create a strategy 
  +     * used to convert bean type names into element names.
        */
       protected NameMapper createNameMapper() {
           return new DefaultNameMapper();
  
  
  
  1.4       +8 -3      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AddDefaultsRule.java	30 Dec 2002 18:18:37 -0000	1.3
  +++ AddDefaultsRule.java	5 Jan 2003 17:18:32 -0000	1.4
  @@ -129,7 +129,10 @@
           }
           
           // default any addProperty() methods
  -        XMLIntrospectorHelper.defaultAddMethods( getXMLIntrospector(), getRootElementDescriptor(),
beanClass );
  +        XMLIntrospectorHelper.defaultAddMethods( 
  +                                            getXMLIntrospector(), 
  +                                            getRootElementDescriptor(), 
  +                                            beanClass );
       }
   
   
  @@ -154,7 +157,8 @@
                   }
               }
               else { 
  -                throw new SAXException( "the <addDefaults> element should be within
an <element> tag" );
  +                throw new SAXException( 
  +                    "the <addDefaults> element should be within an <element>
tag" );
               }
           }
           else if ( top instanceof ElementDescriptor ) {
  @@ -167,7 +171,8 @@
               }
           }
           else {
  -            throw new SAXException( "Invalid use of <addDefaults>. It should be nested
inside <element> element" );
  +            throw new SAXException( 
  +                "Invalid use of <addDefaults>. It should be nested inside <element>
element" );
           }            
       }     
       
  
  
  
  1.3       +3 -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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AttributeRule.java	30 Dec 2002 18:18:37 -0000	1.2
  +++ AttributeRule.java	5 Jan 2003 17:18:32 -0000	1.3
  @@ -125,8 +125,8 @@
               parent.addAttributeDescriptor( descriptor );
           }
           else {
  -            throw new SAXException( "Invalid use of <attribute>. It should " +
  -                "be nested inside an <element> element" );
  +            throw new SAXException( "Invalid use of <attribute>. It should " 
  +                + "be nested inside an <element> element" );
           }            
   
           digester.push(descriptor);        
  @@ -149,7 +149,7 @@
               try {
                   return classLoader.loadClass(name);
               }
  -            catch (Exception e) {
  +            catch (Exception e) { // SWALLOW
               }
           }
           return null;            
  
  
  
  1.4       +4 -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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ElementRule.java	30 Dec 2002 18:18:37 -0000	1.3
  +++ ElementRule.java	5 Jan 2003 17:18:32 -0000	1.4
  @@ -146,8 +146,8 @@
               parent.addElementDescriptor( descriptor );
           }
           else {
  -            throw new SAXException( "Invalid use of <element>. It should " + 
  -                "be nested inside <info> or other <element> nodes" );
  +            throw new SAXException( "Invalid use of <element>. It should " 
  +                + "be nested inside <info> or other <element> nodes" );
           }
   
           digester.push(descriptor);        
  @@ -191,7 +191,8 @@
           
           if (log.isTraceEnabled()) {
               log.trace("Cannot find property type.");
  -            log.trace("  className=" + propertyClassName + " base=" + beanClass + " name="
+ propertyName);
  +            log.trace("  className=" + propertyClassName 
  +                        + " base=" + beanClass + " name=" + propertyName);
           }
           return null;            
       }
  
  
  
  1.3       +2 -1      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HideRule.java	30 Dec 2002 18:18:37 -0000	1.2
  +++ HideRule.java	5 Jan 2003 17:18:32 -0000	1.3
  @@ -93,7 +93,8 @@
       public void begin(Attributes attributes) throws Exception {
           String name = attributes.getValue( "property" );
           if ( name == null || name.length() == 0 ) {
  -            throw new SAXException( "<ignore> element is missing the mandatory attribute
'property'" );
  +            throw new SAXException( 
  +                "<ignore> element is missing the mandatory attribute 'property'"
);
           }
           Set propertySet = getProcessedPropertyNameSet();
           propertySet.add( name );
  
  
  
  1.3       +4 -1      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InfoRule.java	30 Dec 2002 18:18:37 -0000	1.2
  +++ InfoRule.java	5 Jan 2003 17:18:32 -0000	1.3
  @@ -105,7 +105,10 @@
                   getXMLInfoDigester().setAttributesForPrimitives( true );
               }
               else {
  -                throw new Exception( "Invalid value inside element <info> for attribute
'primitiveTypes'. Value should be 'element' or 'attribute'" );
  +                // XXX Should this be a checked exception?
  +                throw new Exception( 	
  +                    "Invalid value inside element <info> for attribute 'primitiveTypes'."
  +                    + " Value should be 'element' or 'attribute'" );
               }
           }
           
  
  
  
  1.13      +35 -12    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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- XMLIntrospectorHelper.java	30 Dec 2002 18:18:37 -0000	1.12
  +++ XMLIntrospectorHelper.java	5 Jan 2003 17:18:32 -0000	1.13
  @@ -188,7 +188,8 @@
               }
   
               ElementDescriptor elementDescriptor = new ElementDescriptor();
  -            elementDescriptor.setWrapCollectionsInElement(introspector.isWrapCollectionsInElement());
  +            elementDescriptor.setWrapCollectionsInElement(
  +                        introspector.isWrapCollectionsInElement());
               elementDescriptor.setElementDescriptors( new ElementDescriptor[] { loopDescriptor
} );
               
               nodeDescriptor = elementDescriptor;            
  @@ -208,10 +209,12 @@
   
           if (nodeDescriptor instanceof AttributeDescriptor) {
               // we want to use the attributemapper only when it is an attribute.. 
  -            nodeDescriptor.setLocalName( introspector.getAttributeNameMapper().mapTypeToElementName(
name ) );
  +            nodeDescriptor.setLocalName( 
  +                introspector.getAttributeNameMapper().mapTypeToElementName( name ) );
           }
           else {
  -            nodeDescriptor.setLocalName( introspector.getElementNameMapper().mapTypeToElementName(
name ) );
  +            nodeDescriptor.setLocalName( 
  +                introspector.getElementNameMapper().mapTypeToElementName( name ) );
           }        
     
           nodeDescriptor.setPropertyName( propertyDescriptor.getName() );
  @@ -224,7 +227,9 @@
       }
       
       
  -    public static void configureProperty( ElementDescriptor elementDescriptor, PropertyDescriptor
propertyDescriptor ) {
  +    public static void configureProperty( 
  +                                    ElementDescriptor elementDescriptor, 
  +                                    PropertyDescriptor propertyDescriptor ) {
           Class type = propertyDescriptor.getPropertyType();
           Method readMethod = propertyDescriptor.getReadMethod();
           Method writeMethod = propertyDescriptor.getWriteMethod();
  @@ -278,7 +283,9 @@
       }
       
       
  -    public static void configureProperty( AttributeDescriptor attributeDescriptor, PropertyDescriptor
propertyDescriptor ) {
  +    public static void configureProperty( 
  +                                    AttributeDescriptor attributeDescriptor, 
  +                                    PropertyDescriptor propertyDescriptor ) {
           Class type = propertyDescriptor.getPropertyType();
           Method readMethod = propertyDescriptor.getReadMethod();
           Method writeMethod = propertyDescriptor.getWriteMethod();
  @@ -300,7 +307,8 @@
               return;
           }
           if ( isLoopType( type ) ) {
  -            log.warn( "Using loop type for an attribute. Type = " + type.getName() + "
attribute: " + attributeDescriptor.getQualifiedName() );
  +            log.warn( "Using loop type for an attribute. Type = " 
  +                    + type.getName() + " attribute: " + attributeDescriptor.getQualifiedName()
);
           }
   
           log.trace( "Standard property" );
  @@ -333,7 +341,10 @@
        * the string. This should work for most use cases. 
        * e.g. addChild() would match the children property.
        */
  -    public static void defaultAddMethods( XMLIntrospector introspector, ElementDescriptor
rootDescriptor, Class beanClass ) {
  +    public static void defaultAddMethods( 
  +                                            XMLIntrospector introspector, 
  +                                            ElementDescriptor rootDescriptor, 
  +                                            Class beanClass ) {
           // lets iterate over all methods looking for one of the form
           // add*(PropertyType)
           if ( beanClass != null ) {
  @@ -356,7 +367,10 @@
                           // and if so, we'll set a new Updater on it if there
                           // is not one already
                           ElementDescriptor descriptor = 
  -                            findGetCollectionDescriptor( introspector, rootDescriptor,
propertyName );
  +                            findGetCollectionDescriptor( 
  +                                                        introspector, 
  +                                                        rootDescriptor, 
  +                                                        propertyName );
                               
                           if ( log.isDebugEnabled() ) {	
                               log.debug( "!! " + propertyName + " -> " + descriptor );
  @@ -378,7 +392,9 @@
                                   ElementDescriptor child = children[0];
                                   String localName = child.getLocalName();
                                   if ( localName == null || localName.length() == 0 ) {
  -                                    child.setLocalName( introspector.getElementNameMapper().mapTypeToElementName(
propertyName ) );
  +                                    child.setLocalName( 
  +                                        introspector.getElementNameMapper()
  +                                            .mapTypeToElementName( propertyName ) );
                                   }
                               }
                           }
  @@ -437,7 +453,10 @@
        * to match. e.g. if an addChild() method is detected the 
        * descriptor for the 'children' getter property should be returned.
        */
  -    protected static ElementDescriptor findGetCollectionDescriptor( XMLIntrospector introspector,
ElementDescriptor rootDescriptor, String propertyName ) {
  +    protected static ElementDescriptor findGetCollectionDescriptor( 
  +                                                XMLIntrospector introspector, 
  +                                                ElementDescriptor rootDescriptor, 
  +                                                String propertyName ) {
           // create the Map of propertyName -> descriptor that the PluralStemmer will
choose
           Map map = new HashMap();
           //String propertyName = rootDescriptor.getPropertyName();
  @@ -455,7 +474,8 @@
           ElementDescriptor elementDescriptor = stemmer.findPluralDescriptor( propertyName,
map );
           
           if ( log.isTraceEnabled() ) {
  -            log.trace( "findPluralDescriptor( " + propertyName + " ):ElementDescriptor="
+ elementDescriptor );
  +            log.trace( 
  +                "findPluralDescriptor( " + propertyName + " ):ElementDescriptor=" + elementDescriptor
);
           }
           
           return elementDescriptor;
  @@ -482,7 +502,10 @@
        * Traverse the tree of element descriptors and find the oldValue and swap it with
the newValue.
        * This would be much easier to do if ElementDescriptor supported a parent relationship.
        */     
  -    protected static void swapDescriptor( ElementDescriptor rootDescriptor, ElementDescriptor
oldValue, ElementDescriptor newValue ) {
  +    protected static void swapDescriptor( 
  +                                ElementDescriptor rootDescriptor, 
  +                                ElementDescriptor oldValue, 
  +                                ElementDescriptor newValue ) {
           ElementDescriptor[] children = rootDescriptor.getElementDescriptors();
           if ( children != null ) {
               for ( int i = 0, size = children.length; i < size; i++ ) {
  
  
  
  1.2       +4 -1      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/expression/Context.java
  
  Index: Context.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/expression/Context.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Context.java	10 Jun 2002 17:53:33 -0000	1.1
  +++ Context.java	5 Jan 2003 17:18:32 -0000	1.2
  @@ -94,7 +94,10 @@
       private Object bean;
       /** Variables map */
       private Map variables = new HashMap();
  -    /** Logging uses commons-logging <code>Log</code> named <code>org.apache.commons.betwixt</code>
*/
  +    /** 
  +     * Logging uses commons-logging <code>Log</code> 
  +     * named <code>org.apache.commons.betwixt</code> 
  +     */
       private Log log; 
       
       /** Construct context with default log */
  
  
  
  1.3       +1 -1      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/expression/StringExpression.java
  
  Index: StringExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/expression/StringExpression.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StringExpression.java	1 Jul 2002 18:57:57 -0000	1.2
  +++ StringExpression.java	5 Jan 2003 17:18:32 -0000	1.3
  @@ -99,6 +99,6 @@
       
       public String toString() {
           return "StringExpression";
  -    }	
  +    }
   
   }
  
  
  
  1.9       +21 -13    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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AbstractBeanWriter.java	30 Dec 2002 18:18:36 -0000	1.8
  +++ AbstractBeanWriter.java	5 Jan 2003 17:18:32 -0000	1.9
  @@ -159,7 +159,8 @@
       
       
       /** 
  -     * <p>Writes the given bean to the current stream using the given <code>qualifiedName</code>.</p>
  +     * <p>Writes the given bean to the current stream 
  +     * using the given <code>qualifiedName</code>.</p>
        *
        * <p>This method will throw a <code>CyclicReferenceException</code>
when a cycle
        * is encountered in the graph <strong>only</strong> if the <code>WriteIDs</code>
  @@ -271,7 +272,8 @@
       }
       
       /** 
  -      * Get <code>IDGenerator</code> implementation used to generate <code>ID</code>
attribute values .
  +      * Get <code>IDGenerator</code> implementation used to 
  +      * generate <code>ID</code> attribute values .
         *
         * @return implementation used for <code>ID</code> attribute generation
         */
  @@ -280,7 +282,8 @@
       }
       
       /** 
  -      * Set <code>IDGenerator</code> implementation used to generate <code>ID</code>
attribute values.
  +      * Set <code>IDGenerator</code> implementation 
  +      * used to generate <code>ID</code> attribute values.
         * This property can be used to customize the algorithm used for generation.
         *
         * @param idGenerator use this implementation for <code>ID</code> attribute
generation
  @@ -306,8 +309,10 @@
       /**
        * <p> Get the introspector used. </p>
        *
  -     * <p> The {@link XMLBeanInfo} used to map each bean is created by the <code>XMLIntrospector</code>.
  -     * One way in which the mapping can be customized is by altering the <code>XMLIntrospector</code>.
</p>
  +     * <p> The {@link XMLBeanInfo} used to map each bean is 
  +     * created by the <code>XMLIntrospector</code>.
  +     * One way in which the mapping can be customized is 
  +     * by altering the <code>XMLIntrospector</code>. </p>
        */
       public XMLIntrospector getXMLIntrospector() {
           return introspector;
  @@ -317,8 +322,10 @@
       /**
        * <p> Set the introspector to be used. </p>
        *
  -     * <p> The {@link XMLBeanInfo} used to map each bean is created by the <code>XMLIntrospector</code>.
  -     * One way in which the mapping can be customized is by altering the <code>XMLIntrospector</code>.
</p>
  +     * <p> The {@link XMLBeanInfo} used to map each bean is 
  +     * created by the <code>XMLIntrospector</code>.
  +     * One way in which the mapping can be customized is by 
  +     * altering the <code>XMLIntrospector</code>. </p>
        *
        * @param introspector use this introspector
        */
  @@ -347,7 +354,8 @@
       //-------------------------------------------------------------------------    
   
       /** Express an element tag start using given qualified name */
  -    abstract protected void expressElementStart(String qualifiedName) throws IOException,
SAXException;
  +    abstract protected void expressElementStart(String qualifiedName) 
  +                                        throws IOException, SAXException;
           
       abstract protected void expressTagClose() throws IOException, SAXException;
       
  
  
  
  1.15      +12 -5     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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- BeanCreateRule.java	30 Dec 2002 18:18:36 -0000	1.14
  +++ BeanCreateRule.java	5 Jan 2003 17:18:32 -0000	1.15
  @@ -211,7 +211,8 @@
        * @param attributes The attribute list of this element
        */
       public void begin(Attributes attributes) throws Exception {
  -        log.debug( "Called with descriptor: " + descriptor + " propertyType: " + descriptor.getPropertyType()
);
  +        log.debug( "Called with descriptor: " + descriptor 
  +                    + " propertyType: " + descriptor.getPropertyType() );
           
           if (log.isTraceEnabled()) {
               int attributesLength = attributes.getLength();
  @@ -249,7 +250,8 @@
                   //ElementDescriptor typeDescriptor = descriptor;
           
                   // iterate through all attributes        
  -                AttributeDescriptor[] attributeDescriptors = typeDescriptor.getAttributeDescriptors();
  +                AttributeDescriptor[] attributeDescriptors 
  +                    = typeDescriptor.getAttributeDescriptors();
                   if ( attributeDescriptors != null ) {
                       for ( int i = 0, size = attributeDescriptors.length; i < size; i++
) {
                           AttributeDescriptor attributeDescriptor = attributeDescriptors[i];
  @@ -445,7 +447,7 @@
                   if ( childDescriptor.getUpdater() != null ) {
                       if (log.isTraceEnabled()) {
                           log.trace("Element has updater "
  -                                +((MethodUpdater) childDescriptor.getUpdater()).getMethod().getName());
  +                         + ((MethodUpdater) childDescriptor.getUpdater()).getMethod().getName());
                       }
                       if ( childDescriptor.isPrimitiveType() ) {
                           addPrimitiveTypeRule(path, childDescriptor);
  @@ -472,7 +474,11 @@
                               addPrimitiveTypeRule(path, childDescriptor);
                           }
                           else {
  -                            Rule rule = new BeanCreateRule( childDescriptor, context, path
+ '/', matchIDs );
  +                            Rule rule = new BeanCreateRule( 
  +                                                        childDescriptor, 
  +                                                        context, 
  +                                                        path + '/', 
  +                                                        matchIDs );
                               addRule( path, rule );
                           }
                       }
  @@ -544,7 +550,8 @@
           }
           else {
               if ( log.isDebugEnabled() ) {
  -                log.debug( "Ignoring duplicate digester rule for path: " + path + " rule:
" + rule );
  +                log.debug( "Ignoring duplicate digester rule for path: " 
  +                            + path + " rule: " + rule );
                   log.debug( "New rule (not added): " + rule );
                   log.debug( "Existing rule:" + matches.get(0) );
               }
  
  
  
  1.9       +12 -5     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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BeanReader.java	30 Dec 2002 18:18:36 -0000	1.8
  +++ BeanReader.java	5 Jan 2003 17:18:32 -0000	1.9
  @@ -169,8 +169,10 @@
       /**
        * <p> Get the introspector used. </p>
        *
  -     * <p> The {@link XMLBeanInfo} used to map each bean is created by the <code>XMLIntrospector</code>.
  -     * One way in which the mapping can be customized is by altering the <code>XMLIntrospector</code>.
</p>
  +     * <p> The {@link XMLBeanInfo} used to map each bean is 
  +     * created by the <code>XMLIntrospector</code>.
  +     * One way in which the mapping can be customized is by 
  +     * altering the <code>XMLIntrospector</code>. </p>
        */
       public XMLIntrospector getXMLIntrospector() {
           return introspector;
  @@ -180,8 +182,10 @@
       /**
        * <p> Set the introspector to be used. </p>
        *
  -     * <p> The {@link XMLBeanInfo} used to map each bean is created by the <code>XMLIntrospector</code>.
  -     * One way in which the mapping can be customized is by altering the <code>XMLIntrospector</code>.
</p>
  +     * <p> The {@link XMLBeanInfo} used to map each bean is 
  +     * created by the <code>XMLIntrospector</code>.
  +     * One way in which the mapping can be customized is by 
  +     * altering the <code>XMLIntrospector</code>. </p>
        *
        * @param introspector use this introspector
        */
  @@ -228,7 +232,10 @@
       /** 
        * Adds a new bean create rule for the specified path
        */
  -    protected void addBeanCreateRule( String path, ElementDescriptor elementDescriptor,
Class beanClass ) {
  +    protected void addBeanCreateRule( 
  +                                    String path, 
  +                                    ElementDescriptor elementDescriptor, 
  +                                    Class beanClass ) {
           Rule rule = new BeanCreateRule( elementDescriptor, beanClass, path + "/" , matchIDs);
           addRule( path, rule );
   
  
  
  
  1.5       +4 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HyphenatedNameMapper.java	5 Jan 2003 09:52:22 -0000	1.4
  +++ HyphenatedNameMapper.java	5 Jan 2003 17:18:32 -0000	1.5
  @@ -84,7 +84,10 @@
       /** whether upper or lower case conversions should be performed */
       private boolean upperCase = false;
       
  -    /** Construct a hyphenated name mapper that converts the name to lower case and uses
the default separator. */
  +    /** 
  +     * Construct a hyphenated name mapper that converts the name to lower case 
  +     * and uses the default separator. 
  +     */
       public HyphenatedNameMapper() {
       }
       
  
  
  

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