You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2014/10/15 22:15:22 UTC
svn commit: r1632171 [6/20] - in /commons/proper/beanutils/trunk/src:
main/java/org/apache/commons/beanutils/
main/java/org/apache/commons/beanutils/converters/
main/java/org/apache/commons/beanutils/expression/
main/java/org/apache/commons/beanutils/l...
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=1632171&r1=1632170&r2=1632171&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 Wed Oct 15 20:15:17 2014
@@ -104,7 +104,7 @@ public abstract class DateTimeConverter
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public DateTimeConverter(Object defaultValue) {
+ public DateTimeConverter(final Object defaultValue) {
super(defaultValue);
}
@@ -117,7 +117,7 @@ public abstract class DateTimeConverter
* @param useLocaleFormat <code>true</code> if the format
* for the locale should be used, otherwise <code>false</code>
*/
- public void setUseLocaleFormat(boolean useLocaleFormat) {
+ public void setUseLocaleFormat(final boolean useLocaleFormat) {
this.useLocaleFormat = useLocaleFormat;
}
@@ -136,7 +136,7 @@ public abstract class DateTimeConverter
*
* @param timeZone The Time Zone.
*/
- public void setTimeZone(TimeZone timeZone) {
+ public void setTimeZone(final TimeZone timeZone) {
this.timeZone = timeZone;
}
@@ -155,7 +155,7 @@ public abstract class DateTimeConverter
*
* @param locale The Locale.
*/
- public void setLocale(Locale locale) {
+ public void setLocale(final Locale locale) {
this.locale = locale;
setUseLocaleFormat(true);
}
@@ -167,7 +167,7 @@ public abstract class DateTimeConverter
* @see SimpleDateFormat
* @param pattern The format pattern.
*/
- public void setPattern(String pattern) {
+ public void setPattern(final String pattern) {
setPatterns(new String[] {pattern});
}
@@ -190,10 +190,10 @@ public abstract class DateTimeConverter
* @see SimpleDateFormat
* @param patterns Array of format patterns.
*/
- public void setPatterns(String[] patterns) {
+ public void setPatterns(final String[] patterns) {
this.patterns = patterns;
if (patterns != null && patterns.length > 1) {
- StringBuilder buffer = new StringBuilder();
+ final StringBuilder buffer = new StringBuilder();
for (int i = 0; i < patterns.length; i++) {
if (i > 0) {
buffer.append(", ");
@@ -221,7 +221,7 @@ public abstract class DateTimeConverter
* @throws Throwable if an error occurs converting to a String
*/
@Override
- protected String convertToString(Object value) throws Throwable {
+ protected String convertToString(final Object value) throws Throwable {
Date date = null;
if (value instanceof Date) {
@@ -285,9 +285,9 @@ public abstract class DateTimeConverter
* @throws Exception if conversion cannot be performed successfully
*/
@Override
- protected <T> T convertToType(Class<T> targetType, Object value) throws Exception {
+ protected <T> T convertToType(final Class<T> targetType, final Object value) throws Exception {
- Class<?> sourceType = value.getClass();
+ final Class<?> sourceType = value.getClass();
// Handle java.sql.Timestamp
if (value instanceof java.sql.Timestamp) {
@@ -296,7 +296,7 @@ public abstract class DateTimeConverter
// N.B. Prior to JDK 1.4 the Timestamp's getTime() method
// didn't include the milliseconds. The following code
// ensures it works consistently accross JDK versions
- java.sql.Timestamp timestamp = (java.sql.Timestamp)value;
+ final java.sql.Timestamp timestamp = (java.sql.Timestamp)value;
long timeInMillis = ((timestamp.getTime() / 1000) * 1000);
timeInMillis += timestamp.getNanos() / 1000000;
// ---------------------- JDK 1.3 Fix ----------------------
@@ -305,24 +305,24 @@ public abstract class DateTimeConverter
// Handle Date (includes java.sql.Date & java.sql.Time)
if (value instanceof Date) {
- Date date = (Date)value;
+ final Date date = (Date)value;
return toDate(targetType, date.getTime());
}
// Handle Calendar
if (value instanceof Calendar) {
- Calendar calendar = (Calendar)value;
+ final Calendar calendar = (Calendar)value;
return toDate(targetType, calendar.getTime().getTime());
}
// Handle Long
if (value instanceof Long) {
- Long longObj = (Long)value;
+ final Long longObj = (Long)value;
return toDate(targetType, longObj.longValue());
}
// Convert all other types to String & handle
- String stringValue = value.toString().trim();
+ final String stringValue = value.toString().trim();
if (stringValue.length() == 0) {
return handleMissing(targetType);
}
@@ -333,7 +333,7 @@ public abstract class DateTimeConverter
if (patterns != null && patterns.length > 0) {
calendar = parse(sourceType, targetType, stringValue);
} else {
- DateFormat format = getFormat(locale, timeZone);
+ final DateFormat format = getFormat(locale, timeZone);
calendar = parse(sourceType, targetType, stringValue, format);
}
if (Calendar.class.isAssignableFrom(targetType)) {
@@ -367,7 +367,7 @@ public abstract class DateTimeConverter
* @param value The long value to convert.
* @return The converted date value.
*/
- private <T> T toDate(Class<T> type, long value) {
+ private <T> T toDate(final Class<T> type, final long value) {
// java.util.Date
if (type.equals(Date.class)) {
@@ -406,7 +406,7 @@ public abstract class DateTimeConverter
return type.cast(calendar);
}
- String msg = toString(getClass()) + " cannot handle conversion to '"
+ final String msg = toString(getClass()) + " cannot handle conversion to '"
+ toString(type) + "'";
if (log().isWarnEnabled()) {
log().warn(" " + msg);
@@ -433,12 +433,12 @@ public abstract class DateTimeConverter
* @param value The String value to convert.
* @return The converted Number value.
*/
- private <T> T toDate(Class<T> type, String value) {
+ private <T> T toDate(final Class<T> type, final String value) {
// java.sql.Date
if (type.equals(java.sql.Date.class)) {
try {
return type.cast(java.sql.Date.valueOf(value));
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
throw new ConversionException(
"String must be in JDBC format [yyyy-MM-dd] to create a java.sql.Date");
}
@@ -448,7 +448,7 @@ public abstract class DateTimeConverter
if (type.equals(java.sql.Time.class)) {
try {
return type.cast(java.sql.Time.valueOf(value));
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
throw new ConversionException(
"String must be in JDBC format [HH:mm:ss] to create a java.sql.Time");
}
@@ -458,14 +458,14 @@ public abstract class DateTimeConverter
if (type.equals(java.sql.Timestamp.class)) {
try {
return type.cast(java.sql.Timestamp.valueOf(value));
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
throw new ConversionException(
"String must be in JDBC format [yyyy-MM-dd HH:mm:ss.fffffffff] " +
"to create a java.sql.Timestamp");
}
}
- String msg = toString(getClass()) + " does not support default String to '"
+ final String msg = toString(getClass()) + " does not support default String to '"
+ toString(type) + "' conversion.";
if (log().isWarnEnabled()) {
log().warn(" " + msg);
@@ -481,7 +481,7 @@ public abstract class DateTimeConverter
*
* @return A Date Format.
*/
- protected DateFormat getFormat(Locale locale, TimeZone timeZone) {
+ protected DateFormat getFormat(final Locale locale, final TimeZone timeZone) {
DateFormat format = null;
if (locale == null) {
format = DateFormat.getDateInstance(DateFormat.SHORT);
@@ -500,8 +500,8 @@ public abstract class DateTimeConverter
* @param pattern The date pattern
* @return The DateFormat
*/
- private DateFormat getFormat(String pattern) {
- DateFormat format = new SimpleDateFormat(pattern);
+ private DateFormat getFormat(final String pattern) {
+ final DateFormat format = new SimpleDateFormat(pattern);
if (timeZone != null) {
format.setTimeZone(timeZone);
}
@@ -518,14 +518,14 @@ public abstract class DateTimeConverter
* @return The converted Date object.
* @throws Exception if an error occurs parsing the date.
*/
- private Calendar parse(Class<?> sourceType, Class<?> targetType, String value) throws Exception {
+ private Calendar parse(final Class<?> sourceType, final Class<?> targetType, final String value) throws Exception {
Exception firstEx = null;
for (int i = 0; i < patterns.length; i++) {
try {
- DateFormat format = getFormat(patterns[i]);
- Calendar calendar = parse(sourceType, targetType, value, format);
+ final DateFormat format = getFormat(patterns[i]);
+ final Calendar calendar = parse(sourceType, targetType, value, format);
return calendar;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
if (firstEx == null) {
firstEx = ex;
}
@@ -551,11 +551,11 @@ public abstract class DateTimeConverter
* @return The converted Calendar object.
* @throws ConversionException if the String cannot be converted.
*/
- private Calendar parse(Class<?> sourceType, Class<?> targetType, String value, DateFormat format) {
+ private Calendar parse(final Class<?> sourceType, final Class<?> targetType, final String value, final DateFormat format) {
logFormat("Parsing", format);
format.setLenient(false);
- ParsePosition pos = new ParsePosition(0);
- Date parsedDate = format.parse(value, pos); // ignore the result (use the Calendar)
+ final ParsePosition pos = new ParsePosition(0);
+ final Date parsedDate = format.parse(value, pos); // ignore the result (use the Calendar)
if (pos.getErrorIndex() >= 0 || pos.getIndex() != value.length() || parsedDate == null) {
String msg = "Error converting '" + toString(sourceType) + "' to '" + toString(targetType) + "'";
if (format instanceof SimpleDateFormat) {
@@ -566,7 +566,7 @@ public abstract class DateTimeConverter
}
throw new ConversionException(msg);
}
- Calendar calendar = format.getCalendar();
+ final Calendar calendar = format.getCalendar();
return calendar;
}
@@ -577,7 +577,7 @@ public abstract class DateTimeConverter
*/
@Override
public String toString() {
- StringBuilder buffer = new StringBuilder();
+ final StringBuilder buffer = new StringBuilder();
buffer.append(toString(getClass()));
buffer.append("[UseDefault=");
buffer.append(isUseDefault());
@@ -605,9 +605,9 @@ public abstract class DateTimeConverter
* @param action The action the format is being used for
* @param format The Date format
*/
- private void logFormat(String action, DateFormat format) {
+ private void logFormat(final String action, final DateFormat format) {
if (log().isDebugEnabled()) {
- StringBuilder buffer = new StringBuilder(45);
+ final StringBuilder buffer = new StringBuilder(45);
buffer.append(" ");
buffer.append(action);
buffer.append(" with Format");
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=1632171&r1=1632170&r2=1632171&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 Wed Oct 15 20:15:17 2014
@@ -59,7 +59,7 @@ public final class DoubleArrayConverter
*
* @param defaultValue The default value to be returned
*/
- public DoubleArrayConverter(Object defaultValue) {
+ public DoubleArrayConverter(final Object defaultValue) {
this.defaultValue = defaultValue;
this.useDefault = true;
@@ -90,7 +90,7 @@ public final class DoubleArrayConverter
* successfully
*/
@Override
- public Object convert(Class type, Object value) {
+ public Object convert(final Class type, final Object value) {
// Deal with a null value
if (value == null) {
@@ -109,13 +109,13 @@ public final class DoubleArrayConverter
// Deal with input value as a String array
if (strings.getClass() == value.getClass()) {
try {
- String[] values = (String[]) value;
- double[] results = new double[values.length];
+ final String[] values = (String[]) value;
+ final double[] results = new double[values.length];
for (int i = 0; i < values.length; i++) {
results[i] = Double.parseDouble(values[i]);
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
@@ -127,13 +127,13 @@ public final class DoubleArrayConverter
// Parse the input value as a String into elements
// and convert to the appropriate type
try {
- List list = parseElements(value.toString());
- double[] results = new double[list.size()];
+ final List list = parseElements(value.toString());
+ final double[] results = new double[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = Double.parseDouble((String) list.get(i));
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
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=1632171&r1=1632170&r2=1632171&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 Wed Oct 15 20:15:17 2014
@@ -49,7 +49,7 @@ public final class DoubleConverter exten
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public DoubleConverter(Object defaultValue) {
+ public DoubleConverter(final Object defaultValue) {
super(true, defaultValue);
}
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=1632171&r1=1632170&r2=1632171&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 Wed Oct 15 20:15:17 2014
@@ -46,7 +46,7 @@ public final class FileConverter extends
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public FileConverter(Object defaultValue) {
+ public FileConverter(final Object defaultValue) {
super(defaultValue);
}
@@ -72,7 +72,7 @@ public final class FileConverter extends
* @since 1.8.0
*/
@Override
- protected <T> T convertToType(Class<T> type, Object value) throws Throwable {
+ protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
if (File.class.equals(type)) {
return type.cast(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=1632171&r1=1632170&r2=1632171&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 Wed Oct 15 20:15:17 2014
@@ -59,7 +59,7 @@ public final class FloatArrayConverter e
*
* @param defaultValue The default value to be returned
*/
- public FloatArrayConverter(Object defaultValue) {
+ public FloatArrayConverter(final Object defaultValue) {
this.defaultValue = defaultValue;
this.useDefault = true;
@@ -91,7 +91,7 @@ public final class FloatArrayConverter e
* successfully
*/
@Override
- public Object convert(Class type, Object value) {
+ public Object convert(final Class type, final Object value) {
// Deal with a null value
if (value == null) {
@@ -110,13 +110,13 @@ public final class FloatArrayConverter e
// Deal with input value as a String array
if (strings.getClass() == value.getClass()) {
try {
- String[] values = (String[]) value;
- float[] results = new float[values.length];
+ final String[] values = (String[]) value;
+ final float[] results = new float[values.length];
for (int i = 0; i < values.length; i++) {
results[i] = Float.parseFloat(values[i]);
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
@@ -128,13 +128,13 @@ public final class FloatArrayConverter e
// Parse the input value as a String into elements
// and convert to the appropriate type
try {
- List list = parseElements(value.toString());
- float[] results = new float[list.size()];
+ final List list = parseElements(value.toString());
+ final float[] results = new float[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = Float.parseFloat((String) list.get(i));
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
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=1632171&r1=1632170&r2=1632171&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 Wed Oct 15 20:15:17 2014
@@ -49,7 +49,7 @@ public final class FloatConverter extend
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public FloatConverter(Object defaultValue) {
+ public FloatConverter(final Object defaultValue) {
super(true, defaultValue);
}
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=1632171&r1=1632170&r2=1632171&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 Wed Oct 15 20:15:17 2014
@@ -59,7 +59,7 @@ public final class IntegerArrayConverter
*
* @param defaultValue The default value to be returned
*/
- public IntegerArrayConverter(Object defaultValue) {
+ public IntegerArrayConverter(final Object defaultValue) {
this.defaultValue = defaultValue;
this.useDefault = true;
@@ -91,7 +91,7 @@ public final class IntegerArrayConverter
* successfully
*/
@Override
- public Object convert(Class type, Object value) {
+ public Object convert(final Class type, final Object value) {
// Deal with a null value
if (value == null) {
@@ -110,13 +110,13 @@ public final class IntegerArrayConverter
// Deal with input value as a String array
if (strings.getClass() == value.getClass()) {
try {
- String[] values = (String[]) value;
- int[] results = new int[values.length];
+ final String[] values = (String[]) value;
+ final int[] results = new int[values.length];
for (int i = 0; i < values.length; i++) {
results[i] = Integer.parseInt(values[i]);
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
@@ -128,13 +128,13 @@ public final class IntegerArrayConverter
// Parse the input value as a String into elements
// and convert to the appropriate type
try {
- List list = parseElements(value.toString());
- int[] results = new int[list.size()];
+ final List list = parseElements(value.toString());
+ final int[] results = new int[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = Integer.parseInt((String) list.get(i));
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
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=1632171&r1=1632170&r2=1632171&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 Wed Oct 15 20:15:17 2014
@@ -49,7 +49,7 @@ public final class IntegerConverter exte
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public IntegerConverter(Object defaultValue) {
+ public IntegerConverter(final Object defaultValue) {
super(false, defaultValue);
}
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=1632171&r1=1632170&r2=1632171&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 Wed Oct 15 20:15:17 2014
@@ -59,7 +59,7 @@ public final class LongArrayConverter ex
*
* @param defaultValue The default value to be returned
*/
- public LongArrayConverter(Object defaultValue) {
+ public LongArrayConverter(final Object defaultValue) {
this.defaultValue = defaultValue;
this.useDefault = true;
@@ -91,7 +91,7 @@ public final class LongArrayConverter ex
* successfully
*/
@Override
- public Object convert(Class type, Object value) {
+ public Object convert(final Class type, final Object value) {
// Deal with a null value
if (value == null) {
@@ -110,13 +110,13 @@ public final class LongArrayConverter ex
// Deal with input value as a String array
if (strings.getClass() == value.getClass()) {
try {
- String[] values = (String[]) value;
- long[] results = new long[values.length];
+ final String[] values = (String[]) value;
+ final long[] results = new long[values.length];
for (int i = 0; i < values.length; i++) {
results[i] = Long.parseLong(values[i]);
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
@@ -128,13 +128,13 @@ public final class LongArrayConverter ex
// Parse the input value as a String into elements
// and convert to the appropriate type
try {
- List list = parseElements(value.toString());
- long[] results = new long[list.size()];
+ final List list = parseElements(value.toString());
+ final long[] results = new long[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = Long.parseLong((String) list.get(i));
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
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=1632171&r1=1632170&r2=1632171&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 Wed Oct 15 20:15:17 2014
@@ -49,7 +49,7 @@ public final class LongConverter extends
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public LongConverter(Object defaultValue) {
+ public LongConverter(final Object defaultValue) {
super(false, defaultValue);
}
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=1632171&r1=1632170&r2=1632171&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 Wed Oct 15 20:15:17 2014
@@ -100,7 +100,7 @@ public abstract class NumberConverter ex
*
* @param allowDecimals Indicates whether decimals are allowed
*/
- public NumberConverter(boolean allowDecimals) {
+ public NumberConverter(final boolean allowDecimals) {
super();
this.allowDecimals = allowDecimals;
}
@@ -112,7 +112,7 @@ public abstract class NumberConverter ex
* @param allowDecimals Indicates whether decimals are allowed
* @param defaultValue The default value to be returned
*/
- public NumberConverter(boolean allowDecimals, Object defaultValue) {
+ public NumberConverter(final boolean allowDecimals, final Object defaultValue) {
super();
this.allowDecimals = allowDecimals;
setDefaultValue(defaultValue);
@@ -136,7 +136,7 @@ public abstract class NumberConverter ex
* @param useLocaleFormat <code>true</code> if a number format
* should be used.
*/
- public void setUseLocaleFormat(boolean useLocaleFormat) {
+ public void setUseLocaleFormat(final boolean useLocaleFormat) {
this.useLocaleFormat = useLocaleFormat;
}
@@ -163,7 +163,7 @@ public abstract class NumberConverter ex
*
* @param pattern The format pattern.
*/
- public void setPattern(String pattern) {
+ public void setPattern(final String pattern) {
this.pattern = pattern;
setUseLocaleFormat(true);
}
@@ -183,7 +183,7 @@ public abstract class NumberConverter ex
*
* @param locale The locale to use for conversion
*/
- public void setLocale(Locale locale) {
+ public void setLocale(final Locale locale) {
this.locale = locale;
setUseLocaleFormat(true);
}
@@ -198,11 +198,11 @@ public abstract class NumberConverter ex
* @throws Throwable if an error occurs converting to a String
*/
@Override
- protected String convertToString(Object value) throws Throwable {
+ protected String convertToString(final Object value) throws Throwable {
String result = null;
if (useLocaleFormat && value instanceof Number) {
- NumberFormat format = getFormat();
+ final NumberFormat format = getFormat();
format.setGroupingUsed(false);
result = format.format(value);
if (log().isDebugEnabled()) {
@@ -230,9 +230,9 @@ public abstract class NumberConverter ex
* @throws Throwable if an error occurs converting to the specified type
*/
@Override
- protected <T> T convertToType(Class<T> targetType, Object value) throws Throwable {
+ protected <T> T convertToType(final Class<T> targetType, final Object value) throws Throwable {
- Class<?> sourceType = value.getClass();
+ final Class<?> sourceType = value.getClass();
// Handle Number
if (value instanceof Number) {
return toNumber(sourceType, targetType, (Number)value);
@@ -254,7 +254,7 @@ public abstract class NumberConverter ex
}
// Convert all other types to String & handle
- String stringValue = value.toString().trim();
+ final String stringValue = value.toString().trim();
if (stringValue.length() == 0) {
return handleMissing(targetType);
}
@@ -262,7 +262,7 @@ public abstract class NumberConverter ex
// Convert/Parse a String
Number number = null;
if (useLocaleFormat) {
- NumberFormat format = getFormat();
+ final NumberFormat format = getFormat();
number = parse(sourceType, targetType, stringValue, format);
} else {
if (log().isDebugEnabled()) {
@@ -297,7 +297,7 @@ public abstract class NumberConverter ex
*
* @return The converted value.
*/
- private <T> T toNumber(Class<?> sourceType, Class<T> targetType, Number value) {
+ private <T> T toNumber(final Class<?> sourceType, final Class<T> targetType, final Number value) {
// Correct Number type already
if (targetType.equals(value.getClass())) {
@@ -306,7 +306,7 @@ public abstract class NumberConverter ex
// Byte
if (targetType.equals(Byte.class)) {
- long longValue = value.longValue();
+ final long longValue = value.longValue();
if (longValue > Byte.MAX_VALUE) {
throw new ConversionException(toString(sourceType) + " value '" + value
+ "' is too large for " + toString(targetType));
@@ -320,7 +320,7 @@ public abstract class NumberConverter ex
// Short
if (targetType.equals(Short.class)) {
- long longValue = value.longValue();
+ final long longValue = value.longValue();
if (longValue > Short.MAX_VALUE) {
throw new ConversionException(toString(sourceType) + " value '" + value
+ "' is too large for " + toString(targetType));
@@ -334,7 +334,7 @@ public abstract class NumberConverter ex
// Integer
if (targetType.equals(Integer.class)) {
- long longValue = value.longValue();
+ final long longValue = value.longValue();
if (longValue > Integer.MAX_VALUE) {
throw new ConversionException(toString(sourceType) + " value '" + value
+ "' is too large for " + toString(targetType));
@@ -387,7 +387,7 @@ public abstract class NumberConverter ex
}
}
- String msg = toString(getClass()) + " cannot handle conversion to '"
+ final String msg = toString(getClass()) + " cannot handle conversion to '"
+ toString(targetType) + "'";
if (log().isWarnEnabled()) {
log().warn(" " + msg);
@@ -416,7 +416,7 @@ public abstract class NumberConverter ex
*
* @return The converted Number value.
*/
- private Number toNumber(Class<?> sourceType, Class<?> targetType, String value) {
+ private Number toNumber(final Class<?> sourceType, final Class<?> targetType, final String value) {
// Byte
if (targetType.equals(Byte.class)) {
@@ -458,7 +458,7 @@ public abstract class NumberConverter ex
return new BigInteger(value);
}
- String msg = toString(getClass()) + " cannot handle conversion from '" +
+ final String msg = toString(getClass()) + " cannot handle conversion from '" +
toString(sourceType) + "' to '" + toString(targetType) + "'";
if (log().isWarnEnabled()) {
log().warn(" " + msg);
@@ -473,7 +473,7 @@ public abstract class NumberConverter ex
*/
@Override
public String toString() {
- StringBuilder buffer = new StringBuilder();
+ final StringBuilder buffer = new StringBuilder();
buffer.append(toString(getClass()));
buffer.append("[UseDefault=");
buffer.append(isUseDefault());
@@ -509,7 +509,7 @@ public abstract class NumberConverter ex
log().debug(" Using pattern '" + pattern + "'" +
" with Locale[" + locale + "]");
}
- DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
+ final DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
format = new DecimalFormat(pattern, symbols);
}
} else {
@@ -541,9 +541,9 @@ public abstract class NumberConverter ex
* @return The converted Number object.
* @throws ConversionException if the String cannot be converted.
*/
- private Number parse(Class<?> sourceType, Class<?> targetType, String value, NumberFormat format) {
- ParsePosition pos = new ParsePosition(0);
- Number parsedNumber = format.parse(value, pos);
+ private Number parse(final Class<?> sourceType, final Class<?> targetType, final String value, final NumberFormat format) {
+ final ParsePosition pos = new ParsePosition(0);
+ final Number parsedNumber = format.parse(value, pos);
if (pos.getErrorIndex() >= 0 || pos.getIndex() != value.length() || parsedNumber == null) {
String msg = "Error converting from '" + toString(sourceType) + "' to '" + toString(targetType) + "'";
if (format instanceof DecimalFormat) {
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java Wed Oct 15 20:15:17 2014
@@ -59,7 +59,7 @@ public final class ShortArrayConverter e
*
* @param defaultValue The default value to be returned
*/
- public ShortArrayConverter(Object defaultValue) {
+ public ShortArrayConverter(final Object defaultValue) {
this.defaultValue = defaultValue;
this.useDefault = true;
@@ -91,7 +91,7 @@ public final class ShortArrayConverter e
* successfully
*/
@Override
- public Object convert(Class type, Object value) {
+ public Object convert(final Class type, final Object value) {
// Deal with a null value
if (value == null) {
@@ -110,13 +110,13 @@ public final class ShortArrayConverter e
// Deal with input value as a String array
if (strings.getClass() == value.getClass()) {
try {
- String[] values = (String[]) value;
- short[] results = new short[values.length];
+ final String[] values = (String[]) value;
+ final short[] results = new short[values.length];
for (int i = 0; i < values.length; i++) {
results[i] = Short.parseShort(values[i]);
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
@@ -128,13 +128,13 @@ public final class ShortArrayConverter e
// Parse the input value as a String into elements
// and convert to the appropriate type
try {
- List list = parseElements(value.toString());
- short[] results = new short[list.size()];
+ final List list = parseElements(value.toString());
+ final short[] results = new short[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = Short.parseShort((String) list.get(i));
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ShortConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ShortConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ShortConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ShortConverter.java Wed Oct 15 20:15:17 2014
@@ -49,7 +49,7 @@ public final class ShortConverter extend
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public ShortConverter(Object defaultValue) {
+ public ShortConverter(final Object defaultValue) {
super(false, defaultValue);
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/SqlDateConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/SqlDateConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/SqlDateConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/SqlDateConverter.java Wed Oct 15 20:15:17 2014
@@ -51,7 +51,7 @@ public final class SqlDateConverter exte
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public SqlDateConverter(Object defaultValue) {
+ public SqlDateConverter(final Object defaultValue) {
super(defaultValue);
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/SqlTimeConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/SqlTimeConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/SqlTimeConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/SqlTimeConverter.java Wed Oct 15 20:15:17 2014
@@ -54,7 +54,7 @@ public final class SqlTimeConverter exte
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public SqlTimeConverter(Object defaultValue) {
+ public SqlTimeConverter(final Object defaultValue) {
super(defaultValue);
}
@@ -78,7 +78,7 @@ public final class SqlTimeConverter exte
* @since 1.8.0
*/
@Override
- protected DateFormat getFormat(Locale locale, TimeZone timeZone) {
+ protected DateFormat getFormat(final Locale locale, final TimeZone timeZone) {
DateFormat format = null;
if (locale == null) {
format = DateFormat.getTimeInstance(DateFormat.SHORT);
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/SqlTimestampConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/SqlTimestampConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/SqlTimestampConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/SqlTimestampConverter.java Wed Oct 15 20:15:17 2014
@@ -54,7 +54,7 @@ public final class SqlTimestampConverter
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public SqlTimestampConverter(Object defaultValue) {
+ public SqlTimestampConverter(final Object defaultValue) {
super(defaultValue);
}
@@ -78,7 +78,7 @@ public final class SqlTimestampConverter
* @since 1.8.0
*/
@Override
- protected DateFormat getFormat(Locale locale, TimeZone timeZone) {
+ protected DateFormat getFormat(final Locale locale, final TimeZone timeZone) {
DateFormat format = null;
if (locale == null) {
format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java Wed Oct 15 20:15:17 2014
@@ -62,7 +62,7 @@ public final class StringArrayConverter
*
* @param defaultValue The default value to be returned
*/
- public StringArrayConverter(Object defaultValue) {
+ public StringArrayConverter(final Object defaultValue) {
this.defaultValue = defaultValue;
this.useDefault = true;
@@ -121,7 +121,7 @@ public final class StringArrayConverter
* for this object.
*/
@Override
- public Object convert(Class type, Object value) {
+ public Object convert(final Class type, final Object value) {
// Deal with a null value
if (value == null) {
@@ -140,8 +140,8 @@ public final class StringArrayConverter
// Deal with the input value as an int array
if (INT_MODEL.getClass() == value.getClass())
{
- int[] values = (int[]) value;
- String[] results = new String[values.length];
+ final int[] values = (int[]) value;
+ final String[] results = new String[values.length];
for (int i = 0; i < values.length; i++)
{
results[i] = Integer.toString(values[i]);
@@ -153,13 +153,13 @@ public final class StringArrayConverter
// Parse the input value as a String into elements
// and convert to the appropriate type
try {
- List list = parseElements(value.toString());
- String[] results = new String[list.size()];
+ final List list = parseElements(value.toString());
+ final String[] results = new String[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = (String) list.get(i);
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java Wed Oct 15 20:15:17 2014
@@ -60,7 +60,7 @@ public final class StringConverter exten
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public StringConverter(Object defaultValue) {
+ public StringConverter(final Object defaultValue) {
super(defaultValue);
}
@@ -87,7 +87,7 @@ public final class StringConverter exten
* @since 1.8.0
*/
@Override
- protected <T> T convertToType(Class<T> type, Object value) throws Throwable {
+ protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
// We have to support Object, too, because this class is sometimes
// used for a standard to Object conversion
if (String.class.equals(type) || Object.class.equals(type)) {
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/URLConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/URLConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/URLConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/URLConverter.java Wed Oct 15 20:15:17 2014
@@ -46,7 +46,7 @@ public final class URLConverter extends
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public URLConverter(Object defaultValue) {
+ public URLConverter(final Object defaultValue) {
super(defaultValue);
}
@@ -72,7 +72,7 @@ public final class URLConverter extends
* @since 1.8.0
*/
@Override
- protected <T> T convertToType(Class<T> type, Object value) throws Throwable {
+ protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
if (URL.class.equals(type)) {
return type.cast(new URL(value.toString()));
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/expression/DefaultResolver.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/expression/DefaultResolver.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/expression/DefaultResolver.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/expression/DefaultResolver.java Wed Oct 15 20:15:17 2014
@@ -76,27 +76,27 @@ public class DefaultResolver implements
* @throws IllegalArgumentException If the indexed property is illegally
* formed or has an invalid (non-numeric) value.
*/
- public int getIndex(String expression) {
+ public int getIndex(final String expression) {
if (expression == null || expression.length() == 0) {
return -1;
}
for (int i = 0; i < expression.length(); i++) {
- char c = expression.charAt(i);
+ final char c = expression.charAt(i);
if (c == NESTED || c == MAPPED_START) {
return -1;
} else if (c == INDEXED_START) {
- int end = expression.indexOf(INDEXED_END, i);
+ final int end = expression.indexOf(INDEXED_END, i);
if (end < 0) {
throw new IllegalArgumentException("Missing End Delimiter");
}
- String value = expression.substring(i + 1, end);
+ final String value = expression.substring(i + 1, end);
if (value.length() == 0) {
throw new IllegalArgumentException("No Index Value");
}
int index = 0;
try {
index = Integer.parseInt(value, 10);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new IllegalArgumentException("Invalid index value '"
+ value + "'");
}
@@ -113,16 +113,16 @@ public class DefaultResolver implements
* @return The index value
* @throws IllegalArgumentException If the mapped property is illegally formed.
*/
- public String getKey(String expression) {
+ public String getKey(final String expression) {
if (expression == null || expression.length() == 0) {
return null;
}
for (int i = 0; i < expression.length(); i++) {
- char c = expression.charAt(i);
+ final char c = expression.charAt(i);
if (c == NESTED || c == INDEXED_START) {
return null;
} else if (c == MAPPED_START) {
- int end = expression.indexOf(MAPPED_END, i);
+ final int end = expression.indexOf(MAPPED_END, i);
if (end < 0) {
throw new IllegalArgumentException("Missing End Delimiter");
}
@@ -138,12 +138,12 @@ public class DefaultResolver implements
* @param expression The property expression
* @return The property name
*/
- public String getProperty(String expression) {
+ public String getProperty(final String expression) {
if (expression == null || expression.length() == 0) {
return expression;
}
for (int i = 0; i < expression.length(); i++) {
- char c = expression.charAt(i);
+ final char c = expression.charAt(i);
if (c == NESTED) {
return expression.substring(0, i);
} else if (c == MAPPED_START || c == INDEXED_START) {
@@ -160,7 +160,7 @@ public class DefaultResolver implements
* @param expression The property expression
* @return The next property expression
*/
- public boolean hasNested(String expression) {
+ public boolean hasNested(final String expression) {
if (expression == null || expression.length() == 0) {
return false;
} else {
@@ -175,12 +175,12 @@ public class DefaultResolver implements
* @return <code>true</code> if the expresion is indexed,
* otherwise <code>false</code>
*/
- public boolean isIndexed(String expression) {
+ public boolean isIndexed(final String expression) {
if (expression == null || expression.length() == 0) {
return false;
}
for (int i = 0; i < expression.length(); i++) {
- char c = expression.charAt(i);
+ final char c = expression.charAt(i);
if (c == NESTED || c == MAPPED_START) {
return false;
} else if (c == INDEXED_START) {
@@ -197,12 +197,12 @@ public class DefaultResolver implements
* @return <code>true</code> if the expresion is mapped,
* otherwise <code>false</code>
*/
- public boolean isMapped(String expression) {
+ public boolean isMapped(final String expression) {
if (expression == null || expression.length() == 0) {
return false;
}
for (int i = 0; i < expression.length(); i++) {
- char c = expression.charAt(i);
+ final char c = expression.charAt(i);
if (c == NESTED || c == INDEXED_START) {
return false;
} else if (c == MAPPED_START) {
@@ -219,14 +219,14 @@ public class DefaultResolver implements
* @param expression The property expression
* @return The next property expression
*/
- public String next(String expression) {
+ public String next(final String expression) {
if (expression == null || expression.length() == 0) {
return null;
}
boolean indexed = false;
boolean mapped = false;
for (int i = 0; i < expression.length(); i++) {
- char c = expression.charAt(i);
+ final char c = expression.charAt(i);
if (indexed) {
if (c == INDEXED_END) {
return expression.substring(0, i + 1);
@@ -256,11 +256,11 @@ public class DefaultResolver implements
* @return The new expression value, with first property
* expression removed - null if there are no more expressions
*/
- public String remove(String expression) {
+ public String remove(final String expression) {
if (expression == null || expression.length() == 0) {
return null;
}
- String property = next(expression);
+ final String property = next(expression);
if (expression.length() == property.length()) {
return null;
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java Wed Oct 15 20:15:17 2014
@@ -68,7 +68,7 @@ public abstract class BaseLocaleConverte
* @param locale The locale
* @param pattern The convertion pattern
*/
- protected BaseLocaleConverter(Locale locale, String pattern) {
+ protected BaseLocaleConverter(final Locale locale, final String pattern) {
this(null, locale, pattern, false, false);
}
@@ -81,7 +81,7 @@ public abstract class BaseLocaleConverte
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- protected BaseLocaleConverter(Locale locale, String pattern, boolean locPattern) {
+ protected BaseLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) {
this(null, locale, pattern, false, locPattern);
}
@@ -95,7 +95,7 @@ public abstract class BaseLocaleConverte
* @param locale The locale
* @param pattern The convertion pattern
*/
- protected BaseLocaleConverter(Object defaultValue, Locale locale, String pattern) {
+ protected BaseLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) {
this(defaultValue, locale, pattern, false);
}
@@ -109,7 +109,7 @@ public abstract class BaseLocaleConverte
* @param pattern The convertion pattern
* @param locPattern Indicate whether the pattern is localized or not
*/
- protected BaseLocaleConverter(Object defaultValue, Locale locale, String pattern, boolean locPattern) {
+ protected BaseLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) {
this(defaultValue, locale, pattern, true, locPattern);
}
@@ -124,8 +124,8 @@ public abstract class BaseLocaleConverte
* @param useDefault Indicate whether the default value is used or not
* @param locPattern Indicate whether the pattern is localized or not
*/
- private BaseLocaleConverter(Object defaultValue, Locale locale,
- String pattern, boolean useDefault, boolean locPattern) {
+ private BaseLocaleConverter(final Object defaultValue, final Locale locale,
+ final String pattern, final boolean useDefault, final boolean locPattern) {
if (useDefault) {
this.defaultValue = defaultValue;
@@ -167,7 +167,7 @@ public abstract class BaseLocaleConverte
* @exception ConversionException if conversion cannot be performed
* successfully
*/
- public Object convert(Object value) {
+ public Object convert(final Object value) {
return convert(value, null);
}
@@ -181,7 +181,7 @@ public abstract class BaseLocaleConverte
* @exception ConversionException if conversion cannot be performed
* successfully
*/
- public Object convert(Object value, String pattern) {
+ public Object convert(final Object value, final String pattern) {
return convert(null, value, pattern);
}
@@ -197,7 +197,7 @@ public abstract class BaseLocaleConverte
* @exception ConversionException if conversion cannot be performed
* successfully
*/
- public <T> T convert(Class<T> type, Object value) {
+ public <T> T convert(final Class<T> type, final Object value) {
return convert(type, value, null);
}
@@ -216,8 +216,8 @@ public abstract class BaseLocaleConverte
* @exception ConversionException if conversion cannot be performed
* successfully
*/
- public <T> T convert(Class<T> type, Object value, String pattern) {
- Class<T> targetType = ConvertUtils.primitiveToWrapper(type);
+ public <T> T convert(final Class<T> type, final Object value, final String pattern) {
+ final Class<T> targetType = ConvertUtils.primitiveToWrapper(type);
if (value == null) {
if (useDefault) {
return getDefaultAs(targetType);
@@ -235,7 +235,7 @@ public abstract class BaseLocaleConverte
} else {
return checkConversionResult(targetType, parse(value, this.pattern));
}
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return getDefaultAs(targetType);
} else {
@@ -258,7 +258,7 @@ public abstract class BaseLocaleConverte
* @throws ConversionException if the default object is not compatible with
* the target type
*/
- private <T> T getDefaultAs(Class<T> type) {
+ private <T> T getDefaultAs(final Class<T> type) {
return checkConversionResult(type, defaultValue);
}
@@ -274,10 +274,11 @@ public abstract class BaseLocaleConverte
* @throws ConversionException if the result object is not compatible with
* the target type
*/
- private static <T> T checkConversionResult(Class<T> type, Object result) {
+ private static <T> T checkConversionResult(final Class<T> type, final Object result) {
if (type == null) {
// in this case we cannot do much; the result object is returned
@SuppressWarnings("unchecked")
+ final
T temp = (T) result;
return temp;
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java Wed Oct 15 20:15:17 2014
@@ -62,7 +62,7 @@ public class LocaleBeanUtils extends Bea
* @param locale the default locale
* @see LocaleBeanUtilsBean#setDefaultLocale(Locale)
*/
- public static void setDefaultLocale(Locale locale) {
+ public static void setDefaultLocale(final Locale locale) {
LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().setDefaultLocale(locale);
}
@@ -90,7 +90,7 @@ public class LocaleBeanUtils extends Bea
* otherwise <code>false</code>
* @see LocaleBeanUtilsBean#setApplyLocalized(boolean)
*/
- public static void setApplyLocalized(boolean newApplyLocalized) {
+ public static void setApplyLocalized(final boolean newApplyLocalized) {
LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().setApplyLocalized(newApplyLocalized);
}
@@ -119,7 +119,7 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#getIndexedProperty(Object, String, String)
*/
- public static String getIndexedProperty(Object bean, String name, String pattern)
+ public static String getIndexedProperty(final Object bean, final String name, final String pattern)
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
@@ -147,7 +147,7 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#getIndexedProperty(Object, String)
*/
- public static String getIndexedProperty(Object bean, String name)
+ public static String getIndexedProperty(final Object bean, final String name)
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
@@ -175,8 +175,8 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#getIndexedProperty(Object, String, int, String)
*/
- public static String getIndexedProperty(Object bean,
- String name, int index, String pattern)
+ public static String getIndexedProperty(final Object bean,
+ final String name, final int index, final String pattern)
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
@@ -204,8 +204,8 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#getIndexedProperty(Object, String, int)
*/
- public static String getIndexedProperty(Object bean,
- String name, int index)
+ public static String getIndexedProperty(final Object bean,
+ final String name, final int index)
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
return LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().getIndexedProperty(bean, name, index);
@@ -232,7 +232,7 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#getSimpleProperty(Object, String, String)
*/
- public static String getSimpleProperty(Object bean, String name, String pattern)
+ public static String getSimpleProperty(final Object bean, final String name, final String pattern)
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
@@ -259,7 +259,7 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#getSimpleProperty(Object, String)
*/
- public static String getSimpleProperty(Object bean, String name)
+ public static String getSimpleProperty(final Object bean, final String name)
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
@@ -287,8 +287,8 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#getMappedProperty(Object, String, String, String)
*/
- public static String getMappedProperty(Object bean,
- String name, String key, String pattern)
+ public static String getMappedProperty(final Object bean,
+ final String name, final String key, final String pattern)
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
@@ -317,8 +317,8 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#getMappedProperty(Object, String, String)
*/
- public static String getMappedProperty(Object bean,
- String name, String key)
+ public static String getMappedProperty(final Object bean,
+ final String name, final String key)
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
@@ -347,7 +347,7 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#getMappedPropertyLocale(Object, String, String)
*/
- public static String getMappedPropertyLocale(Object bean, String name, String pattern)
+ public static String getMappedPropertyLocale(final Object bean, final String name, final String pattern)
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
@@ -376,7 +376,7 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#getMappedProperty(Object, String)
*/
- public static String getMappedProperty(Object bean, String name)
+ public static String getMappedProperty(final Object bean, final String name)
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
@@ -404,7 +404,7 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#getNestedProperty(Object, String, String)
*/
- public static String getNestedProperty(Object bean, String name, String pattern)
+ public static String getNestedProperty(final Object bean, final String name, final String pattern)
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
@@ -430,7 +430,7 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#getNestedProperty(Object, String)
*/
- public static String getNestedProperty(Object bean, String name)
+ public static String getNestedProperty(final Object bean, final String name)
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
@@ -458,7 +458,7 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#getProperty(Object, String, String)
*/
- public static String getProperty(Object bean, String name, String pattern)
+ public static String getProperty(final Object bean, final String name, final String pattern)
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
@@ -485,7 +485,7 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#getProperty(Object, String)
*/
- public static String getProperty(Object bean, String name)
+ public static String getProperty(final Object bean, final String name)
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
@@ -510,7 +510,7 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#setProperty(Object, String, Object)
*/
- public static void setProperty(Object bean, String name, Object value)
+ public static void setProperty(final Object bean, final String name, final Object value)
throws IllegalAccessException, InvocationTargetException {
LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().setProperty(bean, name, value);
@@ -535,7 +535,7 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#setProperty(Object, String, Object, String)
*/
- public static void setProperty(Object bean, String name, Object value, String pattern)
+ public static void setProperty(final Object bean, final String name, final Object value, final String pattern)
throws IllegalAccessException, InvocationTargetException {
LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().setProperty(bean, name, value, pattern);
@@ -558,7 +558,7 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#definePropertyType(Object, String, String)
*/
- protected static Class<?> definePropertyType(Object target, String name, String propName)
+ protected static Class<?> definePropertyType(final Object target, final String name, final String propName)
throws IllegalAccessException, InvocationTargetException {
return LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().definePropertyType(target, name, propName);
@@ -577,7 +577,7 @@ public class LocaleBeanUtils extends Bea
* @return The converted value
* @see LocaleBeanUtilsBean#convert(Class, int, Object, String)
*/
- protected static Object convert(Class<?> type, int index, Object value, String pattern) {
+ protected static Object convert(final Class<?> type, final int index, final Object value, final String pattern) {
return LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().convert(type, index, value, pattern);
}
@@ -593,7 +593,7 @@ public class LocaleBeanUtils extends Bea
* @return The converted value
* @see LocaleBeanUtilsBean#convert(Class, int, Object)
*/
- protected static Object convert(Class<?> type, int index, Object value) {
+ protected static Object convert(final Class<?> type, final int index, final Object value) {
return LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().convert(type, index, value);
}
@@ -616,7 +616,7 @@ public class LocaleBeanUtils extends Bea
*
* @see LocaleBeanUtilsBean#invokeSetter(Object, String, String, int, Object)
*/
- protected static void invokeSetter(Object target, String propName, String key, int index, Object newValue)
+ protected static void invokeSetter(final Object target, final String propName, final String key, final int index, final Object newValue)
throws IllegalAccessException, InvocationTargetException {
LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().invokeSetter(target, propName, key, index, newValue);
@@ -636,10 +636,10 @@ public class LocaleBeanUtils extends Bea
* throws an exception
*/
@Deprecated
- protected static Descriptor calculate(Object bean, String name)
+ protected static Descriptor calculate(final Object bean, final String name)
throws IllegalAccessException, InvocationTargetException {
- org.apache.commons.beanutils.locale.LocaleBeanUtilsBean.Descriptor descriptor
+ final org.apache.commons.beanutils.locale.LocaleBeanUtilsBean.Descriptor descriptor
= LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().calculate(bean, name);
return new Descriptor(
descriptor.getTarget(),
@@ -668,7 +668,7 @@ public class LocaleBeanUtils extends Bea
* @param key The mapped property key (if any)
* @param index The indexed property index (if any)
*/
- public Descriptor(Object target, String name, String propName, String key, int index) {
+ public Descriptor(final Object target, final String name, final String propName, final String key, final int index) {
setTarget(target);
setName(name);
@@ -691,7 +691,7 @@ public class LocaleBeanUtils extends Bea
*
* @param target The target bean
*/
- public void setTarget(Object target) {
+ public void setTarget(final Object target) {
this.target = target;
}
@@ -709,7 +709,7 @@ public class LocaleBeanUtils extends Bea
*
* @param key The mapped property key (if any)
*/
- public void setKey(String key) {
+ public void setKey(final String key) {
this.key = key;
}
@@ -727,7 +727,7 @@ public class LocaleBeanUtils extends Bea
*
* @param index The indexed property index (if any)
*/
- public void setIndex(int index) {
+ public void setIndex(final int index) {
this.index = index;
}
@@ -745,7 +745,7 @@ public class LocaleBeanUtils extends Bea
*
* @param name The property name (includes indexed/mapped expr)
*/
- public void setName(String name) {
+ public void setName(final String name) {
this.name = name;
}
@@ -763,7 +763,7 @@ public class LocaleBeanUtils extends Bea
*
* @param propName The property name
*/
- public void setPropName(String propName) {
+ public void setPropName(final String propName) {
this.propName = propName;
}
}