You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2013/03/03 12:19:54 UTC
svn commit: r1452028 [2/7] - in /commons/proper/beanutils/trunk/src:
changes/ main/java/org/apache/commons/beanutils/
main/java/org/apache/commons/beanutils/converters/
main/java/org/apache/commons/beanutils/locale/
main/java/org/apache/commons/beanuti...
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaList.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaList.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaList.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaList.java Sun Mar 3 11:19:49 2013
@@ -24,7 +24,7 @@ import java.lang.reflect.Array;
/**
* <h2><i>Lazy</i> DynaBean List.</h2>
- *
+ *
* <p>There are two main purposes for this class:</p>
* <ul>
* <li>To provide <i>Lazy List</i> behaviour - automatically
@@ -32,155 +32,155 @@ import java.lang.reflect.Array;
* with either <code>DynaBean</code>, <code>java.util.Map</code>
* or POJO Beans.</li>
* <li>To provide a straight forward way of putting a Collection
- * or Array into the lazy list <i>and</i> a straight forward
+ * or Array into the lazy list <i>and</i> a straight forward
* way to get it out again at the end.</li>
* </ul>
- *
+ *
* <p>All elements added to the List are stored as <code>DynaBean</code>'s:</p>
* <ul>
- * <li><code>java.util.Map</code> elements are "wrapped" in a <code>LazyDynaMap</code>.</i>
- * <li>POJO Bean elements are "wrapped" in a <code>WrapDynaBean.</code></i>
+ * <li><code>java.util.Map</code> elements are "wrapped" in a <code>LazyDynaMap</code>.</i>
+ * <li>POJO Bean elements are "wrapped" in a <code>WrapDynaBean.</code></i>
* <li><code>DynaBean</code>'s are stored un-changed.</i>
* </ul>
- *
+ *
* <h4><code>toArray()</code></h4>
* <p>The <code>toArray()</code> method returns an array of the
* elements of the appropriate type. If the <code>LazyDynaList</code>
- * is populated with <code>java.util.Map</code> objects a
+ * is populated with <code>java.util.Map</code> objects a
* <code>Map[]</code> array is returned.
* If the list is populated with POJO Beans an appropriate
* array of the POJO Beans is returned. Otherwise a <code>DynaBean[]</code>
* array is returned.
* </p>
- *
+ *
* <h4><code>toDynaBeanArray()</code></h4>
- * <p>The <code>toDynaBeanArray()</code> method returns a
+ * <p>The <code>toDynaBeanArray()</code> method returns a
* <code>DynaBean[]</code> array of the elements in the List.
* </p>
- *
+ *
* <p><strong>N.B.</strong>All the elements in the List must be the
* same type. If the <code>DynaClass</code> or <code>Class</code>
* of the <code>LazyDynaList</code>'s elements is
* not specified, then it will be automatically set to the type
* of the first element populated.
* </p>
- *
+ *
* <h3>Example 1</h3>
* <p>If you have an array of <code>java.util.Map[]</code> - you can put that into
* a <code>LazyDynaList</code>.</p>
- *
+ *
* <pre><code>
* TreeMap[] myArray = .... // your Map[]
* List lazyList = new LazyDynaList(myArray);
* </code></pre>
- *
+ *
* <p>New elements of the appropriate Map type are
* automatically populated:</p>
- *
+ *
* <pre><code>
* // get(index) automatically grows the list
* DynaBean newElement = (DynaBean)lazyList.get(lazyList.size());
* newElement.put("someProperty", "someValue");
* </code></pre>
- *
+ *
* <p>Once you've finished you can get back an Array of the
* elements of the appropriate type:</p>
- *
+ *
* <pre><code>
* // Retrieve the array from the list
* TreeMap[] myArray = (TreeMap[])lazyList.toArray());
* </code></pre>
- *
- *
+ *
+ *
* <h3>Example 2</h3>
* <p>Alternatively you can create an <i>empty</i> List and
* specify the Class for List's elements. The LazyDynaList
* uses the Class to automatically populate elements:</p>
- *
+ *
* <pre><code>
* // e.g. For Maps
* List lazyList = new LazyDynaList(TreeMap.class);
- *
+ *
* // e.g. For POJO Beans
* List lazyList = new LazyDynaList(MyPojo.class);
- *
+ *
* // e.g. For DynaBeans
* List lazyList = new LazyDynaList(MyDynaBean.class);
* </code></pre>
- *
+ *
* <h3>Example 3</h3>
- * <p>Alternatively you can create an <i>empty</i> List and specify the
+ * <p>Alternatively you can create an <i>empty</i> List and specify the
* DynaClass for List's elements. The LazyDynaList uses
* the DynaClass to automatically populate elements:</p>
- *
+ *
* <pre><code>
* // e.g. For Maps
* DynaClass dynaClass = new LazyDynaMap(new HashMap());
* List lazyList = new LazyDynaList(dynaClass);
- *
+ *
* // e.g. For POJO Beans
* DynaClass dynaClass = (new WrapDynaBean(myPojo)).getDynaClass();
* List lazyList = new LazyDynaList(dynaClass);
- *
+ *
* // e.g. For DynaBeans
* DynaClass dynaClass = new BasicDynaClass(properties);
* List lazyList = new LazyDynaList(dynaClass);
* </code></pre>
- *
+ *
* <p><strong>N.B.</strong> You may wonder why control the type
* using a <code>DynaClass</code> rather than the <code>Class</code>
* as in the previous example - the reason is that some <code>DynaBean</code>
* implementations don't have a <i>default</i> empty constructor and
* therefore need to be instantiated using the <code>DynaClass.newInstance()</code>
* method.</p>
- *
+ *
* <h3>Example 4</h3>
* <p>A slight variation - set the element type using either
* the <code>setElementType(Class)</code> method or the
* <code>setElementDynaClass(DynaClass)</code> method - then populate
* with the normal <code>java.util.List</code> methods(i.e.
* <code>add()</code>, <code>addAll()</code> or <code>set()</code>).</p>
- *
+ *
* <pre><code>
* // Create a new LazyDynaList (100 element capacity)
* LazyDynaList lazyList = new LazyDynaList(100);
- *
+ *
* // Either Set the element type...
* lazyList.setElementType(TreeMap.class);
- *
+ *
* // ...or the element DynaClass...
* lazyList.setElementDynaClass(new MyCustomDynaClass());
- *
+ *
* // Populate from a collection
* lazyList.addAll(myCollection);
*
* </code></pre>
- *
+ *
* @version $Revision$ $Date$
* @since 1.8.0
*/
public class LazyDynaList extends ArrayList {
-
+
/**
* The DynaClass of the List's elements.
*/
private DynaClass elementDynaClass;
-
+
/**
* The WrapDynaClass if the List's contains
* POJO Bean elements.
*
* N.B. WrapDynaClass isn't serlializable, which
- * is why its stored separately in a
+ * is why its stored separately in a
* transient instance variable.
*/
private transient WrapDynaClass wrapDynaClass;
-
+
/**
* The type of the List's elements.
*/
private Class elementType;
-
+
/**
* The DynaBean type of the List's elements.
*/
@@ -197,20 +197,20 @@ public class LazyDynaList extends ArrayL
}
/**
- * Construct a LazyDynaList with the
+ * Construct a LazyDynaList with the
* specified capacity.
*
* @param capacity The initial capacity of the list.
*/
public LazyDynaList(int capacity) {
super(capacity);
-
+
}
/**
* Construct a LazyDynaList with a
* specified DynaClass for its elements.
- *
+ *
* @param elementDynaClass The DynaClass of the List's elements.
*/
public LazyDynaList(DynaClass elementDynaClass) {
@@ -221,14 +221,14 @@ public class LazyDynaList extends ArrayL
/**
* Construct a LazyDynaList with a
* specified type for its elements.
- *
+ *
* @param elementType The Type of the List's elements.
*/
public LazyDynaList(Class elementType) {
super();
setElementType(elementType);
}
-
+
/**
* Construct a LazyDynaList populated with the
* elements of a Collection.
@@ -239,7 +239,7 @@ public class LazyDynaList extends ArrayL
super(collection.size());
addAll(collection);
}
-
+
/**
* Construct a LazyDynaList populated with the
* elements of an Array.
@@ -258,11 +258,11 @@ public class LazyDynaList extends ArrayL
/**
* <p>Insert an element at the specified index position.</p>
- *
- * <p>If the index position is greater than the current
+ *
+ * <p>If the index position is greater than the current
* size of the List, then the List is automatically
* <i>grown</i> to the appropriate size.</p>
- *
+ *
* @param index The index position to insert the new element.
* @param element The new element to add.
*/
@@ -271,7 +271,7 @@ public class LazyDynaList extends ArrayL
DynaBean dynaBean = transform(element);
growList(index);
-
+
super.add(index, dynaBean);
}
@@ -301,7 +301,7 @@ public class LazyDynaList extends ArrayL
if (collection == null || collection.size() == 0) {
return false;
}
-
+
ensureCapacity(size() + collection.size());
Iterator iterator = collection.iterator();
@@ -317,10 +317,10 @@ public class LazyDynaList extends ArrayL
* <p>Insert all the elements from a Collection into the
* list at a specified position.
*
- * <p>If the index position is greater than the current
+ * <p>If the index position is greater than the current
* size of the List, then the List is automatically
* <i>grown</i> to the appropriate size.</p>
- *
+ *
* @param collection The Collection of new elements.
* @param index The index position to insert the new elements at.
* @return true if elements were added.
@@ -330,9 +330,9 @@ public class LazyDynaList extends ArrayL
if (collection == null || collection.size() == 0) {
return false;
}
-
+
ensureCapacity((index > size() ? index : size()) + collection.size());
-
+
// Call "tranform" with first element, before
// List is "grown" to ensure the correct DynaClass
// is set.
@@ -348,16 +348,16 @@ public class LazyDynaList extends ArrayL
}
return true;
-
+
}
/**
* <p>Return the element at the specified position.</p>
*
- * <p>If the position requested is greater than the current
+ * <p>If the position requested is greater than the current
* size of the List, then the List is automatically
* <i>grown</i> (and populated) to the appropriate size.</p>
- *
+ *
* @param index The index position to insert the new elements at.
* @return The element at the specified position.
*/
@@ -372,10 +372,10 @@ public class LazyDynaList extends ArrayL
/**
* <p>Set the element at the specified position.</p>
*
- * <p>If the position requested is greater than the current
+ * <p>If the position requested is greater than the current
* size of the List, then the List is automatically
* <i>grown</i> (and populated) to the appropriate size.</p>
- *
+ *
* @param index The index position to insert the new element at.
* @param element The new element.
* @return The new element.
@@ -387,7 +387,7 @@ public class LazyDynaList extends ArrayL
growList(index + 1);
return super.set(index, dynaBean);
-
+
}
/**
@@ -397,12 +397,12 @@ public class LazyDynaList extends ArrayL
* of the List:</p>
* <ul>
* <li>If the List contains only LazyDynaMap type elements
- * then a java.util.Map[] array will be created.</li>
- * <li>If the List contains only elements which are
+ * then a java.util.Map[] array will be created.</li>
+ * <li>If the List contains only elements which are
* "wrapped" DynaBeans then an Object[] of the most
* suitable type will be created.</li>
* <li>...otherwise a DynaBean[] will be created.</li>
- *
+ *
* @return An Array of the elements in this List.
*/
public Object[] toArray() {
@@ -414,15 +414,15 @@ public class LazyDynaList extends ArrayL
Object[] array = (Object[])Array.newInstance(elementType, size());
for (int i = 0; i < size(); i++) {
if (Map.class.isAssignableFrom(elementType)) {
- array[i] = ((LazyDynaMap)get(i)).getMap();
+ array[i] = ((LazyDynaMap)get(i)).getMap();
} else if (DynaBean.class.isAssignableFrom(elementType)) {
array[i] = get(i);
} else {
- array[i] = ((WrapDynaBean)get(i)).getInstance();
+ array[i] = ((WrapDynaBean)get(i)).getInstance();
}
}
return array;
-
+
}
/**
@@ -432,7 +432,7 @@ public class LazyDynaList extends ArrayL
* @return An Array of the elements in this List.
*/
public Object[] toArray(Object[] model) {
-
+
// Allocate the Array
Class arrayType = model.getClass().getComponentType();
Object[] array = (Object[])Array.newInstance(arrayType, size());
@@ -451,20 +451,20 @@ public class LazyDynaList extends ArrayL
if ((arrayType.isAssignableFrom(elementType))) {
for (int i = 0; i < size(); i++) {
if (Map.class.isAssignableFrom(elementType)) {
- array[i] = ((LazyDynaMap)get(i)).getMap();
+ array[i] = ((LazyDynaMap)get(i)).getMap();
} else if (DynaBean.class.isAssignableFrom(elementType)) {
array[i] = get(i);
} else {
- array[i] = ((WrapDynaBean)get(i)).getInstance();
+ array[i] = ((WrapDynaBean)get(i)).getInstance();
}
}
return array;
}
- throw new IllegalArgumentException("Invalid array type: "
+ throw new IllegalArgumentException("Invalid array type: "
+ arrayType.getName() + " - not compatible with '"
+ elementType.getName());
-
+
}
@@ -480,13 +480,13 @@ public class LazyDynaList extends ArrayL
if (size() == 0 && elementDynaBeanType == null) {
return new LazyDynaBean[0];
}
-
+
DynaBean[] array = (DynaBean[])Array.newInstance(elementDynaBeanType, size());
for (int i = 0; i < size(); i++) {
array[i] = (DynaBean)get(i);
}
return array;
-
+
}
/**
@@ -514,7 +514,7 @@ public class LazyDynaList extends ArrayL
try {
object = elementType.newInstance();
} catch (Exception e) {
- throw new IllegalArgumentException("Error creating type: "
+ throw new IllegalArgumentException("Error creating type: "
+ elementType.getName() + " - " + e);
}
@@ -592,23 +592,23 @@ public class LazyDynaList extends ArrayL
* @param requiredSize the required size of the List.
*/
private void growList(int requiredSize) {
-
+
if (requiredSize < size()) {
return;
}
-
+
ensureCapacity(requiredSize + 1);
-
+
for (int i = size(); i < requiredSize; i++) {
DynaBean dynaBean = transform(null);
super.add(dynaBean);
}
-
+
}
/**
* <p>Transform the element into a DynaBean:</p>
- *
+ *
* <ul>
* <li>Map elements are turned into LazyDynaMap's.</li>
* <li>POJO Beans are "wrapped" in a WrapDynaBean.</li>
@@ -637,14 +637,14 @@ public class LazyDynaList extends ArrayL
if (getDynaClass() == null) {
setElementType(elementType);
}
-
- // Create a new DynaBean
+
+ // Create a new DynaBean
try {
dynaBean = getDynaClass().newInstance();
newDynaBeanType = dynaBean.getClass();
} catch (Exception e) {
- throw new IllegalArgumentException("Error creating DynaBean: "
- + getDynaClass().getClass().getName()
+ throw new IllegalArgumentException("Error creating DynaBean: "
+ + getDynaClass().getClass().getName()
+ " - " + e);
}
@@ -672,15 +672,15 @@ public class LazyDynaList extends ArrayL
newElementType = ((LazyDynaMap)dynaBean).getMap().getClass();
}
- // Check the new element type, matches all the
+ // Check the new element type, matches all the
// other elements in the List
if (elementType != null && !newElementType.equals(elementType)) {
- throw new IllegalArgumentException("Element Type " + newElementType
+ throw new IllegalArgumentException("Element Type " + newElementType
+ " doesn't match other elements " + elementType);
}
return dynaBean;
-
+
}
/**
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java Sun Mar 3 11:19:49 2013
@@ -91,7 +91,7 @@ public class MappedPropertyDescriptor ex
throws IntrospectionException {
super(propertyName, null, null);
-
+
if (propertyName == null || propertyName.length() == 0) {
throw new IntrospectionException("bad property name: " +
propertyName + " on class: " + beanClass.getClass().getName());
@@ -99,7 +99,7 @@ public class MappedPropertyDescriptor ex
setName(propertyName);
String base = capitalizePropertyName(propertyName);
-
+
// Look for mapped read method and matching write method
Method mappedReadMethod = null;
Method mappedWriteMethod = null;
@@ -118,8 +118,8 @@ public class MappedPropertyDescriptor ex
* TODO: Why?
*/
}
-
- // If there's no read method, then look for just a write method
+
+ // If there's no read method, then look for just a write method
if (mappedReadMethod == null) {
mappedWriteMethod = getMethod(beanClass, "set" + base, 2);
}
@@ -131,7 +131,7 @@ public class MappedPropertyDescriptor ex
}
mappedReadMethodRef = new MappedMethodReference(mappedReadMethod);
mappedWriteMethodRef = new MappedMethodReference(mappedWriteMethod);
-
+
findMappedPropertyType();
}
@@ -173,7 +173,7 @@ public class MappedPropertyDescriptor ex
if (mappedReadMethod != null) {
Class[] params = { String.class, mappedReadMethod.getReturnType() };
- mappedWriteMethod =
+ mappedWriteMethod =
getMethod(beanClass, mappedSetterName, params);
} else {
mappedWriteMethod =
@@ -400,7 +400,7 @@ public class MappedPropertyDescriptor ex
/**
* Find a method on a class with a specified parameter list.
*/
- private static Method getMethod(Class clazz, String methodName, Class[] parameterTypes)
+ private static Method getMethod(Class clazz, String methodName, Class[] parameterTypes)
throws IntrospectionException {
if (methodName == null) {
return null;
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/NestedNullException.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/NestedNullException.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/NestedNullException.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/NestedNullException.java Sun Mar 3 11:19:49 2013
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.commons.beanutils;
-/**
+/**
* Thrown to indicate that the <em>Bean Access Language</em> cannot execute query
* against given bean since a nested bean referenced is null.
*
@@ -26,19 +26,19 @@ package org.apache.commons.beanutils;
*/
public class NestedNullException extends BeanAccessLanguageException {
-
+
// --------------------------------------------------------- Constuctors
-
- /**
+
+ /**
* Constructs a <code>NestedNullException</code> without a detail message.
*/
public NestedNullException() {
super();
}
-
+
/**
* Constructs a <code>NestedNullException</code> without a detail message.
- *
+ *
* @param message the detail message explaining this exception
*/
public NestedNullException(String message) {
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java Sun Mar 3 11:19:49 2013
@@ -225,9 +225,9 @@ public class ResultSetDynaClass extends
// ------------------------------------------------------ Protected Methods
-
+
/**
- * <p>Loads the class of the given name which by default uses the class loader used
+ * <p>Loads the class of the given name which by default uses the class loader used
* to load this library.
* Dervations of this class could implement alternative class loading policies such as
* using custom ClassLoader or using the Threads's context class loader etc.
@@ -235,12 +235,12 @@ public class ResultSetDynaClass extends
* @param className The name of the class to load
* @return The loaded class
* @throws SQLException if the class cannot be loaded
- */
+ */
protected Class loadClass(String className) throws SQLException {
try {
return getClass().getClassLoader().loadClass(className);
- }
+ }
catch (Exception e) {
throw new SQLException("Cannot load column class '" +
className + "': " + e);
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/RowSetDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/RowSetDynaClass.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/RowSetDynaClass.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/RowSetDynaClass.java Sun Mar 3 11:19:49 2013
@@ -70,9 +70,9 @@ public class RowSetDynaClass extends JDB
// ----------------------------------------------------- Instance variables
-
+
/**
- * <p>Limits the size of the returned list. The call to
+ * <p>Limits the size of the returned list. The call to
* <code>getRows()</code> will return at most limit number of rows.
* If less than or equal to 0, does not limit the size of the result.
*/
@@ -110,12 +110,12 @@ public class RowSetDynaClass extends JDB
* <p>Construct a new {@link RowSetDynaClass} for the specified
* <code>ResultSet</code>. The property names corresponding
* to column names in the result set will be lower cased.</p>
- *
+ *
* If <code>limit</code> is not less than 0, max <code>limit</code>
- * number of rows will be copied into the list.
+ * number of rows will be copied into the list.
*
* @param resultSet The result set to be wrapped
- * @param limit The maximum for the size of the result.
+ * @param limit The maximum for the size of the result.
*
* @exception NullPointerException if <code>resultSet</code>
* is <code>null</code>
@@ -136,7 +136,7 @@ public class RowSetDynaClass extends JDB
* depending on the specified <code>lowerCase</code> value.</p>
*
* If <code>limit</code> is not less than 0, max <code>limit</code>
- * number of rows will be copied into the resultset.
+ * number of rows will be copied into the resultset.
*
*
* @param resultSet The result set to be wrapped
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WeakFastHashMap.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WeakFastHashMap.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WeakFastHashMap.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WeakFastHashMap.java Sun Mar 3 11:19:49 2013
@@ -46,12 +46,12 @@ import java.util.WeakHashMap;
* <code>java.util.HashMap</code> directly (with no synchronization), for
* maximum performance.</p>
*
- * <p><strong>NOTE</strong>: <i>This class is not cross-platform.
+ * <p><strong>NOTE</strong>: <i>This class is not cross-platform.
* Using it may cause unexpected failures on some architectures.</i>
- * It suffers from the same problems as the double-checked locking idiom.
- * In particular, the instruction that clones the internal collection and the
- * instruction that sets the internal reference to the clone can be executed
- * or perceived out-of-order. This means that any read operation might fail
+ * It suffers from the same problems as the double-checked locking idiom.
+ * In particular, the instruction that clones the internal collection and the
+ * instruction that sets the internal reference to the clone can be executed
+ * or perceived out-of-order. This means that any read operation might fail
* unexpectedly, as it may be reading the state of the internal collection
* before the internal collection is fully formed.
* For more information on the double-checked locking idiom, see the
@@ -60,7 +60,7 @@ import java.util.WeakHashMap;
*
* @since Commons Collections 1.0
* @version $Revision$ $Date$
- *
+ *
* @author Craig R. McClanahan
* @author Stephen Colebourne
*/
@@ -167,7 +167,7 @@ class WeakFastHashMap extends HashMap {
/**
* Return the number of key-value mappings in this map.
- *
+ *
* @return the current size of the map
*/
public int size() {
@@ -182,7 +182,7 @@ class WeakFastHashMap extends HashMap {
/**
* Return <code>true</code> if this map contains no mappings.
- *
+ *
* @return is the map currently empty
*/
public boolean isEmpty() {
@@ -318,7 +318,7 @@ class WeakFastHashMap extends HashMap {
// Basic object methods
// ----------------------------------------------------------------------
-
+
/**
* Compare the specified object with this list for equality. This
* implementation uses exactly the code that is used to define the
@@ -358,7 +358,7 @@ class WeakFastHashMap extends HashMap {
}
}
return (true);
-
+
} else {
synchronized (map) {
if (mo.size() != map.size()) {
@@ -388,7 +388,7 @@ class WeakFastHashMap extends HashMap {
* Return the hash code value for this map. This implementation uses
* exactly the code that is used to define the list hash function in the
* documentation for the <code>Map.hashCode</code> method.
- *
+ *
* @return suitable integer hash code
*/
public int hashCode() {
@@ -414,7 +414,7 @@ class WeakFastHashMap extends HashMap {
/**
* Return a shallow copy of this <code>FastHashMap</code> instance.
* The keys and values themselves are not copied.
- *
+ *
* @return a clone of this map
*/
public Object clone() {
@@ -432,7 +432,7 @@ class WeakFastHashMap extends HashMap {
// Map views
// ----------------------------------------------------------------------
-
+
/**
* Return a collection view of the mappings contained in this map. Each
* element in the returned collection is a <code>Map.Entry</code>.
@@ -472,11 +472,11 @@ class WeakFastHashMap extends HashMap {
protected Map createMap(int capacity, float factor) {
return new WeakHashMap(capacity, factor);
}
-
+
protected Map createMap(Map map) {
return new WeakHashMap(map);
}
-
+
protected Map cloneMap(Map map) {
return createMap(map);
}
@@ -660,7 +660,7 @@ class WeakFastHashMap extends HashMap {
this.expected = map;
this.iterator = expected.entrySet().iterator();
}
-
+
public boolean hasNext() {
if (expected != map) {
throw new ConcurrentModificationException();
@@ -701,44 +701,44 @@ class WeakFastHashMap extends HashMap {
* Set implementation over the keys of the FastHashMap
*/
private class KeySet extends CollectionView implements Set {
-
+
protected Collection get(Map map) {
return map.keySet();
}
-
+
protected Object iteratorNext(Map.Entry entry) {
return entry.getKey();
}
-
+
}
-
+
/**
* Collection implementation over the values of the FastHashMap
*/
private class Values extends CollectionView {
-
+
protected Collection get(Map map) {
return map.values();
}
-
+
protected Object iteratorNext(Map.Entry entry) {
return entry.getValue();
}
}
-
+
/**
* Set implementation over the entries of the FastHashMap
*/
private class EntrySet extends CollectionView implements Set {
-
+
protected Collection get(Map map) {
return map.entrySet();
}
-
+
protected Object iteratorNext(Map.Entry entry) {
return entry;
}
-
+
}
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java Sun Mar 3 11:19:49 2013
@@ -28,7 +28,7 @@ import java.lang.reflect.InvocationTarge
*
* <p>
* The most common use cases for this class involve wrapping an existing java bean.
- * (This makes it different from the typical use cases for other <code>DynaBean</code>'s.)
+ * (This makes it different from the typical use cases for other <code>DynaBean</code>'s.)
* For example:
* </p>
* <code><pre>
@@ -339,12 +339,12 @@ public class WrapDynaBean implements Dyn
}
- /**
+ /**
* Gets the bean instance wrapped by this DynaBean.
- * For most common use cases,
- * this object should already be known
+ * For most common use cases,
+ * this object should already be known
* and this method safely be ignored.
- * But some creators of frameworks using <code>DynaBean</code>'s may
+ * But some creators of frameworks using <code>DynaBean</code>'s may
* find this useful.
*
* @return the java bean Object wrapped by this <code>DynaBean</code>
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java Sun Mar 3 11:19:49 2013
@@ -35,7 +35,7 @@ import java.util.WeakHashMap;
*
* <p>
* It is suggested that this class should not usually need to be used directly
- * to create new <code>WrapDynaBean</code> instances.
+ * to create new <code>WrapDynaBean</code> instances.
* It's usually better to call the <code>WrapDynaBean</code> constructor directly.
* For example:</p>
* <code><pre>
@@ -122,7 +122,7 @@ public class WrapDynaClass implements Dy
// ------------------------------------------------------- Static Variables
- private static final ContextClassLoaderLocal CLASSLOADER_CACHE =
+ private static final ContextClassLoaderLocal CLASSLOADER_CACHE =
new ContextClassLoaderLocal() {
protected Object initialValue() {
return new WeakHashMap();
@@ -159,12 +159,12 @@ public class WrapDynaClass implements Dy
* COMPATIBLE WITH PREVIOUS RELEASES.
*
* There are two issues here:
- *
+ *
* 1) Memory Issues: The static HashMap caused memory problems (See BEANUTILS-59)
* to resolve this it has been moved into a ContextClassLoaderLocal instance
* (named CLASSLOADER_CACHE above) which holds one copy per
* ClassLoader in a WeakHashMap.
- *
+ *
* 2) Binary Compatibility: As the "dynaClasses" static HashMap is "protected"
* removing it breaks BeanUtils binary compatibility with previous versions.
* To resolve this all the methods have been overriden to delegate to the
@@ -286,8 +286,8 @@ public class WrapDynaClass implements Dy
/**
* <p>Instantiates a new standard JavaBean instance associated with
- * this DynaClass and return it wrapped in a new WrapDynaBean
- * instance. <strong>NOTE</strong> the JavaBean should have a
+ * this DynaClass and return it wrapped in a new WrapDynaBean
+ * instance. <strong>NOTE</strong> the JavaBean should have a
* no argument constructor.</p>
*
* <strong>NOTE</strong> - Most common use cases should not need to use
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java Sun Mar 3 11:19:49 2013
@@ -363,7 +363,7 @@ public abstract class AbstractConverter
return defaultValue;
}
}
-
+
/**
* Provide a String representation of this converter.
*
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java Sun Mar 3 11:19:49 2013
@@ -48,7 +48,7 @@ import org.apache.commons.beanutils.Conv
* of the delegate {@link Converter}.</li>
* <li><b>Delimited Lists</b> - can Convert <b>to</b> and <b>from</b> a
* delimited list in String format.</li>
- * <li><b>Conversion to String</b> - converts an array to a
+ * <li><b>Conversion to String</b> - converts an array to a
* <code>String</code> in one of two ways: as a <i>delimited list</i>
* or by converting the first element in the array to a String - this
* is controlled by the {@link ArrayConverter#setOnlyFirstToString(boolean)}
@@ -58,15 +58,15 @@ import org.apache.commons.beanutils.Conv
* within each other - see example below.</li>
* <li><b>Default Value</b></li>
* <ul>
- * <li><b><i>No Default</b></i> - use the
+ * <li><b><i>No Default</b></i> - use the
* {@link ArrayConverter#ArrayConverter(Class, Converter)}
* constructor to create a converter which throws a
* {@link ConversionException} if the value is missing or
* invalid.</li>
- * <li><b><i>Default values</b></i> - use the
+ * <li><b><i>Default values</b></i> - use the
* {@link ArrayConverter#ArrayConverter(Class, Converter, int)}
* constructor to create a converter which returns a <i>default
- * value</i>. The <i>defaultSize</i> parameter controls the
+ * value</i>. The <i>defaultSize</i> parameter controls the
* <i>default value</i> in the following way:</li>
* <ul>
* <li><i>defaultSize < 0</i> - default is <code>null</code></li>
@@ -208,7 +208,7 @@ public class ArrayConverter extends Abst
* @param onlyFirstToString <code>true</code> converts only
* the first value in the array to a String, <code>false</code>
* converts all values in the array into a delimited list (default
- * is <code>true</code>
+ * is <code>true</code>
*/
public void setOnlyFirstToString(boolean onlyFirstToString) {
this.onlyFirstToString = onlyFirstToString;
@@ -327,7 +327,7 @@ public class ArrayConverter extends Abst
* </p>
* <ul>
* <li>{@link Collection} values are returned unchanged</li>
- * <li>{@link Number}, {@link Boolean} and {@link java.util.Date}
+ * <li>{@link Number}, {@link Boolean} and {@link java.util.Date}
* values returned as a the only element in a List.</li>
* <li>All other types are converted to a String and parsed
* as a delimited list.</li>
@@ -353,7 +353,7 @@ public class ArrayConverter extends Abst
list.add(value);
return list;
}
-
+
return parseElements(type, value.toString());
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java Sun Mar 3 11:19:49 2013
@@ -93,7 +93,7 @@ public final class BooleanArrayConverter
* documentation for method "convert" for more information.
* The value BooleanArrayConverter.NO_DEFAULT may be passed here to
* specify that an exception should be thrown on conversion failure.
- *
+ *
*/
public BooleanArrayConverter(BooleanConverter converter, Object defaultValue) {
@@ -133,7 +133,7 @@ public final class BooleanArrayConverter
/**
* Convert the specified input object into an output object of type
* array-of-boolean.
- *
+ *
* <p>If the input value is null, then the default value specified in the
* constructor is returned. If no such value was provided, then a
* ConversionException is thrown instead.</p>
@@ -156,11 +156,11 @@ public final class BooleanArrayConverter
* <p>If any of the elements in the value array (or the elements resulting
* from splitting up value.toString) are not recognised by the
* BooleanConverter associated with this object, then what happens depends
- * on whether that BooleanConverter has a default value or not: if it does,
+ * on whether that BooleanConverter has a default value or not: if it does,
* then that unrecognised element is converted into the BooleanConverter's
* default value. If the BooleanConverter does <i>not</i> have a default
* value, then the default value for this object is returned as the
- * <i>complete</i> conversion result (not just for the element), or an
+ * <i>complete</i> conversion result (not just for the element), or an
* exception is thrown if this object has no default value defined.</p>
*
* @param type is the type to which this value should be converted. In the
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java Sun Mar 3 11:19:49 2013
@@ -28,7 +28,7 @@ import org.apache.commons.beanutils.Conv
* <code>ConversionException</code> if a conversion error occurs.
* <p>
* By default any object whose string representation is one of the values
- * {"yes", "y", "true", "on", "1"} is converted to Boolean.TRUE, and
+ * {"yes", "y", "true", "on", "1"} is converted to Boolean.TRUE, and
* string representations {"no", "n", "false", "off", "0"} are converted
* to Boolean.FALSE. The recognised true/false strings can be changed by:
* <pre>
@@ -45,7 +45,7 @@ import org.apache.commons.beanutils.Conv
* ConvertUtils.register(bac, bac.MODEL);
* </pre>
* </p>
- *
+ *
* <p>Case is ignored when converting values to true or false.</p>
*
* @author Craig R. McClanahan
@@ -133,7 +133,7 @@ public final class BooleanConverter exte
* in which case an exception will be thrown on conversion failure.
* @since 1.8.0
*/
- public BooleanConverter(String[] trueStrings, String[] falseStrings,
+ public BooleanConverter(String[] trueStrings, String[] falseStrings,
Object defaultValue) {
super();
this.trueStrings = copyStrings(trueStrings);
@@ -192,7 +192,7 @@ public final class BooleanConverter exte
* shall be invoked on this object, and the result compared (ignoring
* case) against the known "true" and "false" string values.
*
- * @return Boolean.TRUE if the value was a recognised "true" value,
+ * @return Boolean.TRUE if the value was a recognised "true" value,
* Boolean.FALSE if the value was a recognised "false" value, or
* the default value if the value was not recognised and the constructor
* was provided with a default value.
@@ -219,7 +219,7 @@ public final class BooleanConverter exte
return Boolean.FALSE;
}
}
-
+
throw new ConversionException("Can't convert value '" + value + "' to a Boolean");
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateTimeConverter.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateTimeConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateTimeConverter.java Sun Mar 3 11:19:49 2013
@@ -179,7 +179,7 @@ public abstract class DateTimeConverter
* @return Array of format patterns.
*/
public String[] getPatterns() {
- return patterns;
+ return patterns;
}
/**
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java Sun Mar 3 11:19:49 2013
@@ -30,7 +30,7 @@ import org.apache.commons.beanutils.Conv
* on how this instance is constructed.
* <p>
* There is also some special handling where the input is of type int[].
- * See method convert for more details.
+ * See method convert for more details.
*
* @author Craig R. McClanahan
* @version $Revision$ $Date$
@@ -77,7 +77,7 @@ public final class StringArrayConverter
* <p>Model object for type comparisons.</p>
*/
private static final String[] MODEL = new String[0];
-
+
/**
* <p> Model object for int arrays.</p>
*/
@@ -99,18 +99,18 @@ public final class StringArrayConverter
* element in the string array is the result of calling Integer.toString
* on the corresponding element of the int array. This was added as a
* result of bugzilla request #18297 though there is not complete
- * agreement that this feature should have been added.
+ * agreement that this feature should have been added.
* <p>
* In all other cases, this method calls toString on the input object, then
- * assumes the result is a comma-separated list of values. The values are
+ * assumes the result is a comma-separated list of values. The values are
* split apart into the individual items and returned as the elements of an
* array. See class AbstractArrayConverter for the exact input formats
* supported.
- *
+ *
* @param type is the data type to which this value should be converted.
* It is expected to be the class for type String[] (though this parameter
* is actually ignored by this method).
- *
+ *
* @param value is the input value to be converted. If null then the
* default value is returned or an exception thrown if no default value
* exists.
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java Sun Mar 3 11:19:49 2013
@@ -36,7 +36,7 @@ package org.apache.commons.beanutils.con
* object being converted (or possibly has a map of converters, and looks
* them up based on the class of the input object). However this is not part
* of the existing ConvertUtils framework.
- *
+ *
*
* @author Craig R. McClanahan
* @version $Revision$ $Date$
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java Sun Mar 3 11:19:49 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.commons.beanutils.locale;
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java Sun Mar 3 11:19:49 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.commons.beanutils.locale;
@@ -52,17 +52,17 @@ import java.util.Locale;
public class LocaleBeanUtilsBean extends BeanUtilsBean {
- /**
+ /**
* Contains <code>LocaleBeanUtilsBean</code> instances indexed by context classloader.
*/
- private static final ContextClassLoaderLocal
+ private static final ContextClassLoaderLocal
LOCALE_BEANS_BY_CLASSLOADER = new ContextClassLoaderLocal() {
// Creates the default instance used when the context classloader is unavailable
protected Object initialValue() {
return new LocaleBeanUtilsBean();
}
};
-
+
/**
* Gets singleton instance
*
@@ -71,12 +71,12 @@ public class LocaleBeanUtilsBean extends
public static LocaleBeanUtilsBean getLocaleBeanUtilsInstance() {
return (LocaleBeanUtilsBean)LOCALE_BEANS_BY_CLASSLOADER.get();
}
-
- /**
+
+ /**
* Sets the instance which provides the functionality for {@link LocaleBeanUtils}.
* This is a pseudo-singleton - an single instance is provided per (thread) context classloader.
* This mechanism provides isolation for web apps deployed in the same container.
- *
+ *
* @param newInstance a new singleton instance
*/
public static void setInstance(LocaleBeanUtilsBean newInstance) {
@@ -87,18 +87,18 @@ public class LocaleBeanUtilsBean extends
private final Log log = LogFactory.getLog(LocaleBeanUtilsBean.class);
// ----------------------------------------------------- Instance Variables
-
+
/** Convertor used by this class */
private final LocaleConvertUtilsBean localeConvertUtils;
-
+
// --------------------------------------------------------- Constructors
-
+
/** Construct instance with standard conversion bean */
public LocaleBeanUtilsBean() {
this.localeConvertUtils = new LocaleConvertUtilsBean();
}
-
- /**
+
+ /**
* Construct instance that uses given locale conversion
*
* @param localeConvertUtils use this <code>localeConvertUtils</code> to perform
@@ -113,8 +113,8 @@ public class LocaleBeanUtilsBean extends
super(convertUtilsBean, propertyUtilsBean);
this.localeConvertUtils = localeConvertUtils;
}
-
- /**
+
+ /**
* Construct instance that uses given locale conversion
*
* @param localeConvertUtils use this <code>localeConvertUtils</code> to perform
@@ -123,9 +123,9 @@ public class LocaleBeanUtilsBean extends
public LocaleBeanUtilsBean(LocaleConvertUtilsBean localeConvertUtils) {
this.localeConvertUtils = localeConvertUtils;
}
-
+
// --------------------------------------------------------- Public Methods
-
+
/**
* Gets the bean instance used for conversions
*
@@ -134,7 +134,7 @@ public class LocaleBeanUtilsBean extends
public LocaleConvertUtilsBean getLocaleConvertUtils() {
return localeConvertUtils;
}
-
+
/**
* Gets the default Locale
* @return the default locale
@@ -203,11 +203,11 @@ public class LocaleBeanUtilsBean extends
* propety cannot be found
*/
public String getIndexedProperty(
- Object bean,
- String name,
+ Object bean,
+ String name,
String pattern)
- throws
- IllegalAccessException,
+ throws
+ IllegalAccessException,
InvocationTargetException,
NoSuchMethodException {
@@ -235,10 +235,10 @@ public class LocaleBeanUtilsBean extends
* propety cannot be found
*/
public String getIndexedProperty(
- Object bean,
+ Object bean,
String name)
- throws
- IllegalAccessException,
+ throws
+ IllegalAccessException,
InvocationTargetException,
NoSuchMethodException {
@@ -368,11 +368,11 @@ public class LocaleBeanUtilsBean extends
*/
public String getMappedProperty(
Object bean,
- String name,
- String key,
+ String name,
+ String key,
String pattern)
- throws
- IllegalAccessException,
+ throws
+ IllegalAccessException,
InvocationTargetException,
NoSuchMethodException {
@@ -429,11 +429,11 @@ public class LocaleBeanUtilsBean extends
* propety cannot be found
*/
public String getMappedPropertyLocale(
- Object bean,
- String name,
+ Object bean,
+ String name,
String pattern)
- throws
- IllegalAccessException,
+ throws
+ IllegalAccessException,
InvocationTargetException,
NoSuchMethodException {
@@ -464,8 +464,8 @@ public class LocaleBeanUtilsBean extends
* propety cannot be found
*/
public String getMappedProperty(Object bean, String name)
- throws
- IllegalAccessException,
+ throws
+ IllegalAccessException,
InvocationTargetException,
NoSuchMethodException {
@@ -491,12 +491,12 @@ public class LocaleBeanUtilsBean extends
* @exception NoSuchMethodException if an accessor method for this
* propety cannot be found
*/
- public String getNestedProperty(
- Object bean,
- String name,
+ public String getNestedProperty(
+ Object bean,
+ String name,
String pattern)
- throws
- IllegalAccessException,
+ throws
+ IllegalAccessException,
InvocationTargetException,
NoSuchMethodException {
@@ -523,8 +523,8 @@ public class LocaleBeanUtilsBean extends
* propety cannot be found
*/
public String getNestedProperty(Object bean, String name)
- throws
- IllegalAccessException,
+ throws
+ IllegalAccessException,
InvocationTargetException,
NoSuchMethodException {
@@ -550,8 +550,8 @@ public class LocaleBeanUtilsBean extends
* propety cannot be found
*/
public String getProperty(Object bean, String name, String pattern)
- throws
- IllegalAccessException,
+ throws
+ IllegalAccessException,
InvocationTargetException,
NoSuchMethodException {
@@ -577,8 +577,8 @@ public class LocaleBeanUtilsBean extends
* propety cannot be found
*/
public String getProperty(Object bean, String name)
- throws
- IllegalAccessException,
+ throws
+ IllegalAccessException,
InvocationTargetException,
NoSuchMethodException {
@@ -600,8 +600,8 @@ public class LocaleBeanUtilsBean extends
* throws an exception
*/
public void setProperty(Object bean, String name, Object value)
- throws
- IllegalAccessException,
+ throws
+ IllegalAccessException,
InvocationTargetException {
setProperty(bean, name, value, null);
@@ -623,12 +623,12 @@ public class LocaleBeanUtilsBean extends
* throws an exception
*/
public void setProperty(
- Object bean,
- String name,
- Object value,
+ Object bean,
+ String name,
+ Object value,
String pattern)
- throws
- IllegalAccessException,
+ throws
+ IllegalAccessException,
InvocationTargetException {
// Trace logging (if enabled)
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java Sun Mar 3 11:19:49 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.commons.beanutils.locale;
import org.apache.commons.collections.FastHashMap;
@@ -37,9 +37,9 @@ public class LocaleConvertUtils {
// ----------------------------------------------------- Instance Variables
/**
- * <p>Gets the <code>Locale</code> which will be used when
+ * <p>Gets the <code>Locale</code> which will be used when
* no <code>Locale</code> is passed to a method.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
* @return the default locale
* @see LocaleConvertUtilsBean#getDefaultLocale()
@@ -50,9 +50,9 @@ public class LocaleConvertUtils {
}
/**
- * <p>Sets the <code>Locale</code> which will be used when
+ * <p>Sets the <code>Locale</code> which will be used when
* no <code>Locale</code> is passed to a method.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @param locale the default locale
@@ -65,7 +65,7 @@ public class LocaleConvertUtils {
/**
* <p>Gets applyLocalized.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @return <code>true</code> if pattern is localized,
@@ -78,7 +78,7 @@ public class LocaleConvertUtils {
/**
* <p>Sets applyLocalized.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @param newApplyLocalized <code>true</code> if pattern is localized,
@@ -93,7 +93,7 @@ public class LocaleConvertUtils {
/**
* <p>Convert the specified locale-sensitive value into a String.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @param value The Value to be converted
@@ -107,7 +107,7 @@ public class LocaleConvertUtils {
/**
* <p>Convert the specified locale-sensitive value into a String
* using the conversion pattern.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @param value The Value to be converted
@@ -122,7 +122,7 @@ public class LocaleConvertUtils {
/**
* <p>Convert the specified locale-sensitive value into a String
* using the paticular convertion pattern.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @param value The Value to be converted
@@ -139,7 +139,7 @@ public class LocaleConvertUtils {
/**
* <p>Convert the specified value to an object of the specified class (if
* possible). Otherwise, return a String representation of the value.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @param value The String scalar value to be converted
@@ -156,7 +156,7 @@ public class LocaleConvertUtils {
* <p>Convert the specified value to an object of the specified class (if
* possible) using the convertion pattern. Otherwise, return a String
* representation of the value.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @param value The String scalar value to be converted
@@ -192,7 +192,7 @@ public class LocaleConvertUtils {
/**
* <p>Convert an array of specified values to an array of objects of the
* specified class (if possible) using the convertion pattern.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @param values Value to be converted (may be null)
@@ -209,7 +209,7 @@ public class LocaleConvertUtils {
/**
* <p>Convert an array of specified values to an array of objects of the
* specified class (if possible).</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @param values Value to be converted (may be null)
@@ -243,7 +243,7 @@ public class LocaleConvertUtils {
/**
* <p>Register a custom {@link LocaleConverter} for the specified destination
* <code>Class</code>, replacing any previously registered converter.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @param converter The LocaleConverter to be registered
@@ -259,7 +259,7 @@ public class LocaleConvertUtils {
/**
* <p>Remove any registered {@link LocaleConverter}.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @see LocaleConvertUtilsBean#deregister()
@@ -272,7 +272,7 @@ public class LocaleConvertUtils {
/**
* <p>Remove any registered {@link LocaleConverter} for the specified locale.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @param locale The locale
@@ -286,7 +286,7 @@ public class LocaleConvertUtils {
/**
* <p>Remove any registered {@link LocaleConverter} for the specified locale and Class.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @param clazz Class for which to remove a registered Converter
@@ -302,7 +302,7 @@ public class LocaleConvertUtils {
* <p>Look up and return any registered {@link LocaleConverter} for the specified
* destination class and locale; if there is no registered Converter, return
* <code>null</code>.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @param clazz Class for which to return a registered Converter
@@ -317,7 +317,7 @@ public class LocaleConvertUtils {
/**
* <p>Look up and return any registered FastHashMap instance for the specified locale.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @param locale The Locale
@@ -332,7 +332,7 @@ public class LocaleConvertUtils {
/**
* <p>Create all {@link LocaleConverter} types for specified locale.</p>
- *
+ *
* <p>For more details see <code>LocaleConvertUtilsBean</code></p>
*
* @param locale The Locale
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java Sun Mar 3 11:19:49 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.commons.beanutils.locale;
import org.apache.commons.beanutils.BeanUtils;
@@ -48,9 +48,9 @@ import java.util.Set;
* specified Class, String arrays to arrays of the specified Class and
* object to locale-sensitive String scalar value.</p>
*
- * <p>This class provides the implementations used by the static utility methods in
+ * <p>This class provides the implementations used by the static utility methods in
* {@link LocaleConvertUtils}.</p>
- *
+ *
* <p>The actual {@link LocaleConverter} instance to be used
* can be registered for each possible destination Class. Unless you override them, standard
* {@link LocaleConverter} instances are provided for all of the following
@@ -84,8 +84,8 @@ import java.util.Set;
* @since 1.7
*/
public class LocaleConvertUtilsBean {
-
- /**
+
+ /**
* Gets singleton instance.
* This is the same as the instance used by the default {@link LocaleBeanUtilsBean} singleton.
* @return the singleton instance
@@ -122,9 +122,9 @@ public class LocaleConvertUtilsBean {
deregister();
mapConverters.setFast(true);
}
-
+
// --------------------------------------------------------- Properties
-
+
/**
* getter for defaultLocale.
* @return the default locale
@@ -147,7 +147,7 @@ public class LocaleConvertUtilsBean {
defaultLocale = locale;
}
}
-
+
/**
* getter for applyLocalized
*
@@ -415,11 +415,11 @@ public class LocaleConvertUtilsBean {
public LocaleConverter lookup(Class clazz, Locale locale) {
LocaleConverter converter = (LocaleConverter) lookup(locale).get(clazz);
-
+
if (log.isTraceEnabled()) {
log.trace("LocaleConverter:" + converter);
}
-
+
return converter;
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConverter.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConverter.java Sun Mar 3 11:19:49 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.commons.beanutils.locale;
import org.apache.commons.beanutils.Converter;
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java Sun Mar 3 11:19:49 2013
@@ -23,10 +23,10 @@ import java.text.ParseException;
import org.apache.commons.beanutils.ConversionException;
/**
- * <p>Standard {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * <p>Standard {@link org.apache.commons.beanutils.locale.LocaleConverter}
* implementation that converts an incoming
* locale-sensitive String into a <code>java.math.BigDecimal</code> object,
- * optionally using a default value or throwing a
+ * optionally using a default value or throwing a
* {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs.</p>
*
@@ -38,7 +38,7 @@ public class BigDecimalLocaleConverter e
// ----------------------------------------------------------- Constructors
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine and an unlocalized pattern is used
@@ -51,7 +51,7 @@ public class BigDecimalLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine.
@@ -64,7 +64,7 @@ public class BigDecimalLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs. An unlocalized pattern is used for the convertion.
*
@@ -76,7 +76,7 @@ public class BigDecimalLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs.
*
@@ -89,7 +89,7 @@ public class BigDecimalLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs. An unlocalized pattern is used for the convertion.
*
@@ -102,7 +102,7 @@ public class BigDecimalLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs.
*
@@ -116,7 +116,7 @@ public class BigDecimalLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will return the specified default value
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine and an unlocalized pattern is used
@@ -130,7 +130,7 @@ public class BigDecimalLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will return the specified default value
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine.
@@ -144,7 +144,7 @@ public class BigDecimalLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will return the specified default value
* if a conversion error occurs. An unlocalized pattern is used for the convertion.
*
@@ -157,7 +157,7 @@ public class BigDecimalLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will return the specified default value
* if a conversion error occurs.
*
@@ -171,7 +171,7 @@ public class BigDecimalLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will return the specified default value
* if a conversion error occurs. An unlocalized pattern is used for the convertion.
*
@@ -185,7 +185,7 @@ public class BigDecimalLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will return the specified default value
* if a conversion error occurs.
*
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java?rev=1452028&r1=1452027&r2=1452028&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java Sun Mar 3 11:19:49 2013
@@ -23,10 +23,10 @@ import java.text.ParseException;
import org.apache.commons.beanutils.ConversionException;
/**
- * <p>Standard {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * <p>Standard {@link org.apache.commons.beanutils.locale.LocaleConverter}
* implementation that converts an incoming
* locale-sensitive String into a <code>java.math.BigInteger</code> object,
- * optionally using a default value or throwing a
+ * optionally using a default value or throwing a
* {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs.</p>
*
@@ -39,7 +39,7 @@ public class BigIntegerLocaleConverter e
// ----------------------------------------------------------- Constructors
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine and an unlocalized pattern is used
@@ -52,7 +52,7 @@ public class BigIntegerLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine.
@@ -65,7 +65,7 @@ public class BigIntegerLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs. An unlocalized pattern is used for the convertion.
*
@@ -77,7 +77,7 @@ public class BigIntegerLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs.
*
@@ -90,7 +90,7 @@ public class BigIntegerLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs. An unlocalized pattern is used for the convertion.
*
@@ -103,7 +103,7 @@ public class BigIntegerLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will throw a {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs.
*
@@ -117,7 +117,7 @@ public class BigIntegerLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will return the specified default value
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine and an unlocalized pattern is used
@@ -131,7 +131,7 @@ public class BigIntegerLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will return the specified default value
* if a conversion error occurs. The locale is the default locale for
* this instance of the Java Virtual Machine.
@@ -145,7 +145,7 @@ public class BigIntegerLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will return the specified default value
* if a conversion error occurs. An unlocalized pattern is used for the convertion.
*
@@ -158,7 +158,7 @@ public class BigIntegerLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will return the specified default value
* if a conversion error occurs.
*
@@ -172,7 +172,7 @@ public class BigIntegerLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will return the specified default value
* if a conversion error occurs. An unlocalized pattern is used for the convertion.
*
@@ -186,7 +186,7 @@ public class BigIntegerLocaleConverter e
}
/**
- * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
+ * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
* that will return the specified default value
* if a conversion error occurs.
*
@@ -223,7 +223,7 @@ public class BigIntegerLocaleConverter e
if (result instanceof Number) {
return BigInteger.valueOf(((Number)result).longValue());
- }
+ }
try {
return new BigInteger(result.toString());