Author: bayard
Date: Fri Jul 13 23:11:19 2007
New Revision: 556229
URL: http://svn.apache.org/viewvc?view=rev&rev=556229
Log:
Fixing to the common idiom of 'String[]' and not 'String var[]'
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BasicDynaClass.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtils.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtilsBean.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/JDBCDynaClass.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/MethodUtils.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/PropertyUtilsBean.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ResultSetDynaClass.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/WrapDynaClass.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/LongArrayConverter.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/StringArrayConverter.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/TestBean.java
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BasicDynaClass.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BasicDynaClass.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BasicDynaClass.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BasicDynaClass.java
Fri Jul 13 23:11:19 2007
@@ -74,7 +74,7 @@
* @param properties Property descriptors for the supported properties
*/
public BasicDynaClass(String name, Class dynaBeanClass,
- DynaProperty properties[]) {
+ DynaProperty[] properties) {
super();
if (name != null) {
@@ -105,14 +105,14 @@
* The method signature of the constructor we will use to create
* new DynaBean instances.
*/
- protected static Class constructorTypes[] = { DynaClass.class };
+ protected static Class[] constructorTypes = { DynaClass.class };
/**
* The argument values to be passed to the constructore we will use
* to create new DynaBean instances.
*/
- protected Object constructorValues[] = { this };
+ protected Object[] constructorValues = { this };
/**
@@ -131,7 +131,7 @@
/**
* The set of dynamic properties that are part of this DynaClass.
*/
- protected DynaProperty properties[] = new DynaProperty[0];
+ protected DynaProperty[] properties = new DynaProperty[0];
/**
@@ -290,7 +290,7 @@
*
* @param properties List of dynamic properties to be supported
*/
- protected void setProperties(DynaProperty properties[]) {
+ protected void setProperties(DynaProperty[] properties) {
this.properties = properties;
propertiesMap.clear();
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
Fri Jul 13 23:11:19 2007
@@ -249,7 +249,7 @@
// Copy the properties, converting as necessary
if (orig instanceof DynaBean) {
- DynaProperty origDescriptors[] =
+ DynaProperty[] origDescriptors =
((DynaBean) orig).getDynaClass().getDynaProperties();
for (int i = 0; i < origDescriptors.length; i++) {
String name = origDescriptors[i].getName();
@@ -271,7 +271,7 @@
}
}
} else /* if (orig is a standard JavaBean) */ {
- PropertyDescriptor origDescriptors[] =
+ PropertyDescriptor[] origDescriptors =
getPropertyUtils().getPropertyDescriptors(orig);
for (int i = 0; i < origDescriptors.length; i++) {
String name = origDescriptors[i].getName();
@@ -340,7 +340,7 @@
} else if (value instanceof String) {
sb.append((String) value);
} else if (value instanceof String[]) {
- String values[] = (String[]) value;
+ String[] values = (String[]) value;
sb.append('[');
for (int i = 0; i < values.length; i++) {
if (i > 0) {
@@ -498,14 +498,14 @@
Map description = new HashMap();
if (bean instanceof DynaBean) {
- DynaProperty descriptors[] =
+ DynaProperty[] descriptors =
((DynaBean) bean).getDynaClass().getDynaProperties();
for (int i = 0; i < descriptors.length; i++) {
String name = descriptors[i].getName();
description.put(name, getProperty(bean, name));
}
} else {
- PropertyDescriptor descriptors[] =
+ PropertyDescriptor[] descriptors =
getPropertyUtils().getPropertyDescriptors(bean);
for (int i = 0; i < descriptors.length; i++) {
String name = descriptors[i].getName();
@@ -556,7 +556,7 @@
return ((String[]) values.toArray(new String[values.size()]));
} else if (value.getClass().isArray()) {
int n = Array.getLength(value);
- String results[] = new String[n];
+ String[] results = new String[n];
for (int i = 0; i < n; i++) {
Object item = Array.get(value, i);
if (item == null) {
@@ -568,7 +568,7 @@
}
return (results);
} else {
- String results[] = new String[1];
+ String[] results = new String[1];
results[0] = getConvertUtils().convert(value);
return (results);
}
@@ -878,7 +878,7 @@
} else if (value instanceof String) {
sb.append((String) value);
} else if (value instanceof String[]) {
- String values[] = (String[]) value;
+ String[] values = (String[]) value;
sb.append('[');
for (int i = 0; i < values.length; i++) {
if (i > 0) {
@@ -976,7 +976,7 @@
Object newValue = null;
if (type.isArray() && (index < 0)) { // Scalar value into array
if (value == null) {
- String values[] = new String[1];
+ String[] values = new String[1];
values[0] = (String) value;
newValue = getConvertUtils().convert((String[]) values, type);
} else if (value instanceof String) {
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtils.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtils.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtils.java
Fri Jul 13 23:11:19 2007
@@ -255,7 +255,7 @@
*
* @see ConvertUtilsBean#convert(String[], Class)
*/
- public static Object convert(String values[], Class clazz) {
+ public static Object convert(String[] values, Class clazz) {
return ConvertUtilsBean.getInstance().convert(values, clazz);
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtilsBean.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtilsBean.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtilsBean.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtilsBean.java
Fri Jul 13 23:11:19 2007
@@ -484,7 +484,7 @@
*
* @exception ConversionException if thrown by an underlying Converter
*/
- public Object convert(String values[], Class clazz) {
+ public Object convert(String[] values, Class clazz) {
Class type = clazz;
if (clazz.isArray()) {
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/JDBCDynaClass.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/JDBCDynaClass.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/JDBCDynaClass.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/JDBCDynaClass.java
Fri Jul 13 23:11:19 2007
@@ -47,7 +47,7 @@
* <p>The set of dynamic properties that are part of this
* [EMAIL PROTECTED] DynaClass}.</p>
*/
- protected DynaProperty properties[] = null;
+ protected DynaProperty[] properties = null;
/**
* <p>The set of dynamic properties that are part of this
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java
Fri Jul 13 23:11:19 2007
@@ -106,7 +106,7 @@
mappedReadMethod = getMethod(beanClass, "is" + base,
STRING_CLASS_PARAMETER);
}
- Class params[] = { String.class, mappedReadMethod.getReturnType()
};
+ Class[] params = { String.class, mappedReadMethod.getReturnType()
};
mappedWriteMethod = getMethod(beanClass, "set" + base, params);
} catch (IntrospectionException e) {
/* Swallow IntrospectionException
@@ -163,7 +163,7 @@
getMethod(beanClass, mappedGetterName, STRING_CLASS_PARAMETER);
if (mappedReadMethod != null) {
- Class params[] = { String.class, mappedReadMethod.getReturnType()
};
+ Class[] params = { String.class, mappedReadMethod.getReturnType()
};
mappedWriteMethod =
getMethod(beanClass, mappedSetterName, params);
} else {
@@ -290,7 +290,7 @@
}
if (mappedWriteMethod != null) {
- Class params[] = mappedWriteMethod.getParameterTypes();
+ Class[] params = mappedWriteMethod.getParameterTypes();
if (params.length != 2) {
throw new IntrospectionException
("bad mapped write method arg count");
@@ -318,7 +318,7 @@
return s;
}
- char chars[] = s.toCharArray();
+ char[] chars = s.toCharArray();
chars[0] = Character.toUpperCase(chars[0]);
return new String(chars);
}
@@ -331,7 +331,7 @@
// For overridden methods we need to find the most derived version.
// So we start with the given class and walk up the superclass chain.
for (Class clazz = initial; clazz != null; clazz =
clazz.getSuperclass()) {
- Method methods[] = clazz.getDeclaredMethods();
+ Method[] methods = clazz.getDeclaredMethods();
for (int i = 0; i < methods.length; i++) {
Method method = methods[i];
if (method == null) {
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/MethodUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/MethodUtils.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/MethodUtils.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/MethodUtils.java
Fri Jul 13 23:11:19 2007
@@ -180,7 +180,7 @@
args = EMPTY_OBJECT_ARRAY;
}
int arguments = args.length;
- Class parameterTypes [] = new Class[arguments];
+ Class[] parameterTypes = new Class[arguments];
for (int i = 0; i < arguments; i++) {
parameterTypes[i] = args[i].getClass();
}
@@ -308,7 +308,7 @@
args = EMPTY_OBJECT_ARRAY;
}
int arguments = args.length;
- Class parameterTypes [] = new Class[arguments];
+ Class[] parameterTypes = new Class[arguments];
for (int i = 0; i < arguments; i++) {
parameterTypes[i] = args[i].getClass();
}
@@ -497,7 +497,7 @@
args = EMPTY_OBJECT_ARRAY;
}
int arguments = args.length;
- Class parameterTypes [] = new Class[arguments];
+ Class[] parameterTypes = new Class[arguments];
for (int i = 0; i < arguments; i++) {
parameterTypes[i] = args[i].getClass();
}
@@ -625,7 +625,7 @@
args = EMPTY_OBJECT_ARRAY;
}
int arguments = args.length;
- Class parameterTypes [] = new Class[arguments];
+ Class[] parameterTypes = new Class[arguments];
for (int i = 0; i < arguments; i++) {
parameterTypes[i] = args[i].getClass();
}
@@ -752,7 +752,7 @@
* @param parameterTypes The parameter type signatures
*/
private static Method getAccessibleMethodFromSuperclass
- (Class clazz, String methodName, Class parameterTypes[]) {
+ (Class clazz, String methodName, Class[] parameterTypes) {
Class parentClazz = clazz.getSuperclass();
while (parentClazz != null) {
@@ -783,7 +783,7 @@
* @param parameterTypes The parameter type signatures
*/
private static Method getAccessibleMethodFromInterfaceNest
- (Class clazz, String methodName, Class parameterTypes[]) {
+ (Class clazz, String methodName, Class[] parameterTypes) {
Method method = null;
@@ -791,7 +791,7 @@
for (; clazz != null; clazz = clazz.getSuperclass()) {
// Check the implemented interfaces of the parent class
- Class interfaces[] = clazz.getInterfaces();
+ Class[] interfaces = clazz.getInterfaces();
for (int i = 0; i < interfaces.length; i++) {
// Is this interface public?
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/PropertyUtilsBean.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/PropertyUtilsBean.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/PropertyUtilsBean.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/PropertyUtilsBean.java
Fri Jul 13 23:11:19 2007
@@ -236,7 +236,7 @@
}
if (orig instanceof DynaBean) {
- DynaProperty origDescriptors[] =
+ DynaProperty[] origDescriptors =
((DynaBean) orig).getDynaClass().getDynaProperties();
for (int i = 0; i < origDescriptors.length; i++) {
String name = origDescriptors[i].getName();
@@ -266,7 +266,7 @@
}
}
} else /* if (orig is a standard JavaBean) */ {
- PropertyDescriptor origDescriptors[] =
+ PropertyDescriptor[] origDescriptors =
getPropertyDescriptors(orig);
for (int i = 0; i < origDescriptors.length; i++) {
String name = origDescriptors[i].getName();
@@ -317,14 +317,14 @@
}
Map description = new HashMap();
if (bean instanceof DynaBean) {
- DynaProperty descriptors[] =
+ DynaProperty[] descriptors =
((DynaBean) bean).getDynaClass().getDynaProperties();
for (int i = 0; i < descriptors.length; i++) {
String name = descriptors[i].getName();
description.put(name, getProperty(bean, name));
}
} else {
- PropertyDescriptor descriptors[] =
+ PropertyDescriptor[] descriptors =
getPropertyDescriptors(bean);
for (int i = 0; i < descriptors.length; i++) {
String name = descriptors[i].getName();
@@ -463,7 +463,7 @@
Method readMethod = ((IndexedPropertyDescriptor) descriptor).
getIndexedReadMethod();
if (readMethod != null) {
- Object subscript[] = new Object[1];
+ Object[] subscript = new Object[1];
subscript[0] = new Integer(index);
try {
return (invokeMethod(readMethod,bean, subscript));
@@ -616,7 +616,7 @@
Method readMethod = ((MappedPropertyDescriptor) descriptor).
getMappedReadMethod();
if (readMethod != null) {
- Object keyArray[] = new Object[1];
+ Object[] keyArray = new Object[1];
keyArray[0] = key;
result = invokeMethod(readMethod, bean, keyArray);
} else {
@@ -894,7 +894,7 @@
return (null);
}
- PropertyDescriptor descriptors[] = getPropertyDescriptors(bean);
+ PropertyDescriptor[] descriptors = getPropertyDescriptors(bean);
if (descriptors != null) {
for (int i = 0; i < descriptors.length; i++) {
@@ -952,7 +952,7 @@
}
// Look up any cached descriptors for this bean class
- PropertyDescriptor descriptors[] = null;
+ PropertyDescriptor[] descriptors = null;
descriptors =
(PropertyDescriptor[]) descriptorsCache.get(beanClass);
if (descriptors != null) {
@@ -1564,7 +1564,7 @@
Method writeMethod = ((IndexedPropertyDescriptor) descriptor).
getIndexedWriteMethod();
if (writeMethod != null) {
- Object subscript[] = new Object[2];
+ Object[] subscript = new Object[2];
subscript[0] = new Integer(index);
subscript[1] = value;
try {
@@ -1731,7 +1731,7 @@
((MappedPropertyDescriptor) descriptor).
getMappedWriteMethod();
if (mappedWriteMethod != null) {
- Object params[] = new Object[2];
+ Object[] params = new Object[2];
params[0] = key;
params[1] = value;
if (log.isTraceEnabled()) {
@@ -2024,7 +2024,7 @@
}
// Call the property setter method
- Object values[] = new Object[1];
+ Object[] values = new Object[1];
values[0] = value;
if (log.isTraceEnabled()) {
String valueClassName =
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ResultSetDynaClass.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ResultSetDynaClass.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ResultSetDynaClass.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ResultSetDynaClass.java
Fri Jul 13 23:11:19 2007
@@ -64,7 +64,7 @@
* <pre>
* ArrayList results = new ArrayList(); // To hold copied list
* ResultSetDynaClass rsdc = ...;
- * DynaProperty properties[] = rsdc.getDynaProperties();
+ * DynaProperty[] properties = rsdc.getDynaProperties();
* BasicDynaClass bdc =
* new BasicDynaClass("foo", BasicDynaBean.class,
* rsdc.getDynaProperties());
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/WrapDynaClass.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/WrapDynaClass.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/WrapDynaClass.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/WrapDynaClass.java
Fri Jul 13 23:11:19 2007
@@ -80,7 +80,7 @@
/**
* The set of PropertyDescriptors for this bean class.
*/
- protected PropertyDescriptor descriptors[] = null;
+ protected PropertyDescriptor[] descriptors = null;
/**
@@ -94,7 +94,7 @@
/**
* The set of dynamic properties that are part of this DynaClass.
*/
- protected DynaProperty properties[] = null;
+ protected DynaProperty[] properties = null;
/**
@@ -353,7 +353,7 @@
protected void introspect() {
// Look up the property descriptors for this bean class
- PropertyDescriptor regulars[] =
+ PropertyDescriptor[] regulars =
PropertyUtils.getPropertyDescriptors(beanClass);
if (regulars == null) {
regulars = new PropertyDescriptor[0];
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java
Fri Jul 13 23:11:19 2007
@@ -200,8 +200,8 @@
// this requires casting to Object[], then using values[i].toString()
if (strings.getClass() == value.getClass()) {
try {
- String values[] = (String[]) value;
- boolean results[] = new boolean[values.length];
+ String[] values = (String[]) value;
+ boolean[] results = new boolean[values.length];
for (int i = 0; i < values.length; i++) {
String stringValue = values[i];
Object result = booleanConverter.convert(Boolean.class,
stringValue);
@@ -223,7 +223,7 @@
// for more information.
try {
List list = parseElements(value.toString());
- boolean results[] = new boolean[list.size()];
+ boolean[] results = new boolean[list.size()];
for (int i = 0; i < results.length; i++) {
String stringValue = (String) list.get(i);
Object result = booleanConverter.convert(Boolean.class,
stringValue);
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java
Fri Jul 13 23:11:19 2007
@@ -73,7 +73,7 @@
/**
* <p>Model object for type comparisons.</p>
*/
- private static final byte MODEL[] = new byte[0];
+ private static final byte[] MODEL = new byte[0];
// --------------------------------------------------------- Public Methods
@@ -108,8 +108,8 @@
// Deal with input value as a String array
if (strings.getClass() == value.getClass()) {
try {
- String values[] = (String[]) value;
- byte results[] = new byte[values.length];
+ String[] values = (String[]) value;
+ byte[] results = new byte[values.length];
for (int i = 0; i < values.length; i++) {
results[i] = Byte.parseByte(values[i]);
}
@@ -127,7 +127,7 @@
// and convert to the appropriate type
try {
List list = parseElements(value.toString());
- byte results[] = new byte[list.size()];
+ byte[] results = new byte[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = Byte.parseByte((String) list.get(i));
}
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java
Fri Jul 13 23:11:19 2007
@@ -73,7 +73,7 @@
/**
* <p>Model object for type comparisons.</p>
*/
- private static final char MODEL[] = new char[0];
+ private static final char[] MODEL = new char[0];
// --------------------------------------------------------- Public Methods
@@ -109,8 +109,8 @@
// Deal with input value as a String array
if (strings.getClass() == value.getClass()) {
try {
- String values[] = (String[]) value;
- char results[] = new char[values.length];
+ String[] values = (String[]) value;
+ char[] results = new char[values.length];
for (int i = 0; i < values.length; i++) {
results[i] = values[i].charAt(0);
}
@@ -128,7 +128,7 @@
// and convert to the appropriate type
try {
List list = parseElements(value.toString());
- char results[] = new char[list.size()];
+ char[] results = new char[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = ((String) list.get(i)).charAt(0);
}
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java
Fri Jul 13 23:11:19 2007
@@ -73,7 +73,7 @@
/**
* <p>Model object for type comparisons.</p>
*/
- private static final double MODEL[] = new double[0];
+ private static final double[] MODEL = new double[0];
// --------------------------------------------------------- Public Methods
@@ -108,8 +108,8 @@
// Deal with input value as a String array
if (strings.getClass() == value.getClass()) {
try {
- String values[] = (String[]) value;
- double results[] = new double[values.length];
+ String[] values = (String[]) value;
+ double[] results = new double[values.length];
for (int i = 0; i < values.length; i++) {
results[i] = Double.parseDouble(values[i]);
}
@@ -127,7 +127,7 @@
// and convert to the appropriate type
try {
List list = parseElements(value.toString());
- double results[] = new double[list.size()];
+ double[] results = new double[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = Double.parseDouble((String) list.get(i));
}
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java
Fri Jul 13 23:11:19 2007
@@ -73,7 +73,7 @@
/**
* <p>Model object for type comparisons.</p>
*/
- private static final float MODEL[] = new float[0];
+ private static final float[] MODEL = new float[0];
// --------------------------------------------------------- Public Methods
@@ -109,8 +109,8 @@
// Deal with input value as a String array
if (strings.getClass() == value.getClass()) {
try {
- String values[] = (String[]) value;
- float results[] = new float[values.length];
+ String[] values = (String[]) value;
+ float[] results = new float[values.length];
for (int i = 0; i < values.length; i++) {
results[i] = Float.parseFloat(values[i]);
}
@@ -128,7 +128,7 @@
// and convert to the appropriate type
try {
List list = parseElements(value.toString());
- float results[] = new float[list.size()];
+ float[] results = new float[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = Float.parseFloat((String) list.get(i));
}
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java
Fri Jul 13 23:11:19 2007
@@ -73,7 +73,7 @@
/**
* <p>Model object for type comparisons.</p>
*/
- private static final int MODEL[] = new int[0];
+ private static final int[] MODEL = new int[0];
// --------------------------------------------------------- Public Methods
@@ -109,8 +109,8 @@
// Deal with input value as a String array
if (strings.getClass() == value.getClass()) {
try {
- String values[] = (String[]) value;
- int results[] = new int[values.length];
+ String[] values = (String[]) value;
+ int[] results = new int[values.length];
for (int i = 0; i < values.length; i++) {
results[i] = Integer.parseInt(values[i]);
}
@@ -128,7 +128,7 @@
// and convert to the appropriate type
try {
List list = parseElements(value.toString());
- int results[] = new int[list.size()];
+ int[] results = new int[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = Integer.parseInt((String) list.get(i));
}
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/LongArrayConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/LongArrayConverter.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/LongArrayConverter.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/LongArrayConverter.java
Fri Jul 13 23:11:19 2007
@@ -73,7 +73,7 @@
/**
* <p>Model object for type comparisons.</p>
*/
- private static final long MODEL[] = new long[0];
+ private static final long[] MODEL = new long[0];
// --------------------------------------------------------- Public Methods
@@ -109,8 +109,8 @@
// Deal with input value as a String array
if (strings.getClass() == value.getClass()) {
try {
- String values[] = (String[]) value;
- long results[] = new long[values.length];
+ String[] values = (String[]) value;
+ long[] results = new long[values.length];
for (int i = 0; i < values.length; i++) {
results[i] = Long.parseLong(values[i]);
}
@@ -128,7 +128,7 @@
// and convert to the appropriate type
try {
List list = parseElements(value.toString());
- long results[] = new long[list.size()];
+ long[] results = new long[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = Long.parseLong((String) list.get(i));
}
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java
Fri Jul 13 23:11:19 2007
@@ -73,7 +73,7 @@
/**
* <p>Model object for type comparisons.</p>
*/
- private static final short MODEL[] = new short[0];
+ private static final short[] MODEL = new short[0];
// --------------------------------------------------------- Public Methods
@@ -109,8 +109,8 @@
// Deal with input value as a String array
if (strings.getClass() == value.getClass()) {
try {
- String values[] = (String[]) value;
- short results[] = new short[values.length];
+ String[] values = (String[]) value;
+ short[] results = new short[values.length];
for (int i = 0; i < values.length; i++) {
results[i] = Short.parseShort(values[i]);
}
@@ -128,7 +128,7 @@
// and convert to the appropriate type
try {
List list = parseElements(value.toString());
- short results[] = new short[list.size()];
+ short[] results = new short[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = Short.parseShort((String) list.get(i));
}
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/StringArrayConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/StringArrayConverter.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/StringArrayConverter.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/StringArrayConverter.java
Fri Jul 13 23:11:19 2007
@@ -76,12 +76,12 @@
/**
* <p>Model object for type comparisons.</p>
*/
- private static final String MODEL[] = new String[0];
+ private static final String[] MODEL = new String[0];
/**
* <p> Model object for int arrays.</p>
*/
- private static final int INT_MODEL[] = new int[0];
+ private static final int[] INT_MODEL = new int[0];
@@ -153,7 +153,7 @@
// and convert to the appropriate type
try {
List list = parseElements(value.toString());
- String results[] = new String[list.size()];
+ String[] results = new String[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = (String) list.get(i);
}
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java
Fri Jul 13 23:11:19 2007
@@ -645,7 +645,7 @@
sb.append((String) value);
}
else if (value instanceof String[]) {
- String values[] = (String[]) value;
+ String[] values = (String[]) value;
sb.append('[');
for (int i = 0; i < values.length; i++) {
if (i > 0) {
@@ -763,7 +763,7 @@
if (type.isArray() && (index < 0)) { // Scalar value into array
if (value instanceof String) {
- String values[] = new String[1];
+ String[] values = new String[1];
values[0] = (String) value;
newValue = getLocaleConvertUtils().convert(values, type,
pattern);
}
@@ -816,7 +816,7 @@
if (type.isArray() && (index < 0)) { // Scalar value into array
if (value instanceof String) {
- String values[] = new String[1];
+ String[] values = new String[1];
values[0] = (String) value;
newValue = ConvertUtils.convert(values, type);
}
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java
Fri Jul 13 23:11:19 2007
@@ -201,7 +201,7 @@
* @return the converted value
* @see LocaleConvertUtilsBean#convert(String[], Class, String)
*/
- public static Object convert(String values[], Class clazz, String pattern)
{
+ public static Object convert(String[] values, Class clazz, String pattern)
{
return LocaleConvertUtilsBean.getInstance().convert(values, clazz,
pattern);
}
@@ -217,7 +217,7 @@
* @return the converted value
* @see LocaleConvertUtilsBean#convert(String[], Class)
*/
- public static Object convert(String values[], Class clazz) {
+ public static Object convert(String[] values, Class clazz) {
return LocaleConvertUtilsBean.getInstance().convert(values, clazz);
}
@@ -235,7 +235,7 @@
* @return the converted value
* @see LocaleConvertUtilsBean#convert(String[], Class, Locale, String)
*/
- public static Object convert(String values[], Class clazz, Locale locale,
String pattern) {
+ public static Object convert(String[] values, Class clazz, Locale locale,
String pattern) {
return LocaleConvertUtilsBean.getInstance().convert(values, clazz,
locale, pattern);
}
Modified:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java
Fri Jul 13 23:11:19 2007
@@ -291,7 +291,7 @@
* @throws org.apache.commons.beanutils.ConversionException if thrown by an
* underlying Converter
*/
- public Object convert(String values[], Class clazz, String pattern) {
+ public Object convert(String[] values, Class clazz, String pattern) {
return convert(values, clazz, getDefaultLocale(), pattern);
}
@@ -307,7 +307,7 @@
* @throws org.apache.commons.beanutils.ConversionException if thrown by an
* underlying Converter
*/
- public Object convert(String values[], Class clazz) {
+ public Object convert(String[] values, Class clazz) {
return convert(values, clazz, getDefaultLocale(), null);
}
@@ -325,7 +325,7 @@
* @throws org.apache.commons.beanutils.ConversionException if thrown by an
* underlying Converter
*/
- public Object convert(String values[], Class clazz, Locale locale, String
pattern) {
+ public Object convert(String[] values, Class clazz, Locale locale, String
pattern) {
Class type = clazz;
if (clazz.isArray()) {
Modified:
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/TestBean.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/TestBean.java?view=diff&rev=556229&r1=556228&r2=556229
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/TestBean.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/TestBean.java
Fri Jul 13 23:11:19 2007
@@ -192,7 +192,7 @@
* An "indexed property" accessible via both array and subscript
* based getters and setters.
*/
- private String dupProperty[] =
+ private String[] dupProperty =
{ "Dup 0", "Dup 1", "Dup 2", "Dup 3", "Dup 4" };
public String[] getDupProperty() {
@@ -207,7 +207,7 @@
this.dupProperty[index] = value;
}
- public void setDupProperty(String dupProperty[]) {
+ public void setDupProperty(String[] dupProperty) {
this.dupProperty = dupProperty;
}
@@ -235,7 +235,7 @@
return (this.intArray);
}
- public void setIntArray(int intArray[]) {
+ public void setIntArray(int[] intArray) {
this.intArray = intArray;
}
@@ -474,14 +474,14 @@
/**
* A String array property accessed as a String.
*/
- private String stringArray[] =
+ private String[] stringArray =
{ "String 0", "String 1", "String 2", "String 3", "String 4" };
public String[] getStringArray() {
return (this.stringArray);
}
- public void setStringArray(String stringArray[]) {
+ public void setStringArray(String[] stringArray) {
this.stringArray = stringArray;
}
@@ -489,7 +489,7 @@
/**
* A String array property accessed as an indexed property.
*/
- private String stringIndexed[] =
+ private String[] stringIndexed =
{ "String 0", "String 1", "String 2", "String 3", "String 4" };
public String getStringIndexed(int index) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
