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/08 23:30:54 UTC
svn commit: r1454606 [1/3] - 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...
Author: britter
Date: Fri Mar 8 22:30:51 2013
New Revision: 1454606
URL: http://svn.apache.org/r1454606
Log:
[BEANUTILS-438] - Add @Deprecated and @Override Annotations
Modified:
commons/proper/beanutils/trunk/src/changes/changes.xml
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtils.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtilsBean2.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConversionException.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtils.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean2.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertingWrapDynaBean.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaClass.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaList.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaMap.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtils.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WeakFastHashMap.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigDecimalConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigIntegerConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CalendarConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ClassConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateTimeConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DoubleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FileConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FloatConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/IntegerConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/LongArrayConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/LongConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ShortConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/SqlDateConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/SqlTimeConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/SqlTimestampConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/URLConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/SqlDateLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimeLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimestampLocaleConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanComparatorTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanUtils2TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanUtilsBenchCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/ConstructorUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/ConvertUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaPropertyTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaResultSetTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/IndexedPropertyTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/LazyDynaClassTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/LazyDynaListTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/LazyDynaMapTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/MappedPropertyTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/MethodUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/PropertyUtilsBenchCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/PropsFirstPropertyUtilsBean.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestResultSet.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira273TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira298TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira345TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira358TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira359TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira368TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira369TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira411TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira273BeanFactory.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BigIntegerConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CalendarConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/NumberConverterTestBase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/SqlDateConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/URLConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverterTestCase.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/CustomInteger.java
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PrivateBeanSubclass.java
Modified: commons/proper/beanutils/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/changes/changes.xml?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/changes/changes.xml (original)
+++ commons/proper/beanutils/trunk/src/changes/changes.xml Fri Mar 8 22:30:51 2013
@@ -40,6 +40,9 @@ The <action> type attribute can be add,u
<body>
<release version="1.8.4" date="in SVN" description="Bug fix for 1.8.3">
+ <action dev="britter" type="update" issue="BEANUTILS-438" >
+ Add @Deprecated and @Override Annotations
+ </action>
<action dev="britter" type="update" issue="BEANUTILS-437" >
Replace Date and Revision SVN keywords with Id
</action>
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java Fri Mar 8 22:30:51 2013
@@ -75,40 +75,53 @@ public class BeanMap extends AbstractMap
* @see "http://issues.apache.org/jira/browse/BEANUTILS-112"
* @deprecated Use {@link BeanMap#getTypeTransformer(Class)} method
*/
+ @Deprecated
public static HashMap defaultTransformers = new HashMap() {
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean containsKey(Object key) {
return typeTransformers.containsKey(key);
}
+ @Override
public boolean containsValue(Object value) {
return typeTransformers.containsValue(value);
}
+ @Override
public Set entrySet() {
return typeTransformers.entrySet();
}
+ @Override
public Object get(Object key) {
return typeTransformers.get(key);
}
+ @Override
public boolean isEmpty() {
return false;
}
+ @Override
public Set keySet() {
return typeTransformers.keySet();
}
+ @Override
public Object put(Object key, Object value) {
throw new UnsupportedOperationException();
}
+ @Override
public void putAll(Map m) {
throw new UnsupportedOperationException();
}
+ @Override
public Object remove(Object key) {
throw new UnsupportedOperationException();
}
+ @Override
public int size() {
return typeTransformers.size();
}
+ @Override
public Collection values() {
return typeTransformers.values();
}
@@ -212,6 +225,7 @@ public class BeanMap extends AbstractMap
* Renders a string representation of this object.
* @return a <code>String</code> representation of this object
*/
+ @Override
public String toString() {
return "BeanMap<" + String.valueOf(bean) + ">";
}
@@ -243,6 +257,7 @@ public class BeanMap extends AbstractMap
* @throws CloneNotSupportedException if the underlying bean
* cannot be cloned
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
BeanMap newMap = (BeanMap)super.clone();
@@ -322,6 +337,7 @@ public class BeanMap extends AbstractMap
* the mappings are not actually removed from the map (the mappings for a
* BeanMap are fixed).
*/
+ @Override
public void clear() {
if(bean == null) {
return;
@@ -355,6 +371,7 @@ public class BeanMap extends AbstractMap
* false if the bean does not define a property with that name; or
* true if the bean does define a property with that name
*/
+ @Override
public boolean containsKey(Object name) {
Method method = getReadMethod(name);
return method != null;
@@ -368,6 +385,7 @@ public class BeanMap extends AbstractMap
* @return false true if the bean has at least one property whose
* current value is that object, false otherwise
*/
+ @Override
public boolean containsValue(Object value) {
// use default implementation
return super.containsValue(value);
@@ -388,6 +406,7 @@ public class BeanMap extends AbstractMap
* @param name the name of the property whose value to return
* @return the value of the property with that name
*/
+ @Override
public Object get(Object name) {
if ( bean != null ) {
Method method = getReadMethod( name );
@@ -424,6 +443,7 @@ public class BeanMap extends AbstractMap
* that name is read-only
* @throws ClassCastException if an error occurs creating the method args
*/
+ @Override
public Object put(Object name, Object value) throws IllegalArgumentException, ClassCastException {
if ( bean != null ) {
Object oldValue = get( name );
@@ -463,6 +483,7 @@ public class BeanMap extends AbstractMap
*
* @return the number of properties defined by the bean
*/
+ @Override
public int size() {
return readMethods.size();
}
@@ -478,6 +499,7 @@ public class BeanMap extends AbstractMap
* @return BeanMap keys. The Set returned by this method is not
* modifiable.
*/
+ @Override
public Set keySet() {
return UnmodifiableSet.decorate(readMethods.keySet());
}
@@ -489,11 +511,14 @@ public class BeanMap extends AbstractMap
*
* @return the unmodifiable set of mappings
*/
+ @Override
public Set entrySet() {
return UnmodifiableSet.decorate(new AbstractSet() {
+ @Override
public Iterator iterator() {
return entryIterator();
}
+ @Override
public int size() {
return BeanMap.this.readMethods.size();
}
@@ -506,6 +531,7 @@ public class BeanMap extends AbstractMap
* @return values for the BeanMap. The returned collection is not
* modifiable.
*/
+ @Override
public Collection values() {
ArrayList answer = new ArrayList( readMethods.size() );
for ( Iterator iter = valueIterator(); iter.hasNext(); ) {
@@ -741,6 +767,7 @@ public class BeanMap extends AbstractMap
* @param value the new value for the entry
* @return the old value for the entry
*/
+ @Override
public Object setValue(Object value) {
Object key = getKey();
Object oldValue = owner.get( key );
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtils.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtils.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtils.java Fri Mar 8 22:30:51 2013
@@ -52,6 +52,7 @@ public class BeanUtils {
* Use your favorite logging tool to configure logging for
* this class.
*/
+ @Deprecated
private static int debug = 0;
/**
@@ -61,6 +62,7 @@ public class BeanUtils {
* Use your favorite logging tool to configure logging for
* this class.
*/
+ @Deprecated
public static int getDebug() {
return (debug);
}
@@ -72,6 +74,7 @@ public class BeanUtils {
* Use your favorite logging tool to configure logging for
* this class.
*/
+ @Deprecated
public static void setDebug(int newDebug) {
debug = newDebug;
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtilsBean2.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtilsBean2.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtilsBean2.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtilsBean2.java Fri Mar 8 22:30:51 2013
@@ -69,6 +69,7 @@ public class BeanUtilsBean2 extends Bean
* @param type Class of the value to be converted to
* @return The converted value
*/
+ @Override
protected Object convert(Object value, Class type) {
return getConvertUtils().convert(value, type);
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConversionException.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConversionException.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConversionException.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConversionException.java Fri Mar 8 22:30:51 2013
@@ -85,6 +85,7 @@ public class ConversionException extends
* Return the root cause of this conversion exception.
* @return the root cause of this conversion exception
*/
+ @Override
public Throwable getCause() {
return (this.cause);
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtils.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtils.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtils.java Fri Mar 8 22:30:51 2013
@@ -40,6 +40,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Boolean.TYPE and
* Boolean.class instead
*/
+ @Deprecated
public static boolean getDefaultBoolean() {
return (ConvertUtilsBean.getInstance().getDefaultBoolean());
}
@@ -50,6 +51,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Boolean.TYPE and
* Boolean.class instead
*/
+ @Deprecated
public static void setDefaultBoolean(boolean newDefaultBoolean) {
ConvertUtilsBean.getInstance().setDefaultBoolean(newDefaultBoolean);
}
@@ -61,6 +63,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Byte.TYPE and
* Byte.class instead
*/
+ @Deprecated
public static byte getDefaultByte() {
return ConvertUtilsBean.getInstance().getDefaultByte();
}
@@ -71,6 +74,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Byte.TYPE and
* Byte.class instead
*/
+ @Deprecated
public static void setDefaultByte(byte newDefaultByte) {
ConvertUtilsBean.getInstance().setDefaultByte(newDefaultByte);
}
@@ -82,6 +86,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Character.TYPE and
* Character.class instead
*/
+ @Deprecated
public static char getDefaultCharacter() {
return ConvertUtilsBean.getInstance().getDefaultCharacter();
}
@@ -92,6 +97,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Character.TYPE and
* Character.class instead
*/
+ @Deprecated
public static void setDefaultCharacter(char newDefaultCharacter) {
ConvertUtilsBean.getInstance().setDefaultCharacter(newDefaultCharacter);
}
@@ -103,6 +109,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Double.TYPE and
* Double.class instead
*/
+ @Deprecated
public static double getDefaultDouble() {
return ConvertUtilsBean.getInstance().getDefaultDouble();
}
@@ -113,6 +120,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Double.TYPE and
* Double.class instead
*/
+ @Deprecated
public static void setDefaultDouble(double newDefaultDouble) {
ConvertUtilsBean.getInstance().setDefaultDouble(newDefaultDouble);
}
@@ -124,6 +132,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Float.TYPE and
* Float.class instead
*/
+ @Deprecated
public static float getDefaultFloat() {
return ConvertUtilsBean.getInstance().getDefaultFloat();
}
@@ -134,6 +143,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Float.TYPE and
* Float.class instead
*/
+ @Deprecated
public static void setDefaultFloat(float newDefaultFloat) {
ConvertUtilsBean.getInstance().setDefaultFloat(newDefaultFloat);
}
@@ -145,6 +155,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Integer.TYPE and
* Integer.class instead
*/
+ @Deprecated
public static int getDefaultInteger() {
return ConvertUtilsBean.getInstance().getDefaultInteger();
}
@@ -155,6 +166,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Integer.TYPE and
* Integer.class instead
*/
+ @Deprecated
public static void setDefaultInteger(int newDefaultInteger) {
ConvertUtilsBean.getInstance().setDefaultInteger(newDefaultInteger);
}
@@ -166,6 +178,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Long.TYPE and
* Long.class instead
*/
+ @Deprecated
public static long getDefaultLong() {
return (ConvertUtilsBean.getInstance().getDefaultLong());
}
@@ -176,6 +189,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Long.TYPE and
* Long.class instead
*/
+ @Deprecated
public static void setDefaultLong(long newDefaultLong) {
ConvertUtilsBean.getInstance().setDefaultLong(newDefaultLong);
}
@@ -187,6 +201,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Short.TYPE and
* Short.class instead
*/
+ @Deprecated
public static short getDefaultShort() {
return ConvertUtilsBean.getInstance().getDefaultShort();
}
@@ -197,6 +212,7 @@ public class ConvertUtils {
* @deprecated Register replacement converters for Short.TYPE and
* Short.class instead
*/
+ @Deprecated
public static void setDefaultShort(short newDefaultShort) {
ConvertUtilsBean.getInstance().setDefaultShort(newDefaultShort);
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java Fri Mar 8 22:30:51 2013
@@ -168,6 +168,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Boolean.TYPE and
* Boolean.class instead
*/
+ @Deprecated
private Boolean defaultBoolean = Boolean.FALSE;
/**
@@ -176,6 +177,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Boolean.TYPE and
* Boolean.class instead
*/
+ @Deprecated
public boolean getDefaultBoolean() {
return (defaultBoolean.booleanValue());
}
@@ -186,6 +188,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Boolean.TYPE and
* Boolean.class instead
*/
+ @Deprecated
public void setDefaultBoolean(boolean newDefaultBoolean) {
defaultBoolean = (newDefaultBoolean ? Boolean.TRUE : Boolean.FALSE);
register(new BooleanConverter(defaultBoolean), Boolean.TYPE);
@@ -198,6 +201,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Byte.TYPE and
* Byte.class instead
*/
+ @Deprecated
private Byte defaultByte = new Byte((byte) 0);
/**
@@ -206,6 +210,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Byte.TYPE and
* Byte.class instead
*/
+ @Deprecated
public byte getDefaultByte() {
return (defaultByte.byteValue());
}
@@ -216,6 +221,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Byte.TYPE and
* Byte.class instead
*/
+ @Deprecated
public void setDefaultByte(byte newDefaultByte) {
defaultByte = new Byte(newDefaultByte);
register(new ByteConverter(defaultByte), Byte.TYPE);
@@ -228,6 +234,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Character.TYPE and
* Character.class instead
*/
+ @Deprecated
private Character defaultCharacter = new Character(' ');
/**
@@ -236,6 +243,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Character.TYPE and
* Character.class instead
*/
+ @Deprecated
public char getDefaultCharacter() {
return (defaultCharacter.charValue());
}
@@ -246,6 +254,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Character.TYPE and
* Character.class instead
*/
+ @Deprecated
public void setDefaultCharacter(char newDefaultCharacter) {
defaultCharacter = new Character(newDefaultCharacter);
register(new CharacterConverter(defaultCharacter),
@@ -260,6 +269,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Double.TYPE and
* Double.class instead
*/
+ @Deprecated
private Double defaultDouble = new Double(0.0);
/**
@@ -268,6 +278,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Double.TYPE and
* Double.class instead
*/
+ @Deprecated
public double getDefaultDouble() {
return (defaultDouble.doubleValue());
}
@@ -278,6 +289,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Double.TYPE and
* Double.class instead
*/
+ @Deprecated
public void setDefaultDouble(double newDefaultDouble) {
defaultDouble = new Double(newDefaultDouble);
register(new DoubleConverter(defaultDouble), Double.TYPE);
@@ -290,6 +302,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Float.TYPE and
* Float.class instead
*/
+ @Deprecated
private Float defaultFloat = new Float((float) 0.0);
/**
@@ -298,6 +311,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Float.TYPE and
* Float.class instead
*/
+ @Deprecated
public float getDefaultFloat() {
return (defaultFloat.floatValue());
}
@@ -308,6 +322,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Float.TYPE and
* Float.class instead
*/
+ @Deprecated
public void setDefaultFloat(float newDefaultFloat) {
defaultFloat = new Float(newDefaultFloat);
register(new FloatConverter(defaultFloat), Float.TYPE);
@@ -320,6 +335,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Integer.TYPE and
* Integer.class instead
*/
+ @Deprecated
private Integer defaultInteger = new Integer(0);
/**
@@ -328,6 +344,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Integer.TYPE and
* Integer.class instead
*/
+ @Deprecated
public int getDefaultInteger() {
return (defaultInteger.intValue());
}
@@ -338,6 +355,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Integer.TYPE and
* Integer.class instead
*/
+ @Deprecated
public void setDefaultInteger(int newDefaultInteger) {
defaultInteger = new Integer(newDefaultInteger);
register(new IntegerConverter(defaultInteger), Integer.TYPE);
@@ -350,6 +368,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Long.TYPE and
* Long.class instead
*/
+ @Deprecated
private Long defaultLong = new Long(0);
/**
@@ -358,6 +377,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Long.TYPE and
* Long.class instead
*/
+ @Deprecated
public long getDefaultLong() {
return (defaultLong.longValue());
}
@@ -368,6 +388,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Long.TYPE and
* Long.class instead
*/
+ @Deprecated
public void setDefaultLong(long newDefaultLong) {
defaultLong = new Long(newDefaultLong);
register(new LongConverter(defaultLong), Long.TYPE);
@@ -380,6 +401,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Short.TYPE and
* Short.class instead
*/
+ @Deprecated
private static Short defaultShort = new Short((short) 0);
/**
@@ -388,6 +410,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Short.TYPE and
* Short.class instead
*/
+ @Deprecated
public short getDefaultShort() {
return (defaultShort.shortValue());
}
@@ -398,6 +421,7 @@ public class ConvertUtilsBean {
* @deprecated Register replacement converters for Short.TYPE and
* Short.class instead
*/
+ @Deprecated
public void setDefaultShort(short newDefaultShort) {
defaultShort = new Short(newDefaultShort);
register(new ShortConverter(defaultShort), Short.TYPE);
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean2.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean2.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean2.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean2.java Fri Mar 8 22:30:51 2013
@@ -40,6 +40,7 @@ public class ConvertUtilsBean2 extends C
*
* @see ConvertUtilsBean#convert(String[], Class)
*/
+ @Override
public String convert(Object value) {
return (String)convert(value, String.class);
}
@@ -54,6 +55,7 @@ public class ConvertUtilsBean2 extends C
*
* @see ConvertUtilsBean#convert(String[], Class)
*/
+ @Override
public Object convert(String value, Class clazz) {
return convert((Object)value, clazz);
}
@@ -68,6 +70,7 @@ public class ConvertUtilsBean2 extends C
*
* @see ConvertUtilsBean#convert(String[], Class)
*/
+ @Override
public Object convert(String[] value, Class clazz) {
return convert((Object)value, clazz);
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertingWrapDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertingWrapDynaBean.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertingWrapDynaBean.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertingWrapDynaBean.java Fri Mar 8 22:30:51 2013
@@ -60,6 +60,7 @@ public class ConvertingWrapDynaBean exte
* @exception IllegalArgumentException if there are any problems
* copying the property.
*/
+ @Override
public void set(String name, Object value) {
try {
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaClass.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaClass.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaClass.java Fri Mar 8 22:30:51 2013
@@ -313,6 +313,7 @@ public class LazyDynaClass extends Basic
*
* @exception IllegalArgumentException if no property name is specified
*/
+ @Override
public DynaProperty getDynaProperty(String name) {
if (name == null) {
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=1454606&r1=1454605&r2=1454606&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 Fri Mar 8 22:30:51 2013
@@ -266,6 +266,7 @@ public class LazyDynaList extends ArrayL
* @param index The index position to insert the new element.
* @param element The new element to add.
*/
+ @Override
public void add(int index, Object element) {
DynaBean dynaBean = transform(element);
@@ -282,6 +283,7 @@ public class LazyDynaList extends ArrayL
* @param element The new element to add.
* @return true.
*/
+ @Override
public boolean add(Object element) {
DynaBean dynaBean = transform(element);
@@ -296,6 +298,7 @@ public class LazyDynaList extends ArrayL
* @param collection The Collection of new elements.
* @return true if elements were added.
*/
+ @Override
public boolean addAll(Collection collection) {
if (collection == null || collection.size() == 0) {
@@ -325,6 +328,7 @@ public class LazyDynaList extends ArrayL
* @param index The index position to insert the new elements at.
* @return true if elements were added.
*/
+ @Override
public boolean addAll(int index, Collection collection) {
if (collection == null || collection.size() == 0) {
@@ -361,6 +365,7 @@ public class LazyDynaList extends ArrayL
* @param index The index position to insert the new elements at.
* @return The element at the specified position.
*/
+ @Override
public Object get(int index) {
growList(index + 1);
@@ -380,6 +385,7 @@ public class LazyDynaList extends ArrayL
* @param element The new element.
* @return The new element.
*/
+ @Override
public Object set(int index, Object element) {
DynaBean dynaBean = transform(element);
@@ -405,6 +411,7 @@ public class LazyDynaList extends ArrayL
*
* @return An Array of the elements in this List.
*/
+ @Override
public Object[] toArray() {
if (size() == 0 && elementType == null) {
@@ -431,6 +438,7 @@ public class LazyDynaList extends ArrayL
* @param model The model for the type of array to return
* @return An Array of the elements in this List.
*/
+ @Override
public Object[] toArray(Object[] model) {
// Allocate the Array
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaMap.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaMap.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaMap.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaMap.java Fri Mar 8 22:30:51 2013
@@ -156,6 +156,7 @@ public class LazyDynaMap extends LazyDyn
* @return the underlying Map
* @since 1.8.0
*/
+ @Override
public Map getMap() {
return values;
}
@@ -168,6 +169,7 @@ public class LazyDynaMap extends LazyDyn
* @param name Name of the property whose value is to be set
* @param value Value to which this property is to be set
*/
+ @Override
public void set(String name, Object value) {
if (isRestricted() && !values.containsKey(name)) {
@@ -468,6 +470,7 @@ public class LazyDynaMap extends LazyDyn
* otherwise <code>false</code>
* @exception IllegalArgumentException if no property name is specified
*/
+ @Override
protected boolean isDynaProperty(String name) {
if (name == null) {
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtils.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtils.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtils.java Fri Mar 8 22:30:51 2013
@@ -52,6 +52,7 @@ public class PropertyUtils {
* dependant on the {@link org.apache.commons.beanutils.expression.Resolver}
* implementation being used.
*/
+ @Deprecated
public static final char INDEXED_DELIM = '[';
@@ -63,6 +64,7 @@ public class PropertyUtils {
* dependant on the {@link org.apache.commons.beanutils.expression.Resolver}
* implementation being used.
*/
+ @Deprecated
public static final char INDEXED_DELIM2 = ']';
@@ -73,6 +75,7 @@ public class PropertyUtils {
* dependant on the {@link org.apache.commons.beanutils.expression.Resolver}
* implementation being used.
*/
+ @Deprecated
public static final char MAPPED_DELIM = '(';
@@ -83,6 +86,7 @@ public class PropertyUtils {
* dependant on the {@link org.apache.commons.beanutils.expression.Resolver}
* implementation being used.
*/
+ @Deprecated
public static final char MAPPED_DELIM2 = ')';
@@ -93,6 +97,7 @@ public class PropertyUtils {
* dependant on the {@link org.apache.commons.beanutils.expression.Resolver}
* implementation being used.
*/
+ @Deprecated
public static final char NESTED_DELIM = '.';
@@ -109,6 +114,7 @@ public class PropertyUtils {
*
* @deprecated The <code>debug</code> static property is no longer used
*/
+ @Deprecated
private static int debug = 0;
/**
@@ -116,6 +122,7 @@ public class PropertyUtils {
* @return debug property
* @deprecated The <code>debug</code> static property is no longer used
*/
+ @Deprecated
public static int getDebug() {
return (debug);
}
@@ -125,6 +132,7 @@ public class PropertyUtils {
* @param newDebug debug property
* @deprecated The <code>debug</code> static property is no longer used
*/
+ @Deprecated
public static void setDebug(int newDebug) {
debug = newDebug;
}
@@ -335,6 +343,7 @@ public class PropertyUtils {
* @see PropertyUtilsBean#getMappedPropertyDescriptors(Class)
* @deprecated This method should not be exposed
*/
+ @Deprecated
public static FastHashMap getMappedPropertyDescriptors(Class beanClass) {
return PropertyUtilsBean.getInstance().getMappedPropertyDescriptors(beanClass);
@@ -352,6 +361,7 @@ public class PropertyUtils {
* @see PropertyUtilsBean#getMappedPropertyDescriptors(Object)
* @deprecated This method should not be exposed
*/
+ @Deprecated
public static FastHashMap getMappedPropertyDescriptors(Object bean) {
return PropertyUtilsBean.getInstance().getMappedPropertyDescriptors(bean);
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java Fri Mar 8 22:30:51 2013
@@ -668,6 +668,7 @@ public class PropertyUtilsBean {
* @return the mapped property descriptors
* @deprecated This method should not be exposed
*/
+ @Deprecated
public FastHashMap getMappedPropertyDescriptors(Class beanClass) {
if (beanClass == null) {
@@ -689,6 +690,7 @@ public class PropertyUtilsBean {
* @return the mapped property descriptors
* @deprecated This method should not be exposed
*/
+ @Deprecated
public FastHashMap getMappedPropertyDescriptors(Object bean) {
if (bean == null) {
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=1454606&r1=1454605&r2=1454606&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 Fri Mar 8 22:30:51 2013
@@ -235,6 +235,7 @@ public class ResultSetDynaClass extends
* @return The loaded class
* @throws SQLException if the class cannot be loaded
*/
+ @Override
protected Class loadClass(String className) throws SQLException {
try {
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=1454606&r1=1454605&r2=1454606&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 Fri Mar 8 22:30:51 2013
@@ -152,6 +152,7 @@ class WeakFastHashMap extends HashMap {
* @param key the key whose value is to be returned
* @return the value mapped to that key, or null
*/
+ @Override
public Object get(Object key) {
if (fast) {
return (map.get(key));
@@ -167,6 +168,7 @@ class WeakFastHashMap extends HashMap {
*
* @return the current size of the map
*/
+ @Override
public int size() {
if (fast) {
return (map.size());
@@ -182,6 +184,7 @@ class WeakFastHashMap extends HashMap {
*
* @return is the map currently empty
*/
+ @Override
public boolean isEmpty() {
if (fast) {
return (map.isEmpty());
@@ -199,6 +202,7 @@ class WeakFastHashMap extends HashMap {
* @param key the key to be searched for
* @return true if the map contains the key
*/
+ @Override
public boolean containsKey(Object key) {
if (fast) {
return (map.containsKey(key));
@@ -216,6 +220,7 @@ class WeakFastHashMap extends HashMap {
* @param value the value to be searched for
* @return true if the map contains the value
*/
+ @Override
public boolean containsValue(Object value) {
if (fast) {
return (map.containsValue(value));
@@ -241,6 +246,7 @@ class WeakFastHashMap extends HashMap {
* @param value the value to be associated with this key
* @return the value previously mapped to the key, or null
*/
+ @Override
public Object put(Object key, Object value) {
if (fast) {
synchronized (this) {
@@ -262,6 +268,7 @@ class WeakFastHashMap extends HashMap {
*
* @param in the map whose mappings are to be copied
*/
+ @Override
public void putAll(Map in) {
if (fast) {
synchronized (this) {
@@ -283,6 +290,7 @@ class WeakFastHashMap extends HashMap {
* @param key the key whose mapping is to be removed
* @return the value removed, or null
*/
+ @Override
public Object remove(Object key) {
if (fast) {
synchronized (this) {
@@ -301,6 +309,7 @@ class WeakFastHashMap extends HashMap {
/**
* Remove all mappings from this map.
*/
+ @Override
public void clear() {
if (fast) {
synchronized (this) {
@@ -325,6 +334,7 @@ class WeakFastHashMap extends HashMap {
* @param o the object to be compared to this list
* @return true if the two maps are equal
*/
+ @Override
public boolean equals(Object o) {
// Simple tests that require no synchronization
if (o == this) {
@@ -388,6 +398,7 @@ class WeakFastHashMap extends HashMap {
*
* @return suitable integer hash code
*/
+ @Override
public int hashCode() {
if (fast) {
int h = 0;
@@ -414,6 +425,7 @@ class WeakFastHashMap extends HashMap {
*
* @return a clone of this map
*/
+ @Override
public Object clone() {
WeakFastHashMap results = null;
if (fast) {
@@ -435,6 +447,7 @@ class WeakFastHashMap extends HashMap {
* element in the returned collection is a <code>Map.Entry</code>.
* @return the set of map Map entries
*/
+ @Override
public Set entrySet() {
return new EntrySet();
}
@@ -443,6 +456,7 @@ class WeakFastHashMap extends HashMap {
* Return a set view of the keys contained in this map.
* @return the set of the Map's keys
*/
+ @Override
public Set keySet() {
return new KeySet();
}
@@ -451,6 +465,7 @@ class WeakFastHashMap extends HashMap {
* Return a collection view of the values contained in this map.
* @return the set of the Map's values
*/
+ @Override
public Collection values() {
return new Values();
}
@@ -612,6 +627,7 @@ class WeakFastHashMap extends HashMap {
}
+ @Override
public boolean equals(Object o) {
if (o == this) {
return true;
@@ -625,6 +641,7 @@ class WeakFastHashMap extends HashMap {
}
}
+ @Override
public int hashCode() {
if (fast) {
return get(map).hashCode();
@@ -699,10 +716,12 @@ class WeakFastHashMap extends HashMap {
*/
private class KeySet extends CollectionView implements Set {
+ @Override
protected Collection get(Map map) {
return map.keySet();
}
+ @Override
protected Object iteratorNext(Map.Entry entry) {
return entry.getKey();
}
@@ -714,10 +733,12 @@ class WeakFastHashMap extends HashMap {
*/
private class Values extends CollectionView {
+ @Override
protected Collection get(Map map) {
return map.values();
}
+ @Override
protected Object iteratorNext(Map.Entry entry) {
return entry.getValue();
}
@@ -728,10 +749,12 @@ class WeakFastHashMap extends HashMap {
*/
private class EntrySet extends CollectionView implements Set {
+ @Override
protected Collection get(Map map) {
return map.entrySet();
}
+ @Override
protected Object iteratorNext(Map.Entry entry) {
return entry;
}
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=1454606&r1=1454605&r2=1454606&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 Fri Mar 8 22:30:51 2013
@@ -87,6 +87,7 @@ public class WrapDynaClass implements Dy
*
* @deprecated No longer initialized, use getBeanClass() method instead
*/
+ @Deprecated
protected Class beanClass = null;
@@ -123,6 +124,7 @@ public class WrapDynaClass implements Dy
private static final ContextClassLoaderLocal CLASSLOADER_CACHE =
new ContextClassLoaderLocal() {
+ @Override
protected Object initialValue() {
return new WeakHashMap();
}
@@ -171,46 +173,61 @@ public class WrapDynaClass implements Dy
*
* @deprecated The dynaClasses Map will be removed in a subsequent release
*/
+ @Deprecated
protected static HashMap dynaClasses = new HashMap() {
+ @Override
public void clear() {
getDynaClassesMap().clear();
}
+ @Override
public boolean containsKey(Object key) {
return getDynaClassesMap().containsKey(key);
}
+ @Override
public boolean containsValue(Object value) {
return getDynaClassesMap().containsValue(value);
}
+ @Override
public Set entrySet() {
return getDynaClassesMap().entrySet();
}
+ @Override
public boolean equals(Object o) {
return getDynaClassesMap().equals(o);
}
+ @Override
public Object get(Object key) {
return getDynaClassesMap().get(key);
}
+ @Override
public int hashCode() {
return getDynaClassesMap().hashCode();
}
+ @Override
public boolean isEmpty() {
return getDynaClassesMap().isEmpty();
}
+ @Override
public Set keySet() {
return getDynaClassesMap().keySet();
}
+ @Override
public Object put(Object key, Object value) {
return getDynaClassesMap().put(key, value);
}
+ @Override
public void putAll(Map m) {
getDynaClassesMap().putAll(m);
}
+ @Override
public Object remove(Object key) {
return getDynaClassesMap().remove(key);
}
+ @Override
public int size() {
return getDynaClassesMap().size();
}
+ @Override
public Collection values() {
return getDynaClassesMap().values();
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java Fri Mar 8 22:30:51 2013
@@ -48,6 +48,7 @@ import org.apache.commons.beanutils.Conv
* @deprecated Replaced by the new {@link ArrayConverter} implementation
*/
+@Deprecated
public abstract class AbstractArrayConverter implements 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=1454606&r1=1454605&r2=1454606&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 Fri Mar 8 22:30:51 2013
@@ -219,6 +219,7 @@ public class ArrayConverter extends Abst
*
* @return The default type this <code>Converter</code> handles.
*/
+ @Override
protected Class getDefaultType() {
return defaultTypeInstance.getClass();
}
@@ -230,6 +231,7 @@ public class ArrayConverter extends Abst
* @return the converted String value.
* @throws Throwable if an error occurs converting to a String
*/
+ @Override
protected String convertToString(Object value) throws Throwable {
int size = 0;
@@ -276,6 +278,7 @@ public class ArrayConverter extends Abst
* @return The converted value.
* @throws Throwable if an error occurs converting to the specified type
*/
+ @Override
protected Object convertToType(Class type, Object value) throws Throwable {
if (!type.isArray()) {
@@ -317,6 +320,7 @@ public class ArrayConverter extends Abst
* @param value The value to convert
* @return The value unchanged
*/
+ @Override
protected Object convertArray(Object value) {
return value;
}
@@ -363,6 +367,7 @@ public class ArrayConverter extends Abst
* @param type Data type to which this value should be converted.
* @return The default value for the specified type.
*/
+ @Override
protected Object getDefault(Class type) {
if (type.equals(String.class)) {
return null;
@@ -386,6 +391,7 @@ public class ArrayConverter extends Abst
*
* @return A String representation of this array converter
*/
+ @Override
public String toString() {
StringBuffer buffer = new StringBuffer();
buffer.append(toString(getClass()));
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigDecimalConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigDecimalConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigDecimalConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigDecimalConverter.java Fri Mar 8 22:30:51 2013
@@ -61,6 +61,7 @@ public final class BigDecimalConverter e
* @return The default type this <code>Converter</code> handles.
* @since 1.8.0
*/
+ @Override
protected Class getDefaultType() {
return BigDecimal.class;
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigIntegerConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigIntegerConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigIntegerConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigIntegerConverter.java Fri Mar 8 22:30:51 2013
@@ -61,6 +61,7 @@ public final class BigIntegerConverter e
* @return The default type this <code>Converter</code> handles.
* @since 1.8.0
*/
+ @Override
protected Class getDefaultType() {
return BigInteger.class;
}
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=1454606&r1=1454605&r2=1454606&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 Fri Mar 8 22:30:51 2013
@@ -39,6 +39,7 @@ import org.apache.commons.beanutils.Conv
* @deprecated Replaced by the new {@link ArrayConverter} implementation
*/
+@Deprecated
public final class BooleanArrayConverter extends AbstractArrayConverter {
@@ -178,6 +179,7 @@ public final class BooleanArrayConverter
* @exception NullPointerException if value is an array, and any of the
* array elements are null.
*/
+ @Override
public Object convert(Class type, Object value) {
// Deal with a null value
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=1454606&r1=1454605&r2=1454606&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 Fri Mar 8 22:30:51 2013
@@ -153,6 +153,7 @@ public final class BooleanConverter exte
* want a null to be returned as the default.
* @deprecated Use constructors without default value.
*/
+ @Deprecated
public static final Object NO_DEFAULT = new Object();
@@ -176,6 +177,7 @@ public final class BooleanConverter exte
* @return The default type this <code>Converter</code> handles.
* @since 1.8.0
*/
+ @Override
protected Class getDefaultType() {
return Boolean.class;
}
@@ -199,6 +201,7 @@ public final class BooleanConverter exte
* @throws Throwable if an error occurs converting to the specified type
* @since 1.8.0
*/
+ @Override
protected Object convertToType(Class type, Object value) throws Throwable {
// All the values in the trueStrings and falseStrings arrays are
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java Fri Mar 8 22:30:51 2013
@@ -34,6 +34,7 @@ import org.apache.commons.beanutils.Conv
* @deprecated Replaced by the new {@link ArrayConverter} implementation
*/
+@Deprecated
public final class ByteArrayConverter extends AbstractArrayConverter {
@@ -88,6 +89,7 @@ public final class ByteArrayConverter ex
* @exception ConversionException if conversion cannot be performed
* successfully
*/
+ @Override
public Object convert(Class type, Object value) {
// Deal with a null value
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteConverter.java Fri Mar 8 22:30:51 2013
@@ -59,6 +59,7 @@ public final class ByteConverter extends
* @return The default type this <code>Converter</code> handles.
* @since 1.8.0
*/
+ @Override
protected Class getDefaultType() {
return Byte.class;
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CalendarConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CalendarConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CalendarConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CalendarConverter.java Fri Mar 8 22:30:51 2013
@@ -60,6 +60,7 @@ public final class CalendarConverter ext
*
* @return The default type this <code>Converter</code> handles.
*/
+ @Override
protected Class getDefaultType() {
return Calendar.class;
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java Fri Mar 8 22:30:51 2013
@@ -34,6 +34,7 @@ import org.apache.commons.beanutils.Conv
* @deprecated Replaced by the new {@link ArrayConverter} implementation
*/
+@Deprecated
public final class CharacterArrayConverter extends AbstractArrayConverter {
@@ -89,6 +90,7 @@ public final class CharacterArrayConvert
* @exception ConversionException if conversion cannot be performed
* successfully
*/
+ @Override
public Object convert(Class type, Object value) {
// Deal with a null value
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterConverter.java Fri Mar 8 22:30:51 2013
@@ -54,6 +54,7 @@ public final class CharacterConverter ex
* @return The default type this <code>Converter</code> handles.
* @since 1.8.0
*/
+ @Override
protected Class getDefaultType() {
return Character.class;
}
@@ -65,6 +66,7 @@ public final class CharacterConverter ex
* @return the converted String value.
* @since 1.8.0
*/
+ @Override
protected String convertToString(Object value) {
String strValue = value.toString();
return strValue.length() == 0 ? "" : strValue.substring(0, 1);
@@ -79,6 +81,7 @@ public final class CharacterConverter ex
* @throws Exception if conversion cannot be performed successfully
* @since 1.8.0
*/
+ @Override
protected Object convertToType(Class type, Object value) throws Exception {
return new Character(value.toString().charAt(0));
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ClassConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ClassConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ClassConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ClassConverter.java Fri Mar 8 22:30:51 2013
@@ -58,6 +58,7 @@ public final class ClassConverter extend
* @return The default type this <code>Converter</code> handles.
* @since 1.8.0
*/
+ @Override
protected Class getDefaultType() {
return Class.class;
}
@@ -69,6 +70,7 @@ public final class ClassConverter extend
* @return the converted String value.
* @since 1.8.0
*/
+ @Override
protected String convertToString(Object value) {
return (value instanceof Class) ? ((Class)value).getName() : value.toString();
}
@@ -82,6 +84,7 @@ public final class ClassConverter extend
* @throws Throwable if an error occurs converting to the specified type
* @since 1.8.0
*/
+ @Override
protected Object convertToType(Class type, Object value) throws Throwable {
ClassLoader classLoader =
Thread.currentThread().getContextClassLoader();
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateConverter.java Fri Mar 8 22:30:51 2013
@@ -60,6 +60,7 @@ public final class DateConverter extends
*
* @return The default type this <code>Converter</code> handles.
*/
+ @Override
protected Class getDefaultType() {
return Date.class;
}
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=1454606&r1=1454605&r2=1454606&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 Fri Mar 8 22:30:51 2013
@@ -219,6 +219,7 @@ public abstract class DateTimeConverter
* @return the converted String value.
* @throws Throwable if an error occurs converting to a String
*/
+ @Override
protected String convertToString(Object value) throws Throwable {
Date date = null;
@@ -281,6 +282,7 @@ public abstract class DateTimeConverter
* @return The converted value.
* @throws Exception if conversion cannot be performed successfully
*/
+ @Override
protected Object convertToType(Class targetType, Object value) throws Exception {
Class sourceType = value.getClass();
@@ -569,6 +571,7 @@ public abstract class DateTimeConverter
*
* @return A String representation of this date/time converter
*/
+ @Override
public String toString() {
StringBuffer buffer = new StringBuffer();
buffer.append(toString(getClass()));
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java Fri Mar 8 22:30:51 2013
@@ -34,6 +34,7 @@ import org.apache.commons.beanutils.Conv
* @deprecated Replaced by the new {@link ArrayConverter} implementation
*/
+@Deprecated
public final class DoubleArrayConverter extends AbstractArrayConverter {
@@ -88,6 +89,7 @@ public final class DoubleArrayConverter
* @exception ConversionException if conversion cannot be performed
* successfully
*/
+ @Override
public Object convert(Class type, Object value) {
// Deal with a null value
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DoubleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DoubleConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DoubleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DoubleConverter.java Fri Mar 8 22:30:51 2013
@@ -59,6 +59,7 @@ public final class DoubleConverter exten
* @return The default type this <code>Converter</code> handles.
* @since 1.8.0
*/
+ @Override
protected Class getDefaultType() {
return Double.class;
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FileConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FileConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FileConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FileConverter.java Fri Mar 8 22:30:51 2013
@@ -56,6 +56,7 @@ public final class FileConverter extends
* @return The default type this <code>Converter</code> handles.
* @since 1.8.0
*/
+ @Override
protected Class getDefaultType() {
return File.class;
}
@@ -69,6 +70,7 @@ public final class FileConverter extends
* @throws Throwable if an error occurs converting to the specified type
* @since 1.8.0
*/
+ @Override
protected Object convertToType(Class type, Object value) throws Throwable {
return new File(value.toString());
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java Fri Mar 8 22:30:51 2013
@@ -34,6 +34,7 @@ import org.apache.commons.beanutils.Conv
* @deprecated Replaced by the new {@link ArrayConverter} implementation
*/
+@Deprecated
public final class FloatArrayConverter extends AbstractArrayConverter {
@@ -89,6 +90,7 @@ public final class FloatArrayConverter e
* @exception ConversionException if conversion cannot be performed
* successfully
*/
+ @Override
public Object convert(Class type, Object value) {
// Deal with a null value
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FloatConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FloatConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FloatConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FloatConverter.java Fri Mar 8 22:30:51 2013
@@ -59,6 +59,7 @@ public final class FloatConverter extend
* @return The default type this <code>Converter</code> handles.
* @since 1.8.0
*/
+ @Override
protected Class getDefaultType() {
return Float.class;
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java Fri Mar 8 22:30:51 2013
@@ -34,6 +34,7 @@ import org.apache.commons.beanutils.Conv
* @deprecated Replaced by the new {@link ArrayConverter} implementation
*/
+@Deprecated
public final class IntegerArrayConverter extends AbstractArrayConverter {
@@ -89,6 +90,7 @@ public final class IntegerArrayConverter
* @exception ConversionException if conversion cannot be performed
* successfully
*/
+ @Override
public Object convert(Class type, Object value) {
// Deal with a null value
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/IntegerConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/IntegerConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/IntegerConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/IntegerConverter.java Fri Mar 8 22:30:51 2013
@@ -59,6 +59,7 @@ public final class IntegerConverter exte
* @return The default type this <code>Converter</code> handles.
* @since 1.8.0
*/
+ @Override
protected Class getDefaultType() {
return Integer.class;
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/LongArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/LongArrayConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/LongArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/LongArrayConverter.java Fri Mar 8 22:30:51 2013
@@ -34,6 +34,7 @@ import org.apache.commons.beanutils.Conv
* @deprecated Replaced by the new {@link ArrayConverter} implementation
*/
+@Deprecated
public final class LongArrayConverter extends AbstractArrayConverter {
@@ -89,6 +90,7 @@ public final class LongArrayConverter ex
* @exception ConversionException if conversion cannot be performed
* successfully
*/
+ @Override
public Object convert(Class type, Object value) {
// Deal with a null value
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/LongConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/LongConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/LongConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/LongConverter.java Fri Mar 8 22:30:51 2013
@@ -59,6 +59,7 @@ public final class LongConverter extends
* @return The default type this <code>Converter</code> handles.
* @since 1.8.0
*/
+ @Override
protected Class getDefaultType() {
return Long.class;
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java?rev=1454606&r1=1454605&r2=1454606&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java Fri Mar 8 22:30:51 2013
@@ -197,6 +197,7 @@ public abstract class NumberConverter ex
* @return the converted String value.
* @throws Throwable if an error occurs converting to a String
*/
+ @Override
protected String convertToString(Object value) throws Throwable {
String result = null;
@@ -227,6 +228,7 @@ public abstract class NumberConverter ex
* @return The converted value.
* @throws Throwable if an error occurs converting to the specified type
*/
+ @Override
protected Object convertToType(Class targetType, Object value) throws Throwable {
Class sourceType = value.getClass();
@@ -466,6 +468,7 @@ public abstract class NumberConverter ex
*
* @return A String representation of this number converter
*/
+ @Override
public String toString() {
StringBuffer buffer = new StringBuffer();
buffer.append(toString(getClass()));