commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r555845 - in /jakarta/commons/proper/beanutils/trunk: ./ optional/bean-collections/src/java/org/apache/commons/beanutils/ src/java/org/apache/commons/beanutils/ src/java/org/apache/commons/beanutils/converters/ src/java/org/apache/commons/b...
Date Fri, 13 Jul 2007 02:52:07 GMT
Author: niallp
Date: Thu Jul 12 19:52:05 2007
New Revision: 555845

URL: http://svn.apache.org/viewvc?view=rev&rev=555845
Log:
BEANUTILS-254 - add checkstyle config and fix more checkstyle issues
- Unused imports
- missing braces on if statements
- lines too long

Added:
    jakarta/commons/proper/beanutils/trunk/checkstyle.xml   (with props)
    jakarta/commons/proper/beanutils/trunk/license-header.txt   (with props)
Modified:
    jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanComparator.java
    jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanMap.java
    jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPredicate.java
    jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java
    jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicate.java
    jakarta/commons/proper/beanutils/trunk/pom.xml
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BasicDynaClass.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtilsBean.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/LazyDynaBean.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/LazyDynaMap.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/MethodUtils.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/PropertyUtils.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/PropertyUtilsBean.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/BooleanConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/CharacterConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ClassConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/DateTimeConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/FileConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/LongArrayConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/NumberConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/StringArrayConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/StringConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/URLConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/expression/Resolver.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java
    jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/collections/FastHashMap.java

Added: jakarta/commons/proper/beanutils/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/checkstyle.xml?view=auto&rev=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/checkstyle.xml (added)
+++ jakarta/commons/proper/beanutils/trunk/checkstyle.xml Thu Jul 12 19:52:05 2007
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
+
+<!-- commons lang customization of default Checkstyle behavior -->
+<module name="Checker">
+  <property name="localeLanguage" value="en"/>
+  <module name="PackageHtml"/>
+  <module name="TreeWalker">
+    <module name="TabCharacter"/>
+    <module name="AvoidStarImport"/>
+    <module name="RedundantImport"/>
+    <module name="UnusedImports"/>
+    <module name="NeedBraces"/>
+    <module name="RedundantThrows">
+      <property name="allowUnchecked" value="true"/>
+    </module>
+    <module name="LineLength">
+      <property name="max" value="120"/>
+    </module>
+    <module name="JavadocType">
+      <property name="scope" value="protected"/>
+    </module>
+    <module name="JavadocMethod">
+      <property name="scope" value="protected"/>
+      <property name="allowUndeclaredRTE" value="true"/>
+    </module>
+    <module name="Header">
+       <property name="headerFile" value="license-header.txt"/>
+    </module>
+ </module>
+</module>
+                        
+

Propchange: jakarta/commons/proper/beanutils/trunk/checkstyle.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/proper/beanutils/trunk/checkstyle.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: jakarta/commons/proper/beanutils/trunk/license-header.txt
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/license-header.txt?view=auto&rev=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/license-header.txt (added)
+++ jakarta/commons/proper/beanutils/trunk/license-header.txt Thu Jul 12 19:52:05 2007
@@ -0,0 +1,16 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */

Propchange: jakarta/commons/proper/beanutils/trunk/license-header.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/proper/beanutils/trunk/license-header.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanComparator.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanComparator.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanComparator.java (original)
+++ jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanComparator.java Thu Jul 12 19:52:05 2007
@@ -20,7 +20,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.io.Serializable;
 import java.util.Comparator;
-import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.collections.comparators.ComparableComparator;
 
 /**
@@ -178,15 +177,23 @@
      * @return whether the the comparators are equal or not
      */
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof BeanComparator)) return false;
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof BeanComparator)) {
+            return false;
+        }
 
         final BeanComparator beanComparator = (BeanComparator) o;
 
-        if (!comparator.equals(beanComparator.comparator)) return false;
+        if (!comparator.equals(beanComparator.comparator)) {
+            return false;
+        }
         if (property != null)
         {
-            if (!property.equals(beanComparator.property)) return false;
+            if (!property.equals(beanComparator.property)) {
+                return false;
+            }
         }
         else
         {

Modified: jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanMap.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanMap.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanMap.java (original)
+++ jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanMap.java Thu Jul 12 19:52:05 2007
@@ -321,7 +321,9 @@
      * BeanMap are fixed).
      */
     public void clear() {
-        if(bean == null) return;
+        if(bean == null) {
+            return;
+        }
 
         Class beanClass = null;
         try {
@@ -422,7 +424,8 @@
             Object oldValue = get( name );
             Method method = getWriteMethod( name );
             if ( method == null ) {
-                throw new IllegalArgumentException( "The bean of type: "+ bean.getClass().getName() + " has no property called: " + name );
+                throw new IllegalArgumentException( "The bean of type: "+ 
+                        bean.getClass().getName() + " has no property called: " + name );
             }
             try {
                 Object[] arguments = createWriteMethodArguments( method, value );
@@ -654,7 +657,9 @@
     }
 
     private void initialise() {
-        if(getBean() == null) return;
+        if(getBean() == null) {
+            return;
+        }
 
         Class  beanClass = getBean().getClass();
         try {
@@ -751,7 +756,8 @@
      *   by {@link #convertType(Class,Object)}
      * @throws ClassCastException if an error occurs creating the method args
      */
-    protected Object[] createWriteMethodArguments( Method method, Object value ) throws IllegalAccessException, ClassCastException {            
+    protected Object[] createWriteMethodArguments( Method method, Object value ) 
+        throws IllegalAccessException, ClassCastException {            
         try {
             if ( value != null ) {
                 Class[] types = method.getParameterTypes();

Modified: jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPredicate.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPredicate.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPredicate.java (original)
+++ jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPredicate.java Thu Jul 12 19:52:05 2007
@@ -115,7 +115,7 @@
 
     /** 
      * Sets the <code>Predicate</code> to be applied to the value of the named property
-     * during {@link evaluate}.
+     * during {@link #evaluate(Object)}.
      * @param predicate <code>Predicate</code>, not null
      */
     public void setPredicate(Predicate predicate) {

Modified: jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java (original)
+++ jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java Thu Jul 12 19:52:05 2007
@@ -33,7 +33,9 @@
  * what property will be updated and with what value.
  * <dl>
  *    <dt>
- *       <b><code><pre>public BeanPropertyValueChangeClosure( String propertyName, Object propertyValue )</pre></code></b>
+ *       <b><code>
+ *           <pre>public BeanPropertyValueChangeClosure( String propertyName, Object propertyValue )</pre>
+ *       </code></b>
  *    </dt>
  *    <dd>
  *       Will create a <code>Closure</code> that will update an object by setting the property

Modified: jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicate.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicate.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicate.java (original)
+++ jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicate.java Thu Jul 12 19:52:05 2007
@@ -35,7 +35,9 @@
  * be.
  * <dl>
  *    <dt>
- *       <strong><code><pre>public BeanPropertyValueEqualsPredicate( String propertyName, Object propertyValue )</pre></code></strong>
+ *       <strong><code>
+ *           <pre>public BeanPropertyValueEqualsPredicate( String propertyName, Object propertyValue )</pre>
+ *       </code></strong>
  *    </dt>
  *    <dd>
  *       Will create a <code>Predicate</code> that will evaluate the target object and return

Modified: jakarta/commons/proper/beanutils/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/pom.xml?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/pom.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/pom.xml Thu Jul 12 19:52:05 2007
@@ -197,4 +197,17 @@
         <maven.compile.target>1.3</maven.compile.target>
     </properties> 
 
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <configLocation>checkstyle.xml</configLocation>
+                    <enableRulesSummary>false</enableRulesSummary>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
 </project>

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BasicDynaClass.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BasicDynaClass.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BasicDynaClass.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BasicDynaClass.java Thu Jul 12 19:52:05 2007
@@ -77,13 +77,16 @@
                           DynaProperty properties[]) {
 
         super();
-        if (name != null)
+        if (name != null) {
             this.name = name;
-        if (dynaBeanClass == null)
+        }
+        if (dynaBeanClass == null) {
             dynaBeanClass = BasicDynaBean.class;
+        }
         setDynaBeanClass(dynaBeanClass);
-        if (properties != null)
+        if (properties != null) {
             setProperties(properties);
+        }
 
     }
 
@@ -258,14 +261,16 @@
     protected void setDynaBeanClass(Class dynaBeanClass) {
 
         // Validate the argument type specified
-        if (dynaBeanClass.isInterface())
+        if (dynaBeanClass.isInterface()) {
             throw new IllegalArgumentException
                     ("Class " + dynaBeanClass.getName() +
                     " is an interface, not a class");
-        if (!DynaBean.class.isAssignableFrom(dynaBeanClass))
+        }
+        if (!DynaBean.class.isAssignableFrom(dynaBeanClass)) {
             throw new IllegalArgumentException
                     ("Class " + dynaBeanClass.getName() +
                     " does not implement DynaBean");
+        }
 
         // Identify the Constructor we will use in newInstance()
         try {

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtilsBean.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtilsBean.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtilsBean.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtilsBean.java Thu Jul 12 19:52:05 2007
@@ -24,6 +24,8 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URL;
+import java.sql.Timestamp;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.Map;
 import java.util.HashMap;
@@ -130,6 +132,7 @@
 public class ConvertUtilsBean {
     
     private static final Integer ZERO = new Integer(0);
+    private static final Character SPACE = new Character(' ');
 
     // ------------------------------------------------------- Class Methods
     /**
@@ -154,8 +157,6 @@
      */
     private Log log = LogFactory.getLog(ConvertUtils.class);
 
-    private int defaultArraySize = 0;
-
     // ------------------------------------------------------- Constructors
 
     /** Construct a bean with standard converters registered */
@@ -632,7 +633,7 @@
     public void registerPrimitives(boolean throwException) {
         register(Boolean.TYPE,   throwException ? new BooleanConverter()    : new BooleanConverter(Boolean.FALSE));
         register(Byte.TYPE,      throwException ? new ByteConverter()       : new ByteConverter(ZERO));
-        register(Character.TYPE, throwException ? new CharacterConverter()  : new CharacterConverter(new Character(' ')));
+        register(Character.TYPE, throwException ? new CharacterConverter()  : new CharacterConverter(SPACE));
         register(Double.TYPE,    throwException ? new DoubleConverter()     : new DoubleConverter(ZERO));
         register(Float.TYPE,     throwException ? new FloatConverter()      : new FloatConverter(ZERO));
         register(Integer.TYPE,   throwException ? new IntegerConverter()    : new IntegerConverter(ZERO));
@@ -668,14 +669,14 @@
     public void registerStandard(boolean throwException, boolean defaultNull) {
 
         Number     defaultNumber     = defaultNull ? null : ZERO;
-        BigDecimal bigDecimalDefault = defaultNull ? null : new BigDecimal("0.0");
-        BigInteger bigIntegerDefault = defaultNull ? null : new BigInteger("0");
+        BigDecimal bigDecDeflt       = defaultNull ? null : new BigDecimal("0.0");
+        BigInteger bigIntDeflt       = defaultNull ? null : new BigInteger("0");
         Boolean    booleanDefault    = defaultNull ? null : Boolean.FALSE;
-        Character  charDefault       = defaultNull ? null : new Character(' ');
+        Character  charDefault       = defaultNull ? null : SPACE;
         String     stringDefault     = defaultNull ? null : "";
 
-        register(BigDecimal.class, throwException ? new BigDecimalConverter() : new BigDecimalConverter(bigDecimalDefault));
-        register(BigInteger.class, throwException ? new BigIntegerConverter() : new BigIntegerConverter(bigIntegerDefault));
+        register(BigDecimal.class, throwException ? new BigDecimalConverter() : new BigDecimalConverter(bigDecDeflt));
+        register(BigInteger.class, throwException ? new BigIntegerConverter() : new BigIntegerConverter(bigIntDeflt));
         register(Boolean.class,    throwException ? new BooleanConverter()    : new BooleanConverter(booleanDefault));
         register(Byte.class,       throwException ? new ByteConverter()       : new ByteConverter(defaultNumber));
         register(Character.class,  throwException ? new CharacterConverter()  : new CharacterConverter(charDefault));
@@ -707,14 +708,14 @@
      * <code>false</code> if a default value should be used.
      */
     public void registerOther(boolean throwException) {
-        register(Class.class,              throwException ? new ClassConverter()        : new ClassConverter(null));
-        register(java.util.Date.class,     throwException ? new DateConverter()         : new DateConverter(null));
-        register(java.util.Calendar.class, throwException ? new CalendarConverter()     : new CalendarConverter(null));
-        register(File.class,               throwException ? new FileConverter()         : new FileConverter(null));
-        register(java.sql.Date.class,      throwException ? new SqlDateConverter()      : new SqlDateConverter(null));
-        register(java.sql.Time.class,      throwException ? new SqlTimeConverter()      : new SqlTimeConverter(null));
-        register(java.sql.Timestamp.class, throwException ? new SqlTimestampConverter() : new SqlTimestampConverter(null));
-        register(URL.class,                throwException ? new URLConverter()          : new URLConverter(null));
+        register(Class.class,         throwException ? new ClassConverter()        : new ClassConverter(null));
+        register(java.util.Date.class, throwException ? new DateConverter()        : new DateConverter(null));
+        register(Calendar.class,      throwException ? new CalendarConverter()     : new CalendarConverter(null));
+        register(File.class,          throwException ? new FileConverter()         : new FileConverter(null));
+        register(java.sql.Date.class, throwException ? new SqlDateConverter()      : new SqlDateConverter(null));
+        register(java.sql.Time.class, throwException ? new SqlTimeConverter()      : new SqlTimeConverter(null));
+        register(Timestamp.class,     throwException ? new SqlTimestampConverter() : new SqlTimestampConverter(null));
+        register(URL.class,           throwException ? new URLConverter()          : new URLConverter(null));
     }
 
     /**
@@ -754,14 +755,14 @@
         registerArrayConverter(String.class,     new StringConverter(),     throwException, defaultArraySize);
 
         // Other
-        registerArrayConverter(Class.class,              new ClassConverter(),        throwException, defaultArraySize);
-        registerArrayConverter(java.util.Date.class,     new DateConverter(),         throwException, defaultArraySize);
-        registerArrayConverter(java.util.Calendar.class, new DateConverter(),         throwException, defaultArraySize);
-        registerArrayConverter(File.class,               new FileConverter(),         throwException, defaultArraySize);
-        registerArrayConverter(java.sql.Date.class,      new SqlDateConverter(),      throwException, defaultArraySize);
-        registerArrayConverter(java.sql.Time.class,      new SqlTimeConverter(),      throwException, defaultArraySize);
-        registerArrayConverter(java.sql.Timestamp.class, new SqlTimestampConverter(), throwException, defaultArraySize);
-        registerArrayConverter(URL.class,                new URLConverter(),          throwException, defaultArraySize);
+        registerArrayConverter(Class.class,          new ClassConverter(),        throwException, defaultArraySize);
+        registerArrayConverter(java.util.Date.class, new DateConverter(),         throwException, defaultArraySize);
+        registerArrayConverter(Calendar.class,       new DateConverter(),         throwException, defaultArraySize);
+        registerArrayConverter(File.class,           new FileConverter(),         throwException, defaultArraySize);
+        registerArrayConverter(java.sql.Date.class,  new SqlDateConverter(),      throwException, defaultArraySize);
+        registerArrayConverter(java.sql.Time.class,  new SqlTimeConverter(),      throwException, defaultArraySize);
+        registerArrayConverter(Timestamp.class,      new SqlTimestampConverter(), throwException, defaultArraySize);
+        registerArrayConverter(URL.class,            new URLConverter(),          throwException, defaultArraySize);
 
     }
 
@@ -775,7 +776,8 @@
      * value used in the event of a conversion error
      * @param defaultArraySize The size of the default array
      */
-    private void registerArrayConverter(Class componentType, Converter componentConverter, boolean throwException, int defaultArraySize) {
+    private void registerArrayConverter(Class componentType, Converter componentConverter,
+            boolean throwException, int defaultArraySize) {
         Class arrayType = Array.newInstance(componentType, 0).getClass();
         Converter arrayConverter = null;
         if (throwException) {

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/LazyDynaBean.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/LazyDynaBean.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/LazyDynaBean.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/LazyDynaBean.java Thu Jul 12 19:52:05 2007
@@ -36,9 +36,12 @@
  *    have the following <code>get()</code> and <code>set()</code> methods for
  *    each of these types:</p>
  *    <ul>
- *        <li><i>Simple</i> property methods - <code>get(name)</code> and <code>set(name, value)</code></li>
- *        <li><i>Indexed</i> property methods - <code>get(name, index)</code> and <code>set(name, index, value)</code></li>
- *        <li><i>Mapped</i> property methods - <code>get(name, key)</code> and <code>set(name, key, value)</code></li>
+ *        <li><i>Simple</i> property methods - <code>get(name)</code> and
+ *                          <code>set(name, value)</code></li>
+ *        <li><i>Indexed</i> property methods - <code>get(name, index)</code> and
+ *                          <code>set(name, index, value)</code></li>
+ *        <li><i>Mapped</i> property methods - <code>get(name, key)</code> and
+ *                          <code>set(name, key, value)</code></li>
  *    </ul>
  *
  * <p><b><u>Getting Property Values</u></b></p>
@@ -721,7 +724,8 @@
             }
             catch (Exception ex) {
                 throw new IllegalArgumentException
-                    ("Error instantiating mapped property of type '" + type.getName() + "' for '" + name + "' " + ex);
+                    ("Error instantiating mapped property of type '" +
+                            type.getName() + "' for '" + name + "' " + ex);
             }
         } else {
 
@@ -745,7 +749,8 @@
         }
         catch (Exception ex) {
             if (logger().isWarnEnabled()) {
-                logger().warn("Error instantiating DynaBean property of type '" + type.getName() + "' for '" + name + "' " + ex);
+                logger().warn("Error instantiating DynaBean property of type '" +
+                        type.getName() + "' for '" + name + "' " + ex);
             }
             return null;
         }

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/LazyDynaMap.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/LazyDynaMap.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/LazyDynaMap.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/LazyDynaMap.java Thu Jul 12 19:52:05 2007
@@ -20,7 +20,8 @@
 import java.util.Iterator;
 
 /**
- * <p>Provides a <i>light weight</i> <code>DynaBean</code> facade to a <code>Map</code> with <i>lazy</i> map/list processing.</p>
+ * <p>Provides a <i>light weight</i> <code>DynaBean</code> facade to a <code>Map</code>
+ *  with <i>lazy</i> map/list processing.</p>
  *
  * <p>Its a <i>light weight</i> <code>DynaBean</code> implementation because there is no
  *    actual <code>DynaClass</code> associated with this <code>DynaBean</code> - in fact
@@ -214,8 +215,9 @@
      */
     public DynaProperty getDynaProperty(String name) {
 
-        if (name == null)
+        if (name == null) {
             throw new IllegalArgumentException("Property name is missing.");
+        }
 
         // If it doesn't exist and returnNull is false
         // create a new DynaProperty
@@ -341,8 +343,9 @@
             throw new IllegalArgumentException("Property name is missing.");
         }
 
-        if (isRestricted())
+        if (isRestricted()) {
             throw new IllegalStateException("DynaClass is currently restricted. No new properties can be added.");
+        }
 
         Object value = values.get(name);
 

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/MethodUtils.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/MethodUtils.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/MethodUtils.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/MethodUtils.java Thu Jul 12 19:52:05 2007
@@ -236,9 +236,10 @@
                 object.getClass(),
                 methodName,
                 parameterTypes);
-        if (method == null)
+        if (method == null) {
             throw new NoSuchMethodException("No such accessible method: " +
                     methodName + "() on object: " + object.getClass().getName());
+        }
         return method.invoke(object, args);
     }
 
@@ -357,9 +358,10 @@
                 object.getClass(),
                 methodName,
                 parameterTypes);
-        if (method == null)
+        if (method == null) {
             throw new NoSuchMethodException("No such accessible method: " +
                     methodName + "() on object: " + object.getClass().getName());
+        }
         return method.invoke(object, args);
 
     }
@@ -369,7 +371,7 @@
      * types given.</p>
      *
      * <p>This uses reflection to invoke the method obtained from a call to
-     * {@link #getAccessibleMethod}.</p>
+     * {@link #getAccessibleMethod(Class, String, Class[])}.</p>
      *
      * @param objectClass invoke static method on this class
      * @param methodName get method with this name
@@ -405,9 +407,10 @@
                 objectClass,
                 methodName,
                 parameterTypes);
-        if (method == null)
+        if (method == null) {
             throw new NoSuchMethodException("No such accessible method: " +
                     methodName + "() on class: " + objectClass.getName());
+        }
         return method.invoke(null, args);
 
     }
@@ -416,7 +419,7 @@
      * <p>Invoke a named static method whose parameter type matches the object type.</p>
      *
      * <p>The behaviour of this method is less deterministic 
-     * than {@link #invokeExactMethod}. 
+     * than {@link #invokeExactMethod(Object, String, Object[], Class[])}. 
      * It loops through all methods with names that match
      * and then executes the first it finds with compatable parameters.</p>
      *
@@ -550,9 +553,10 @@
                 objectClass,
                 methodName,
                 parameterTypes);
-        if (method == null)
+        if (method == null) {
             throw new NoSuchMethodException("No such accessible method: " +
                     methodName + "() on class: " + objectClass.getName());
+        }
         return method.invoke(null, args);
     }
 
@@ -596,7 +600,7 @@
      * types.</p>
      *
      * <p> This uses reflection to invoke the method obtained from a call to
-     * {@link #getAccessibleMethod}.</p>
+     * {@link #getAccessibleMethod(Class, String, Class[])}.</p>
      *
      * @param objectClass invoke static method on this class
      * @param methodName get method with this name
@@ -791,8 +795,9 @@
             for (int i = 0; i < interfaces.length; i++) {
 
                 // Is this interface public?
-                if (!Modifier.isPublic(interfaces[i].getModifiers()))
+                if (!Modifier.isPublic(interfaces[i].getModifiers())) {
                     continue;
+                }
 
                 // Does the method exist on this interface?
                 try {
@@ -803,24 +808,27 @@
                      * method returns null.
                      */
                 }
-                if (method != null)
+                if (method != null) {
                     break;
+                }
 
                 // Recursively check our parent interfaces
                 method =
                         getAccessibleMethodFromInterfaceNest(interfaces[i],
                                 methodName,
                                 parameterTypes);
-                if (method != null)
+                if (method != null) {
                     break;
+                }
 
             }
 
         }
 
         // If we found a method return it
-        if (method != null)
+        if (method != null) {
             return (method);
+        }
 
         // We did not find anything
         return (null);

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/PropertyUtils.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/PropertyUtils.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/PropertyUtils.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/PropertyUtils.java Thu Jul 12 19:52:05 2007
@@ -23,7 +23,6 @@
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import org.apache.commons.beanutils.expression.Resolver;
 import org.apache.commons.collections.FastHashMap;
 
 
@@ -43,7 +42,7 @@
  * @author Scott Sanders
  * @version $Revision$ $Date$
  * @see PropertyUtilsBean
- * @see Resolver
+ * @see org.apache.commons.beanutils.expression.Resolver
  */
 
 public class PropertyUtils {
@@ -57,7 +56,8 @@
      * indexed reference.
      *
      * @deprecated The notation used for property name expressions is now
-     * dependant on the {@link Resolver} implementation being used.
+     * dependant on the {@link org.apache.commons.beanutils.expression.Resolver}
+     * implementation being used.
      */
     public static final char INDEXED_DELIM = '[';
 
@@ -67,7 +67,8 @@
      * indexed reference.
      *
      * @deprecated The notation used for property name expressions is now
-     * dependant on the {@link Resolver} implementation being used.
+     * dependant on the {@link org.apache.commons.beanutils.expression.Resolver}
+     * implementation being used.
      */
     public static final char INDEXED_DELIM2 = ']';
 
@@ -76,7 +77,8 @@
      * The delimiter that preceeds the key of a mapped property.
      *
      * @deprecated The notation used for property name expressions is now
-     * dependant on the {@link Resolver} implementation being used.
+     * dependant on the {@link org.apache.commons.beanutils.expression.Resolver}
+     * implementation being used.
      */
     public static final char MAPPED_DELIM = '(';
 
@@ -85,7 +87,8 @@
      * The delimiter that follows the key of a mapped property.
      *
      * @deprecated The notation used for property name expressions is now
-     * dependant on the {@link Resolver} implementation being used.
+     * dependant on the {@link org.apache.commons.beanutils.expression.Resolver}
+     * implementation being used.
      */
     public static final char MAPPED_DELIM2 = ')';
 
@@ -94,7 +97,8 @@
      * The delimiter that separates the components of a nested reference.
      *
      * @deprecated The notation used for property name expressions is now
-     * dependant on the {@link Resolver} implementation being used.
+     * dependant on the {@link org.apache.commons.beanutils.expression.Resolver}
+     * implementation being used.
      */
     public static final char NESTED_DELIM = '.';
 
@@ -551,7 +555,7 @@
      *  throws an exception
      * @exception NoSuchMethodException if an accessor method for this
      *  propety cannot be found
-     * @see PropertyUtilsBean#getPropertyType
+     * @see PropertyUtilsBean#getPropertyType(Object, String)
      */
     public static Class getPropertyType(Object bean, String name)
             throws IllegalAccessException, InvocationTargetException,

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/PropertyUtilsBean.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/PropertyUtilsBean.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/PropertyUtilsBean.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/PropertyUtilsBean.java Thu Jul 12 19:52:05 2007
@@ -26,7 +26,6 @@
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -329,8 +328,9 @@
                 getPropertyDescriptors(bean);
             for (int i = 0; i < descriptors.length; i++) {
                 String name = descriptors[i].getName();
-                if (descriptors[i].getReadMethod() != null)
+                if (descriptors[i].getReadMethod() != null) {
                     description.put(name, getProperty(bean, name));
+                }
             }
         }
         return (description);
@@ -898,8 +898,9 @@
         if (descriptors != null) {
             
             for (int i = 0; i < descriptors.length; i++) {
-                if (name.equals(descriptors[i].getName()))
+                if (name.equals(descriptors[i].getName())) {
                     return (descriptors[i]);
+                }
             }
         }
 

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java Thu Jul 12 19:52:05 2007
@@ -21,11 +21,10 @@
 
 import java.util.List;
 import org.apache.commons.beanutils.ConversionException;
-import org.apache.commons.beanutils.Converter;
 
 
 /**
- * <p>Standard {@link Converter} implementation that converts an incoming
+ * <p>Standard {@link org.apache.commons.beanutils.Converter} implementation that converts an incoming
  * String into a primitive array of boolean.  On a conversion failure, returns
  * a specified default value or throws a {@link ConversionException} depending
  * on how this instance is constructed.</p>
@@ -48,8 +47,8 @@
 
 
     /**
-     * Create a {@link Converter} that will throw a {@link ConversionException}
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will throw
+     * a {@link ConversionException} if a conversion error occurs.
      *
      * <p>Conversion of strings to boolean values will be done via a default
      * instance of class BooleanConverter.</p>
@@ -63,8 +62,8 @@
 
 
     /**
-     * Create a {@link Converter} that will return the specified default value
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will return
+     * the specified default value if a conversion error occurs.
      *
      * <p>Conversion of strings to boolean values will be done via a default
      * instance of class BooleanConverter.</p>
@@ -80,8 +79,8 @@
 
 
     /**
-     * Create a {@link Converter} that will return the specified default value
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will return
+     * the specified default value if a conversion error occurs.
      *
      * <p>Conversion of strings to boolean values will be done via the
      * specified converter.</p>

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/BooleanConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/BooleanConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/BooleanConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/BooleanConverter.java Thu Jul 12 19:52:05 2007
@@ -17,11 +17,10 @@
 package org.apache.commons.beanutils.converters;
 
 import org.apache.commons.beanutils.ConversionException;
-import org.apache.commons.beanutils.Converter;
 
 /**
- * Generic {@link Converter} implementaion that handles conversion
- * to and from <b>array</b> objects.
+ * {@link org.apache.commons.beanutils.Converter} implementaion that handles conversion
+ * to and from <b>Boolean</b> objects.
  * {@link org.apache.commons.beanutils.Converter} implementaion that
  * handles conversion to and from <b>java.lang.Boolean</b> objects.
  * <p>
@@ -60,7 +59,7 @@
 
 
     /**
-     * Create a {@link Converter} that will throw a {@link ConversionException}
+     * Create a {@link org.apache.commons.beanutils.Converter} that will throw a {@link ConversionException}
      * if a conversion error occurs, ie the string value being converted is
      * not one of the known true strings, nor one of the known false strings.
      */
@@ -70,7 +69,7 @@
 
 
     /**
-     * Create a {@link Converter} that will return the specified default value
+     * Create a {@link org.apache.commons.beanutils.Converter} that will return the specified default value
      * if a conversion error occurs, ie the string value being converted is
      * not one of the known true strings, nor one of the known false strings.
      *
@@ -89,7 +88,7 @@
     }
 
     /**
-     * Create a {@link Converter} that will throw a {@link ConversionException}
+     * Create a {@link org.apache.commons.beanutils.Converter} that will throw a {@link ConversionException}
      * if a conversion error occurs, ie the string value being converted is
      * not one of the known true strings, nor one of the known false strings.
      * <p>
@@ -111,8 +110,8 @@
     }
 
     /**
-     * Create a {@link Converter} that will return the specified default value
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will return
+     * the specified default value if a conversion error occurs.
      * <p>
      * The provided string arrays are copied, so that changes to the elements
      * of the array after this call is made do not affect this object.
@@ -197,13 +196,15 @@
         String stringValue = value.toString().toLowerCase();
 
         for(int i=0; i<trueStrings.length; ++i) {
-            if (trueStrings[i].equals(stringValue))
+            if (trueStrings[i].equals(stringValue)) {
                 return Boolean.TRUE;
+            }
         }
 
         for(int i=0; i<falseStrings.length; ++i) {
-            if (falseStrings[i].equals(stringValue))
+            if (falseStrings[i].equals(stringValue)) {
                 return Boolean.FALSE;
+            }
         }
         
         throw new ConversionException("Cna't convert value '" + value + "' to a Boolean");

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java Thu Jul 12 19:52:05 2007
@@ -21,11 +21,10 @@
 
 import java.util.List;
 import org.apache.commons.beanutils.ConversionException;
-import org.apache.commons.beanutils.Converter;
 
 
 /**
- * <p>Standard {@link Converter} implementation that converts an incoming
+ * <p>Standard {@link org.apache.commons.beanutils.Converter} implementation that converts an incoming
  * String into a primitive array of byte.  On a conversion failure, returns
  * a specified default value or throws a {@link ConversionException} depending
  * on how this instance is constructed.</p>
@@ -43,8 +42,8 @@
 
 
     /**
-     * Create a {@link Converter} that will throw a {@link ConversionException}
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will
+     * throw a {@link ConversionException} if a conversion error occurs.
      */
     public ByteArrayConverter() {
 
@@ -55,8 +54,8 @@
 
 
     /**
-     * Create a {@link Converter} that will return the specified default value
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will return
+     * the specified default value if a conversion error occurs.
      *
      * @param defaultValue The default value to be returned
      */

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java Thu Jul 12 19:52:05 2007
@@ -21,11 +21,10 @@
 
 import java.util.List;
 import org.apache.commons.beanutils.ConversionException;
-import org.apache.commons.beanutils.Converter;
 
 
 /**
- * <p>Standard {@link Converter} implementation that converts an incoming
+ * <p>Standard {@link org.apache.commons.beanutils.Converter} implementation that converts an incoming
  * String into a primitive array of char.  On a conversion failure, returns
  * a specified default value or throws a {@link ConversionException} depending
  * on how this instance is constructed.</p>
@@ -43,8 +42,8 @@
 
 
     /**
-     * Create a {@link Converter} that will throw a {@link ConversionException}
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will throw
+     * a {@link ConversionException} if a conversion error occurs.
      */
     public CharacterArrayConverter() {
 
@@ -55,8 +54,8 @@
 
 
     /**
-     * Create a {@link Converter} that will return the specified default value
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will return
+     * the specified default value if a conversion error occurs.
      *
      * @param defaultValue The default value to be returned
      */

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/CharacterConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/CharacterConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/CharacterConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/CharacterConverter.java Thu Jul 12 19:52:05 2007
@@ -16,10 +16,8 @@
  */
 package org.apache.commons.beanutils.converters;
 
-import org.apache.commons.beanutils.Converter;
-
 /**
- * {@link Converter} implementaion that handles conversion
+ * {@link org.apache.commons.beanutils.Converter} implementaion that handles conversion
  * to and from <b>java.lang.Character</b> objects.
  * <p>
  * Can be configured to either return a <i>default value</i> or throw a

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ClassConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ClassConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ClassConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ClassConverter.java Thu Jul 12 19:52:05 2007
@@ -16,10 +16,8 @@
  */
 package org.apache.commons.beanutils.converters;
 
-import org.apache.commons.beanutils.Converter;
-
 /**
- * {@link Converter} implementaion that handles conversion
+ * {@link org.apache.commons.beanutils.Converter} implementaion that handles conversion
  * to and from <b>java.lang.Class</b> objects.
  * <p>
  * The class will be loaded from the thread context class

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/DateTimeConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/DateTimeConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/DateTimeConverter.java Thu Jul 12 19:52:05 2007
@@ -26,7 +26,7 @@
 import org.apache.commons.beanutils.ConversionException;
 
 /**
- * Generic {@link org.apache.commons.beanutils.Converter} implementaion
+ * {@link org.apache.commons.beanutils.Converter} implementaion
  * that handles conversion to and from <b>date/time</b> objects.
  * <p>
  * This implementation handles conversion for the following

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java Thu Jul 12 19:52:05 2007
@@ -21,11 +21,10 @@
 
 import java.util.List;
 import org.apache.commons.beanutils.ConversionException;
-import org.apache.commons.beanutils.Converter;
 
 
 /**
- * <p>Standard {@link Converter} implementation that converts an incoming
+ * <p>Standard {@link org.apache.commons.beanutils.Converter} implementation that converts an incoming
  * String into a primitive array of double.  On a conversion failure, returns
  * a specified default value or throws a {@link ConversionException} depending
  * on how this instance is constructed.</p>
@@ -43,8 +42,8 @@
 
 
     /**
-     * Create a {@link Converter} that will throw a {@link ConversionException}
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will throw
+     * a {@link ConversionException} if a conversion error occurs.
      */
     public DoubleArrayConverter() {
 
@@ -55,8 +54,8 @@
 
 
     /**
-     * Create a {@link Converter} that will return the specified default value
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will return
+     * the specified default value if a conversion error occurs.
      *
      * @param defaultValue The default value to be returned
      */

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/FileConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/FileConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/FileConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/FileConverter.java Thu Jul 12 19:52:05 2007
@@ -18,10 +18,8 @@
 
 import java.io.File;
 
-import org.apache.commons.beanutils.Converter;
-
 /**
- * {@link Converter} implementaion that handles conversion
+ * {@link org.apache.commons.beanutils.Converter} implementaion that handles conversion
  * to and from <b>java.io.File</b> objects.
  * <p>
  * Can be configured to either return a <i>default value</i> or throw a

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java Thu Jul 12 19:52:05 2007
@@ -21,11 +21,10 @@
 
 import java.util.List;
 import org.apache.commons.beanutils.ConversionException;
-import org.apache.commons.beanutils.Converter;
 
 
 /**
- * <p>Standard {@link Converter} implementation that converts an incoming
+ * <p>Standard {@link org.apache.commons.beanutils.Converter} implementation that converts an incoming
  * String into a primitive array of float.  On a conversion failure, returns
  * a specified default value or throws a {@link ConversionException} depending
  * on how this instance is constructed.</p>
@@ -43,8 +42,8 @@
 
 
     /**
-     * Create a {@link Converter} that will throw a {@link ConversionException}
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will throw
+     * a {@link ConversionException} if a conversion error occurs.
      */
     public FloatArrayConverter() {
 
@@ -55,8 +54,8 @@
 
 
     /**
-     * Create a {@link Converter} that will return the specified default value
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will return
+     * the specified default value if a conversion error occurs.
      *
      * @param defaultValue The default value to be returned
      */

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java Thu Jul 12 19:52:05 2007
@@ -21,11 +21,10 @@
 
 import java.util.List;
 import org.apache.commons.beanutils.ConversionException;
-import org.apache.commons.beanutils.Converter;
 
 
 /**
- * <p>Standard {@link Converter} implementation that converts an incoming
+ * <p>Standard {@link org.apache.commons.beanutils.Converter} implementation that converts an incoming
  * String into a primitive array of int.  On a conversion failure, returns
  * a specified default value or throws a {@link ConversionException} depending
  * on how this instance is constructed.</p>
@@ -43,8 +42,8 @@
 
 
     /**
-     * Create a {@link Converter} that will throw a {@link ConversionException}
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will throw
+     * a {@link ConversionException} if a conversion error occurs.
      */
     public IntegerArrayConverter() {
 
@@ -55,8 +54,8 @@
 
 
     /**
-     * Create a {@link Converter} that will return the specified default value
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will return
+     * the specified default value if a conversion error occurs.
      *
      * @param defaultValue The default value to be returned
      */

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/LongArrayConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/LongArrayConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/LongArrayConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/LongArrayConverter.java Thu Jul 12 19:52:05 2007
@@ -21,11 +21,10 @@
 
 import java.util.List;
 import org.apache.commons.beanutils.ConversionException;
-import org.apache.commons.beanutils.Converter;
 
 
 /**
- * <p>Standard {@link Converter} implementation that converts an incoming
+ * <p>Standard {@link org.apache.commons.beanutils.Converter} implementation that converts an incoming
  * String into a primitive array of long.  On a conversion failure, returns
  * a specified default value or throws a {@link ConversionException} depending
  * on how this instance is constructed.</p>
@@ -43,8 +42,8 @@
 
 
     /**
-     * Create a {@link Converter} that will throw a {@link ConversionException}
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will throw
+     * a {@link ConversionException} if a conversion error occurs.
      */
     public LongArrayConverter() {
 
@@ -55,8 +54,8 @@
 
 
     /**
-     * Create a {@link Converter} that will return the specified default value
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will return
+     * the specified default value if a conversion error occurs.
      *
      * @param defaultValue The default value to be returned
      */

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/NumberConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/NumberConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/NumberConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/NumberConverter.java Thu Jul 12 19:52:05 2007
@@ -27,10 +27,9 @@
 import java.text.ParsePosition;
 
 import org.apache.commons.beanutils.ConversionException;
-import org.apache.commons.beanutils.Converter;
 
 /**
- * Generic {@link Converter} implementaion that handles conversion
+ * {@link org.apache.commons.beanutils.Converter} implementaion that handles conversion
  * to and from <b>java.lang.Number</b> objects.
  * <p>
  * This implementation handles conversion for the following

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java Thu Jul 12 19:52:05 2007
@@ -21,11 +21,10 @@
 
 import java.util.List;
 import org.apache.commons.beanutils.ConversionException;
-import org.apache.commons.beanutils.Converter;
 
 
 /**
- * <p>Standard {@link Converter} implementation that converts an incoming
+ * <p>Standard {@link org.apache.commons.beanutils.Converter} implementation that converts an incoming
  * String into a primitive array of short.  On a conversion failure, returns
  * a specified default value or throws a {@link ConversionException} depending
  * on how this instance is constructed.</p>
@@ -43,8 +42,8 @@
 
 
     /**
-     * Create a {@link Converter} that will throw a {@link ConversionException}
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will throw
+     * a {@link ConversionException} if a conversion error occurs.
      */
     public ShortArrayConverter() {
 
@@ -55,8 +54,8 @@
 
 
     /**
-     * Create a {@link Converter} that will return the specified default value
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will return
+     * the specified default value if a conversion error occurs.
      *
      * @param defaultValue The default value to be returned
      */

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/StringArrayConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/StringArrayConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/StringArrayConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/StringArrayConverter.java Thu Jul 12 19:52:05 2007
@@ -21,11 +21,10 @@
 
 import java.util.List;
 import org.apache.commons.beanutils.ConversionException;
-import org.apache.commons.beanutils.Converter;
 
 
 /**
- * Standard {@link Converter} implementation that converts an incoming
+ * Standard {@link org.apache.commons.beanutils.Converter} implementation that converts an incoming
  * String into an array of String objects. On a conversion failure, returns
  * a specified default value or throws a {@link ConversionException} depending
  * on how this instance is constructed.
@@ -46,8 +45,8 @@
 
 
     /**
-     * Create a {@link Converter} that will throw a {@link ConversionException}
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will throw
+     * a {@link ConversionException} if a conversion error occurs.
      */
     public StringArrayConverter() {
 
@@ -58,8 +57,8 @@
 
 
     /**
-     * Create a {@link Converter} that will return the specified default value
-     * if a conversion error occurs.
+     * Create a {@link org.apache.commons.beanutils.Converter} that will return
+     * the specified default value if a conversion error occurs.
      *
      * @param defaultValue The default value to be returned
      */

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/StringConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/StringConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/StringConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/StringConverter.java Thu Jul 12 19:52:05 2007
@@ -16,10 +16,9 @@
  */
 package org.apache.commons.beanutils.converters;
 
-import org.apache.commons.beanutils.Converter;
-
 /**
- * Standard {@link Converter} implementation that converts an incoming
+ * {@link org.apache.commons.beanutils.Converter}
+ * implementation that converts an incoming
  * object into a <code>java.lang.String</code> object.
  * <p>
  * Note that ConvertUtils really is designed to do string->object conversions,

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/URLConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/URLConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/URLConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/URLConverter.java Thu Jul 12 19:52:05 2007
@@ -18,10 +18,8 @@
 
 import java.net.URL;
 
-import org.apache.commons.beanutils.Converter;
-
 /**
- * {@link Converter} implementaion that handles conversion
+ * {@link org.apache.commons.beanutils.Converter} implementaion that handles conversion
  * to and from <b>java.net.URL</b> objects.
  * <p>
  * Can be configured to either return a <i>default value</i> or throw a

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/expression/Resolver.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/expression/Resolver.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/expression/Resolver.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/expression/Resolver.java Thu Jul 12 19:52:05 2007
@@ -78,7 +78,8 @@
  *   </ul>
  *   <li>{@link org.apache.commons.beanutils.locale.LocaleBeanUtilsBean}</li>
  *   <ul>
- *       <li>{@link org.apache.commons.beanutils.locale.LocaleBeanUtilsBean#setProperty(Object, String, Object, String)}</li>
+ *       <li>{@link org.apache.commons.beanutils.locale.LocaleBeanUtilsBean#setProperty(Object,
+ *        String, Object, String)}</li>
  *   </ul>
  * </ul>
  *

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java Thu Jul 12 19:52:05 2007
@@ -18,12 +18,11 @@
 package org.apache.commons.beanutils.locale;
 
 
-import org.apache.commons.beanutils.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.commons.beanutils.BeanUtils;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Locale;
+
 
 
 /**

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java Thu Jul 12 19:52:05 2007
@@ -18,7 +18,14 @@
 package org.apache.commons.beanutils.locale;
 
 
-import org.apache.commons.beanutils.*;
+import org.apache.commons.beanutils.BeanUtilsBean;
+import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.ConvertUtilsBean;
+import org.apache.commons.beanutils.DynaBean;
+import org.apache.commons.beanutils.DynaClass;
+import org.apache.commons.beanutils.DynaProperty;
+import org.apache.commons.beanutils.MappedPropertyDescriptor;
+import org.apache.commons.beanutils.PropertyUtilsBean;
 import org.apache.commons.beanutils.ContextClassLoaderLocal;
 import org.apache.commons.beanutils.expression.Resolver;
 import org.apache.commons.logging.Log;

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java Thu Jul 12 19:52:05 2007
@@ -17,7 +17,6 @@
  
 package org.apache.commons.beanutils.locale;
 
-import org.apache.commons.beanutils.ConversionException;
 import org.apache.commons.beanutils.locale.converters.BigDecimalLocaleConverter;
 import org.apache.commons.beanutils.locale.converters.BigIntegerLocaleConverter;
 import org.apache.commons.beanutils.locale.converters.ByteLocaleConverter;
@@ -171,7 +170,8 @@
      * @param value The Value to be converted
      * @return the converted value
      *
-     * @exception org.apache.commons.beanutils.ConversionException if thrown by an underlying Converter
+     * @throws org.apache.commons.beanutils.ConversionException if thrown by an
+     * underlying Converter
      */
     public String convert(Object value) {
         return convert(value, defaultLocale, null);
@@ -185,7 +185,8 @@
      * @param pattern       The convertion pattern
      * @return the converted value
      *
-     * @exception ConversionException if thrown by an underlying Converter
+     * @throws org.apache.commons.beanutils.ConversionException if thrown by an
+     * underlying Converter
      */
     public String convert(Object value, String pattern) {
         return convert(value, defaultLocale, pattern);
@@ -200,7 +201,8 @@
      * @param pattern The convertion pattern
      * @return the converted value
      *
-     * @exception ConversionException if thrown by an underlying Converter
+     * @throws org.apache.commons.beanutils.ConversionException if thrown by an
+     * underlying Converter
      */
     public String convert(Object value, Locale locale, String pattern) {
 
@@ -217,7 +219,8 @@
      * @param clazz The Data type to which this value should be converted.
      * @return the converted value
      *
-     * @exception ConversionException if thrown by an underlying Converter
+     * @throws org.apache.commons.beanutils.ConversionException if thrown by an
+     * underlying Converter
      */
     public Object convert(String value, Class clazz) {
 
@@ -234,7 +237,8 @@
      * @param pattern The convertion pattern
      * @return the converted value
      *
-     * @exception ConversionException if thrown by an underlying Converter
+     * @throws org.apache.commons.beanutils.ConversionException if thrown by an
+     * underlying Converter
      */
     public Object convert(String value, Class clazz, String pattern) {
 
@@ -252,7 +256,8 @@
      * @param pattern The convertion pattern
      * @return the converted value
      *
-     * @exception ConversionException if thrown by an underlying Converter
+     * @throws org.apache.commons.beanutils.ConversionException if thrown by an
+     * underlying Converter
      */
     public Object convert(String value, Class clazz, Locale locale, String pattern) {
 
@@ -283,7 +288,8 @@
      * @param pattern The convertion pattern
      * @return the converted value
      *
-     * @exception ConversionException if thrown by an underlying Converter
+     * @throws org.apache.commons.beanutils.ConversionException if thrown by an
+     * underlying Converter
      */
     public Object convert(String values[], Class clazz, String pattern) {
 
@@ -298,7 +304,8 @@
     * @param clazz Java array or element class to be converted to
     * @return the converted value
     *
-    * @exception ConversionException if thrown by an underlying Converter
+     * @throws org.apache.commons.beanutils.ConversionException if thrown by an
+     * underlying Converter
     */
    public Object convert(String values[], Class clazz) {
 
@@ -315,7 +322,8 @@
      * @param pattern The convertion pattern
      * @return the converted value
      *
-     * @exception ConversionException if thrown by an underlying Converter
+     * @throws org.apache.commons.beanutils.ConversionException if thrown by an
+     * underlying Converter
      */
     public Object convert(String values[], Class clazz, Locale locale, String pattern) {
 

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java Thu Jul 12 19:52:05 2007
@@ -286,10 +286,12 @@
         String strValue = value.toString();
         Object parsedValue = formatter.parseObject(strValue, pos);
         if (pos.getErrorIndex() > -1) {
-            throw new ConversionException("Error parsing date '" + value + "' at position="+ pos.getErrorIndex());
+            throw new ConversionException("Error parsing date '" + value +
+                    "' at position="+ pos.getErrorIndex());
         }
         if (pos.getIndex() < strValue.length()) {
-            throw new ConversionException("Date '" + value + "' contains unparsed characters from position=" + pos.getIndex());
+            throw new ConversionException("Date '" + value +
+                    "' contains unparsed characters from position=" + pos.getIndex());
         }
 
         return parsedValue;
@@ -304,8 +306,9 @@
       */
      private String convertLocalizedPattern(String localizedPattern, Locale locale) {
         
-         if (localizedPattern == null)
+         if (localizedPattern == null) {
             return null;
+         }
          
          // Note that this is a little obtuse.
          // However, it is the best way that anyone can come up with 
@@ -351,9 +354,10 @@
                 } else if ((thisChar >= 'a' && thisChar <= 'z') || 
                            (thisChar >= 'A' && thisChar <= 'Z')) {
                     int index = fromChars.indexOf(thisChar );
-                    if (index == -1)
+                    if (index == -1) {
                         throw new IllegalArgumentException(
                             "Illegal pattern character '" + thisChar + "'");
+                    }
                     thisChar = toChars.charAt(index);
                 }
             }

Modified: jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/collections/FastHashMap.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/collections/FastHashMap.java?view=diff&rev=555845&r1=555844&r2=555845
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/collections/FastHashMap.java (original)
+++ jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/collections/FastHashMap.java Thu Jul 12 19:52:05 2007
@@ -592,7 +592,9 @@
 
 
         public boolean equals(Object o) {
-            if (o == this) return true;
+            if (o == this) {
+                return true;
+            }
             if (fast) {
                 return get(map).equals(o);
             } else {



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


Mime
View raw message