Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java Wed Oct 15 20:15:17 2014 @@ -75,7 +75,7 @@ public class LocaleBeanUtilsBean extends * * @param newInstance a new singleton instance */ - public static void setInstance(LocaleBeanUtilsBean newInstance) { + public static void setInstance(final LocaleBeanUtilsBean newInstance) { LOCALE_BEANS_BY_CLASSLOADER.set(newInstance); } @@ -103,9 +103,9 @@ public class LocaleBeanUtilsBean extends * @param propertyUtilsBean use this for property conversions */ public LocaleBeanUtilsBean( - LocaleConvertUtilsBean localeConvertUtils, - ConvertUtilsBean convertUtilsBean, - PropertyUtilsBean propertyUtilsBean) { + final LocaleConvertUtilsBean localeConvertUtils, + final ConvertUtilsBean convertUtilsBean, + final PropertyUtilsBean propertyUtilsBean) { super(convertUtilsBean, propertyUtilsBean); this.localeConvertUtils = localeConvertUtils; } @@ -116,7 +116,7 @@ public class LocaleBeanUtilsBean extends * @param localeConvertUtils use this <code>localeConvertUtils</code> to perform * conversions */ - public LocaleBeanUtilsBean(LocaleConvertUtilsBean localeConvertUtils) { + public LocaleBeanUtilsBean(final LocaleConvertUtilsBean localeConvertUtils) { this.localeConvertUtils = localeConvertUtils; } @@ -146,7 +146,7 @@ public class LocaleBeanUtilsBean extends * * @param locale the default locale */ - public void setDefaultLocale(Locale locale) { + public void setDefaultLocale(final Locale locale) { getLocaleConvertUtils().setDefaultLocale(locale); } @@ -170,7 +170,7 @@ public class LocaleBeanUtilsBean extends * @param newApplyLocalized <code>true</code> if pattern is localized, * otherwise <code>false</code> */ - public void setApplyLocalized(boolean newApplyLocalized) { + public void setApplyLocalized(final boolean newApplyLocalized) { getLocaleConvertUtils().setApplyLocalized(newApplyLocalized); } @@ -199,15 +199,15 @@ public class LocaleBeanUtilsBean extends * propety cannot be found */ public String getIndexedProperty( - Object bean, - String name, - String pattern) + final Object bean, + final String name, + final String pattern) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { - Object value = getPropertyUtils().getIndexedProperty(bean, name); + final Object value = getPropertyUtils().getIndexedProperty(bean, name); return getLocaleConvertUtils().convert(value, pattern); } @@ -232,8 +232,8 @@ public class LocaleBeanUtilsBean extends */ @Override public String getIndexedProperty( - Object bean, - String name) + final Object bean, + final String name) throws IllegalAccessException, InvocationTargetException, @@ -261,12 +261,12 @@ public class LocaleBeanUtilsBean extends * @exception NoSuchMethodException if an accessor method for this * propety cannot be found */ - public String getIndexedProperty(Object bean, - String name, int index, String pattern) + public String getIndexedProperty(final Object bean, + final String name, final int index, final String pattern) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { - Object value = getPropertyUtils().getIndexedProperty(bean, name, index); + final Object value = getPropertyUtils().getIndexedProperty(bean, name, index); return getLocaleConvertUtils().convert(value, pattern); } @@ -290,8 +290,8 @@ public class LocaleBeanUtilsBean extends * propety cannot be found */ @Override - public String getIndexedProperty(Object bean, - String name, int index) + public String getIndexedProperty(final Object bean, + final String name, final int index) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { return getIndexedProperty(bean, name, index, null); @@ -314,11 +314,11 @@ public class LocaleBeanUtilsBean extends * @exception NoSuchMethodException if an accessor method for this * property cannot be found */ - public String getSimpleProperty(Object bean, String name, String pattern) + public String getSimpleProperty(final Object bean, final String name, final String pattern) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { - Object value = getPropertyUtils().getSimpleProperty(bean, name); + final Object value = getPropertyUtils().getSimpleProperty(bean, name); return getLocaleConvertUtils().convert(value, pattern); } @@ -339,7 +339,7 @@ public class LocaleBeanUtilsBean extends * property cannot be found */ @Override - public String getSimpleProperty(Object bean, String name) + public String getSimpleProperty(final Object bean, final String name) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { @@ -366,16 +366,16 @@ public class LocaleBeanUtilsBean extends * property cannot be found */ public String getMappedProperty( - Object bean, - String name, - String key, - String pattern) + final Object bean, + final String name, + final String key, + final String pattern) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { - Object value = getPropertyUtils().getMappedProperty(bean, name, key); + final Object value = getPropertyUtils().getMappedProperty(bean, name, key); return getLocaleConvertUtils().convert(value, pattern); } @@ -398,8 +398,8 @@ public class LocaleBeanUtilsBean extends * property cannot be found */ @Override - public String getMappedProperty(Object bean, - String name, String key) + public String getMappedProperty(final Object bean, + final String name, final String key) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { @@ -429,15 +429,15 @@ public class LocaleBeanUtilsBean extends * property cannot be found */ public String getMappedPropertyLocale( - Object bean, - String name, - String pattern) + final Object bean, + final String name, + final String pattern) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { - Object value = getPropertyUtils().getMappedProperty(bean, name); + final Object value = getPropertyUtils().getMappedProperty(bean, name); return getLocaleConvertUtils().convert(value, pattern); } @@ -464,7 +464,7 @@ public class LocaleBeanUtilsBean extends * property cannot be found */ @Override - public String getMappedProperty(Object bean, String name) + public String getMappedProperty(final Object bean, final String name) throws IllegalAccessException, InvocationTargetException, @@ -493,15 +493,15 @@ public class LocaleBeanUtilsBean extends * property cannot be found */ public String getNestedProperty( - Object bean, - String name, - String pattern) + final Object bean, + final String name, + final String pattern) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { - Object value = getPropertyUtils().getNestedProperty(bean, name); + final Object value = getPropertyUtils().getNestedProperty(bean, name); return getLocaleConvertUtils().convert(value, pattern); } @@ -524,7 +524,7 @@ public class LocaleBeanUtilsBean extends * property cannot be found */ @Override - public String getNestedProperty(Object bean, String name) + public String getNestedProperty(final Object bean, final String name) throws IllegalAccessException, InvocationTargetException, @@ -551,7 +551,7 @@ public class LocaleBeanUtilsBean extends * @exception NoSuchMethodException if an accessor method for this * property cannot be found */ - public String getProperty(Object bean, String name, String pattern) + public String getProperty(final Object bean, final String name, final String pattern) throws IllegalAccessException, InvocationTargetException, @@ -579,7 +579,7 @@ public class LocaleBeanUtilsBean extends * property cannot be found */ @Override - public String getProperty(Object bean, String name) + public String getProperty(final Object bean, final String name) throws IllegalAccessException, InvocationTargetException, @@ -603,7 +603,7 @@ public class LocaleBeanUtilsBean extends * throws an exception */ @Override - public void setProperty(Object bean, String name, Object value) + public void setProperty(final Object bean, final String name, final Object value) throws IllegalAccessException, InvocationTargetException { @@ -627,17 +627,17 @@ public class LocaleBeanUtilsBean extends * throws an exception */ public void setProperty( - Object bean, + final Object bean, String name, - Object value, - String pattern) + final Object value, + final String pattern) throws IllegalAccessException, InvocationTargetException { // Trace logging (if enabled) if (log.isTraceEnabled()) { - StringBuilder sb = new StringBuilder(" setProperty("); + final StringBuilder sb = new StringBuilder(" setProperty("); sb.append(bean); sb.append(", "); sb.append(name); @@ -649,7 +649,7 @@ public class LocaleBeanUtilsBean extends sb.append((String) value); } else if (value instanceof String[]) { - String[] values = (String[]) value; + final String[] values = (String[]) value; sb.append('['); for (int i = 0; i < values.length; i++) { if (i > 0) { @@ -668,12 +668,12 @@ public class LocaleBeanUtilsBean extends // Resolve any nested expression to get the actual target bean Object target = bean; - Resolver resolver = getPropertyUtils().getResolver(); + final Resolver resolver = getPropertyUtils().getResolver(); while (resolver.hasNested(name)) { try { target = getPropertyUtils().getProperty(target, resolver.next(name)); name = resolver.remove(name); - } catch (NoSuchMethodException e) { + } catch (final NoSuchMethodException e) { return; // Skip this property setter } } @@ -683,13 +683,13 @@ public class LocaleBeanUtilsBean extends } // Declare local variables we will require - String propName = resolver.getProperty(name); // Simple name of target property - int index = resolver.getIndex(name); // Indexed subscript value (if any) - String key = resolver.getKey(name); // Mapped key value (if any) + final String propName = resolver.getProperty(name); // Simple name of target property + final int index = resolver.getIndex(name); // Indexed subscript value (if any) + final String key = resolver.getKey(name); // Mapped key value (if any) - Class<?> type = definePropertyType(target, name, propName); + final Class<?> type = definePropertyType(target, name, propName); if (type != null) { - Object newValue = convert(type, index, value, pattern); + final Object newValue = convert(type, index, value, pattern); invokeSetter(target, propName, key, index, newValue); } } @@ -707,14 +707,14 @@ public class LocaleBeanUtilsBean extends * @exception InvocationTargetException if the property accessor method * throws an exception */ - protected Class<?> definePropertyType(Object target, String name, String propName) + protected Class<?> definePropertyType(final Object target, final String name, final String propName) throws IllegalAccessException, InvocationTargetException { Class<?> type = null; // Java type of target property if (target instanceof DynaBean) { - DynaClass dynaClass = ((DynaBean) target).getDynaClass(); - DynaProperty dynaProperty = dynaClass.getDynaProperty(propName); + final DynaClass dynaClass = ((DynaBean) target).getDynaClass(); + final DynaProperty dynaProperty = dynaClass.getDynaProperty(propName); if (dynaProperty == null) { return null; // Skip this property setter } @@ -729,7 +729,7 @@ public class LocaleBeanUtilsBean extends return null; // Skip this property setter } } - catch (NoSuchMethodException e) { + catch (final NoSuchMethodException e) { return null; // Skip this property setter } if (descriptor instanceof MappedPropertyDescriptor) { @@ -757,7 +757,7 @@ public class LocaleBeanUtilsBean extends * @param pattern The conversion pattern * @return The converted value */ - protected Object convert(Class<?> type, int index, Object value, String pattern) { + protected Object convert(final Class<?> type, final int index, final Object value, final String pattern) { if (log.isTraceEnabled()) { log.trace("Converting value '" + value + "' to type:" + type); @@ -767,7 +767,7 @@ public class LocaleBeanUtilsBean extends if (type.isArray() && (index < 0)) { // Scalar value into array if (value instanceof String) { - String[] values = new String[1]; + final String[] values = new String[1]; values[0] = (String) value; newValue = getLocaleConvertUtils().convert(values, type, pattern); } @@ -814,13 +814,13 @@ public class LocaleBeanUtilsBean extends * @param value The value to be converted * @return The converted value */ - protected Object convert(Class<?> type, int index, Object value) { + protected Object convert(final Class<?> type, final int index, final Object value) { Object newValue = null; if (type.isArray() && (index < 0)) { // Scalar value into array if (value instanceof String) { - String[] values = new String[1]; + final String[] values = new String[1]; values[0] = (String) value; newValue = ConvertUtils.convert(values, type); } @@ -873,7 +873,7 @@ public class LocaleBeanUtilsBean extends * @exception InvocationTargetException if the property accessor method * throws an exception */ - protected void invokeSetter(Object target, String propName, String key, int index, Object newValue) + protected void invokeSetter(final Object target, final String propName, final String key, final int index, final Object newValue) throws IllegalAccessException, InvocationTargetException { try { @@ -889,7 +889,7 @@ public class LocaleBeanUtilsBean extends getPropertyUtils().setProperty(target, propName, newValue); } } - catch (NoSuchMethodException e) { + catch (final NoSuchMethodException e) { throw new InvocationTargetException (e, "Cannot set " + propName); } @@ -911,17 +911,17 @@ public class LocaleBeanUtilsBean extends * is no longer used by BeanUtils. */ @Deprecated - protected Descriptor calculate(Object bean, String name) + protected Descriptor calculate(final Object bean, String name) throws IllegalAccessException, InvocationTargetException { // Resolve any nested expression to get the actual target bean Object target = bean; - Resolver resolver = getPropertyUtils().getResolver(); + final Resolver resolver = getPropertyUtils().getResolver(); while (resolver.hasNested(name)) { try { target = getPropertyUtils().getProperty(target, resolver.next(name)); name = resolver.remove(name); - } catch (NoSuchMethodException e) { + } catch (final NoSuchMethodException e) { return null; // Skip this property setter } } @@ -931,9 +931,9 @@ public class LocaleBeanUtilsBean extends } // Declare local variables we will require - String propName = resolver.getProperty(name); // Simple name of target property - int index = resolver.getIndex(name); // Indexed subscript value (if any) - String key = resolver.getKey(name); // Mapped key value (if any) + final String propName = resolver.getProperty(name); // Simple name of target property + final int index = resolver.getIndex(name); // Indexed subscript value (if any) + final String key = resolver.getKey(name); // Mapped key value (if any) return new Descriptor(target, name, propName, key, index); } @@ -961,7 +961,7 @@ public class LocaleBeanUtilsBean extends * @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); @@ -984,7 +984,7 @@ public class LocaleBeanUtilsBean extends * * @param target The target bean */ - public void setTarget(Object target) { + public void setTarget(final Object target) { this.target = target; } @@ -1002,7 +1002,7 @@ public class LocaleBeanUtilsBean extends * * @param key The mapped property key (if any) */ - public void setKey(String key) { + public void setKey(final String key) { this.key = key; } @@ -1020,7 +1020,7 @@ public class LocaleBeanUtilsBean extends * * @param index The indexed property index (if any) */ - public void setIndex(int index) { + public void setIndex(final int index) { this.index = index; } @@ -1038,7 +1038,7 @@ public class LocaleBeanUtilsBean extends * * @param name The property name (includes indexed/mapped expr) */ - public void setName(String name) { + public void setName(final String name) { this.name = name; } @@ -1056,7 +1056,7 @@ public class LocaleBeanUtilsBean extends * * @param propName The property name */ - public void setPropName(String propName) { + public void setPropName(final String propName) { this.propName = propName; } }
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java Wed Oct 15 20:15:17 2014 @@ -58,7 +58,7 @@ public class LocaleConvertUtils { * @param locale the default locale * @see LocaleConvertUtilsBean#setDefaultLocale(Locale) */ - public static void setDefaultLocale(Locale locale) { + public static void setDefaultLocale(final Locale locale) { LocaleConvertUtilsBean.getInstance().setDefaultLocale(locale); } @@ -85,7 +85,7 @@ public class LocaleConvertUtils { * otherwise <code>false</code> * @see LocaleConvertUtilsBean#setApplyLocalized(boolean) */ - public static void setApplyLocalized(boolean newApplyLocalized) { + public static void setApplyLocalized(final boolean newApplyLocalized) { LocaleConvertUtilsBean.getInstance().setApplyLocalized(newApplyLocalized); } @@ -100,7 +100,7 @@ public class LocaleConvertUtils { * @return the converted value * @see LocaleConvertUtilsBean#convert(Object) */ - public static String convert(Object value) { + public static String convert(final Object value) { return LocaleConvertUtilsBean.getInstance().convert(value); } @@ -115,7 +115,7 @@ public class LocaleConvertUtils { * @return the converted value * @see LocaleConvertUtilsBean#convert(Object, String) */ - public static String convert(Object value, String pattern) { + public static String convert(final Object value, final String pattern) { return LocaleConvertUtilsBean.getInstance().convert(value, pattern); } @@ -131,7 +131,7 @@ public class LocaleConvertUtils { * @return the converted value * @see LocaleConvertUtilsBean#convert(Object, Locale, String) */ - public static String convert(Object value, Locale locale, String pattern) { + public static String convert(final Object value, final Locale locale, final String pattern) { return LocaleConvertUtilsBean.getInstance().convert(value, locale, pattern); } @@ -147,7 +147,7 @@ public class LocaleConvertUtils { * @return the converted value * @see LocaleConvertUtilsBean#convert(String, Class) */ - public static Object convert(String value, Class<?> clazz) { + public static Object convert(final String value, final Class<?> clazz) { return LocaleConvertUtilsBean.getInstance().convert(value, clazz); } @@ -165,7 +165,7 @@ public class LocaleConvertUtils { * @return the converted value * @see LocaleConvertUtilsBean#convert(String, Class, String) */ - public static Object convert(String value, Class<?> clazz, String pattern) { + public static Object convert(final String value, final Class<?> clazz, final String pattern) { return LocaleConvertUtilsBean.getInstance().convert(value, clazz, pattern); } @@ -184,7 +184,7 @@ public class LocaleConvertUtils { * @return the converted value * @see LocaleConvertUtilsBean#convert(String, Class, Locale, String) */ - public static Object convert(String value, Class<?> clazz, Locale locale, String pattern) { + public static Object convert(final String value, final Class<?> clazz, final Locale locale, final String pattern) { return LocaleConvertUtilsBean.getInstance().convert(value, clazz, locale, pattern); } @@ -201,7 +201,7 @@ public class LocaleConvertUtils { * @return the converted value * @see LocaleConvertUtilsBean#convert(String[], Class, String) */ - public static Object convert(String[] values, Class<?> clazz, String pattern) { + public static Object convert(final String[] values, final Class<?> clazz, final String pattern) { return LocaleConvertUtilsBean.getInstance().convert(values, clazz, pattern); } @@ -217,7 +217,7 @@ public class LocaleConvertUtils { * @return the converted value * @see LocaleConvertUtilsBean#convert(String[], Class) */ - public static Object convert(String[] values, Class<?> clazz) { + public static Object convert(final String[] values, final Class<?> clazz) { return LocaleConvertUtilsBean.getInstance().convert(values, clazz); } @@ -235,7 +235,7 @@ public class LocaleConvertUtils { * @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(final String[] values, final Class<?> clazz, final Locale locale, final String pattern) { return LocaleConvertUtilsBean.getInstance().convert(values, clazz, locale, pattern); } @@ -252,7 +252,7 @@ public class LocaleConvertUtils { * @param locale The locale * @see LocaleConvertUtilsBean#register(LocaleConverter, Class, Locale) */ - public static void register(LocaleConverter converter, Class<?> clazz, Locale locale) { + public static void register(final LocaleConverter converter, final Class<?> clazz, final Locale locale) { LocaleConvertUtilsBean.getInstance().register(converter, clazz, locale); } @@ -278,7 +278,7 @@ public class LocaleConvertUtils { * @param locale The locale * @see LocaleConvertUtilsBean#deregister(Locale) */ - public static void deregister(Locale locale) { + public static void deregister(final Locale locale) { LocaleConvertUtilsBean.getInstance().deregister(locale); } @@ -293,7 +293,7 @@ public class LocaleConvertUtils { * @param locale The locale * @see LocaleConvertUtilsBean#deregister(Class, Locale) */ - public static void deregister(Class<?> clazz, Locale locale) { + public static void deregister(final Class<?> clazz, final Locale locale) { LocaleConvertUtilsBean.getInstance().deregister(clazz, locale); } @@ -310,7 +310,7 @@ public class LocaleConvertUtils { * @return The registered locale Converter, if any * @see LocaleConvertUtilsBean#lookup(Class, Locale) */ - public static LocaleConverter lookup(Class<?> clazz, Locale locale) { + public static LocaleConverter lookup(final Class<?> clazz, final Locale locale) { return LocaleConvertUtilsBean.getInstance().lookup(clazz, locale); } @@ -327,7 +327,7 @@ public class LocaleConvertUtils { * @deprecated This method will be modified to return a Map in the next release. */ @Deprecated - protected static FastHashMap lookup(Locale locale) { + protected static FastHashMap lookup(final Locale locale) { return LocaleConvertUtilsBean.getInstance().lookup(locale); } @@ -343,7 +343,7 @@ public class LocaleConvertUtils { * @deprecated This method will be modified to return a Map in the next release. */ @Deprecated - protected static FastHashMap create(Locale locale) { + protected static FastHashMap create(final Locale locale) { return LocaleConvertUtilsBean.getInstance().create(locale); } Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java Wed Oct 15 20:15:17 2014 @@ -137,7 +137,7 @@ public class LocaleConvertUtilsBean { * setter for defaultLocale. * @param locale the default locale */ - public void setDefaultLocale(Locale locale) { + public void setDefaultLocale(final Locale locale) { if (locale == null) { defaultLocale = Locale.getDefault(); @@ -163,7 +163,7 @@ public class LocaleConvertUtilsBean { * @param newApplyLocalized <code>true</code> if pattern is localized, * otherwise <code>false</code> */ - public void setApplyLocalized(boolean newApplyLocalized) { + public void setApplyLocalized(final boolean newApplyLocalized) { applyLocalized = newApplyLocalized; } @@ -178,7 +178,7 @@ public class LocaleConvertUtilsBean { * @throws org.apache.commons.beanutils.ConversionException if thrown by an * underlying Converter */ - public String convert(Object value) { + public String convert(final Object value) { return convert(value, defaultLocale, null); } @@ -193,7 +193,7 @@ public class LocaleConvertUtilsBean { * @throws org.apache.commons.beanutils.ConversionException if thrown by an * underlying Converter */ - public String convert(Object value, String pattern) { + public String convert(final Object value, final String pattern) { return convert(value, defaultLocale, pattern); } @@ -209,9 +209,9 @@ public class LocaleConvertUtilsBean { * @throws org.apache.commons.beanutils.ConversionException if thrown by an * underlying Converter */ - public String convert(Object value, Locale locale, String pattern) { + public String convert(final Object value, final Locale locale, final String pattern) { - LocaleConverter converter = lookup(String.class, locale); + final LocaleConverter converter = lookup(String.class, locale); return converter.convert(String.class, value, pattern); } @@ -227,7 +227,7 @@ public class LocaleConvertUtilsBean { * @throws org.apache.commons.beanutils.ConversionException if thrown by an * underlying Converter */ - public Object convert(String value, Class<?> clazz) { + public Object convert(final String value, final Class<?> clazz) { return convert(value, clazz, defaultLocale, null); } @@ -245,7 +245,7 @@ public class LocaleConvertUtilsBean { * @throws org.apache.commons.beanutils.ConversionException if thrown by an * underlying Converter */ - public Object convert(String value, Class<?> clazz, String pattern) { + public Object convert(final String value, final Class<?> clazz, final String pattern) { return convert(value, clazz, defaultLocale, pattern); } @@ -264,7 +264,7 @@ public class LocaleConvertUtilsBean { * @throws org.apache.commons.beanutils.ConversionException if thrown by an * underlying Converter */ - public Object convert(String value, Class<?> clazz, Locale locale, String pattern) { + public Object convert(final String value, final Class<?> clazz, final Locale locale, final String pattern) { if (log.isDebugEnabled()) { log.debug("Convert string " + value + " to class " + @@ -298,7 +298,7 @@ public class LocaleConvertUtilsBean { * @throws org.apache.commons.beanutils.ConversionException if thrown by an * underlying Converter */ - public Object convert(String[] values, Class<?> clazz, String pattern) { + public Object convert(final String[] values, final Class<?> clazz, final String pattern) { return convert(values, clazz, getDefaultLocale(), pattern); } @@ -314,7 +314,7 @@ public class LocaleConvertUtilsBean { * @throws org.apache.commons.beanutils.ConversionException if thrown by an * underlying Converter */ - public Object convert(String[] values, Class<?> clazz) { + public Object convert(final String[] values, final Class<?> clazz) { return convert(values, clazz, getDefaultLocale(), null); } @@ -332,7 +332,7 @@ public class LocaleConvertUtilsBean { * @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(final String[] values, final Class<?> clazz, final Locale locale, final String pattern) { Class<?> type = clazz; if (clazz.isArray()) { @@ -344,7 +344,7 @@ public class LocaleConvertUtilsBean { " locale and " + pattern + " pattern"); } - Object array = Array.newInstance(type, values.length); + final Object array = Array.newInstance(type, values.length); for (int i = 0; i < values.length; i++) { Array.set(array, i, convert(values[i], type, locale, pattern)); } @@ -361,7 +361,7 @@ public class LocaleConvertUtilsBean { * Converter * @param locale The locale */ - public void register(LocaleConverter converter, Class<?> clazz, Locale locale) { + public void register(final LocaleConverter converter, final Class<?> clazz, final Locale locale) { lookup(locale).put(clazz, converter); } @@ -371,7 +371,7 @@ public class LocaleConvertUtilsBean { */ public void deregister() { - FastHashMap defaultConverter = lookup(defaultLocale); + final FastHashMap defaultConverter = lookup(defaultLocale); mapConverters.setFast(false); @@ -387,7 +387,7 @@ public class LocaleConvertUtilsBean { * * @param locale The locale */ - public void deregister(Locale locale) { + public void deregister(final Locale locale) { mapConverters.remove(locale); } @@ -399,7 +399,7 @@ public class LocaleConvertUtilsBean { * @param clazz Class for which to remove a registered Converter * @param locale The locale */ - public void deregister(Class<?> clazz, Locale locale) { + public void deregister(final Class<?> clazz, final Locale locale) { lookup(locale).remove(clazz); } @@ -413,9 +413,9 @@ public class LocaleConvertUtilsBean { * @param locale The Locale * @return The registered locale Converter, if any */ - public LocaleConverter lookup(Class<?> clazz, Locale locale) { + public LocaleConverter lookup(final Class<?> clazz, final Locale locale) { - LocaleConverter converter = (LocaleConverter) lookup(locale).get(clazz); + final LocaleConverter converter = (LocaleConverter) lookup(locale).get(clazz); if (log.isTraceEnabled()) { log.trace("LocaleConverter:" + converter); @@ -434,7 +434,7 @@ public class LocaleConvertUtilsBean { * @deprecated This method will be modified to return a Map in the next release. */ @Deprecated - protected FastHashMap lookup(Locale locale) { + protected FastHashMap lookup(final Locale locale) { FastHashMap localeConverters; if (locale == null) { @@ -461,9 +461,9 @@ public class LocaleConvertUtilsBean { * @deprecated This method will be modified to return a Map in the next release. */ @Deprecated - protected FastHashMap create(Locale locale) { + protected FastHashMap create(final Locale locale) { - FastHashMap converter = new DelegateFastHashMap(BeanUtils.createCache()); + final FastHashMap converter = new DelegateFastHashMap(BeanUtils.createCache()); converter.setFast(false); converter.put(BigDecimal.class, new BigDecimalLocaleConverter(locale, applyLocalized)); @@ -514,7 +514,7 @@ public class LocaleConvertUtilsBean { private final Map<Object, Object> map; - private DelegateFastHashMap(Map<Object, Object> map) { + private DelegateFastHashMap(final Map<Object, Object> map) { this.map = map; } @Override @@ -522,11 +522,11 @@ public class LocaleConvertUtilsBean { map.clear(); } @Override - public boolean containsKey(Object key) { + public boolean containsKey(final Object key) { return map.containsKey(key); } @Override - public boolean containsValue(Object value) { + public boolean containsValue(final Object value) { return map.containsValue(value); } @Override @@ -534,11 +534,11 @@ public class LocaleConvertUtilsBean { return map.entrySet(); } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { return map.equals(o); } @Override - public Object get(Object key) { + public Object get(final Object key) { return map.get(key); } @Override @@ -554,18 +554,18 @@ public class LocaleConvertUtilsBean { return map.keySet(); } @Override - public Object put(Object key, Object value) { + public Object put(final Object key, final Object value) { return map.put(key, value); } @SuppressWarnings({ "rawtypes", "unchecked" }) // we operate on very generic types (<Object, Object>), so there is // no need for doing type checks @Override - public void putAll(Map m) { + public void putAll(final Map m) { map.putAll(m); } @Override - public Object remove(Object key) { + public Object remove(final Object key) { return map.remove(key); } @Override @@ -581,7 +581,7 @@ public class LocaleConvertUtilsBean { return BeanUtils.getCacheFast(map); } @Override - public void setFast(boolean fast) { + public void setFast(final boolean fast) { BeanUtils.setCacheFast(map, fast); } } Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java Wed Oct 15 20:15:17 2014 @@ -58,7 +58,7 @@ public class BigDecimalLocaleConverter e * * @param locPattern Indicate whether the pattern is localized or not */ - public BigDecimalLocaleConverter(boolean locPattern) { + public BigDecimalLocaleConverter(final boolean locPattern) { this(Locale.getDefault(), locPattern); } @@ -70,7 +70,7 @@ public class BigDecimalLocaleConverter e * * @param locale The locale */ - public BigDecimalLocaleConverter(Locale locale) { + public BigDecimalLocaleConverter(final Locale locale) { this(locale, false); } @@ -83,7 +83,7 @@ public class BigDecimalLocaleConverter e * @param locale The locale * @param locPattern Indicate whether the pattern is localized or not */ - public BigDecimalLocaleConverter(Locale locale, boolean locPattern) { + public BigDecimalLocaleConverter(final Locale locale, final boolean locPattern) { this(locale, (String) null, locPattern); } @@ -96,7 +96,7 @@ public class BigDecimalLocaleConverter e * @param locale The locale * @param pattern The convertion pattern */ - public BigDecimalLocaleConverter(Locale locale, String pattern) { + public BigDecimalLocaleConverter(final Locale locale, final String pattern) { this(locale, pattern, false); } @@ -110,7 +110,7 @@ public class BigDecimalLocaleConverter e * @param pattern The convertion pattern * @param locPattern Indicate whether the pattern is localized or not */ - public BigDecimalLocaleConverter(Locale locale, String pattern, boolean locPattern) { + public BigDecimalLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) { super(locale, pattern, locPattern); } @@ -124,7 +124,7 @@ public class BigDecimalLocaleConverter e * * @param defaultValue The default value to be returned */ - public BigDecimalLocaleConverter(Object defaultValue) { + public BigDecimalLocaleConverter(final Object defaultValue) { this(defaultValue, false); } @@ -138,7 +138,7 @@ public class BigDecimalLocaleConverter e * @param defaultValue The default value to be returned * @param locPattern Indicate whether the pattern is localized or not */ - public BigDecimalLocaleConverter(Object defaultValue, boolean locPattern) { + public BigDecimalLocaleConverter(final Object defaultValue, final boolean locPattern) { this(defaultValue, Locale.getDefault(), locPattern); } @@ -151,7 +151,7 @@ public class BigDecimalLocaleConverter e * @param defaultValue The default value to be returned * @param locale The locale */ - public BigDecimalLocaleConverter(Object defaultValue, Locale locale) { + public BigDecimalLocaleConverter(final Object defaultValue, final Locale locale) { this(defaultValue, locale, false); } @@ -165,7 +165,7 @@ public class BigDecimalLocaleConverter e * @param locale The locale * @param locPattern Indicate whether the pattern is localized or not */ - public BigDecimalLocaleConverter(Object defaultValue, Locale locale, boolean locPattern) { + public BigDecimalLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) { this(defaultValue, locale, null, locPattern); } @@ -179,7 +179,7 @@ public class BigDecimalLocaleConverter e * @param locale The locale * @param pattern The convertion pattern */ - public BigDecimalLocaleConverter(Object defaultValue, Locale locale, String pattern) { + public BigDecimalLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) { this(defaultValue, locale, pattern, false); } @@ -194,7 +194,7 @@ public class BigDecimalLocaleConverter e * @param pattern The convertion pattern * @param locPattern Indicate whether the pattern is localized or not */ - public BigDecimalLocaleConverter(Object defaultValue, Locale locale, String pattern, boolean locPattern) { + public BigDecimalLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) { super(defaultValue, locale, pattern, locPattern); } @@ -213,9 +213,9 @@ public class BigDecimalLocaleConverter e * @since 1.8.0 */ @Override - protected Object parse(Object value, String pattern) throws ParseException { + protected Object parse(final Object value, final String pattern) throws ParseException { - Object result = super.parse(value, pattern); + final Object result = super.parse(value, pattern); if (result == null || result instanceof BigDecimal) { return result; @@ -224,7 +224,7 @@ public class BigDecimalLocaleConverter e try { return new BigDecimal(result.toString()); } - catch (NumberFormatException ex) { + catch (final NumberFormatException ex) { throw new ConversionException("Suplied number is not of type BigDecimal: " + result); } Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java Wed Oct 15 20:15:17 2014 @@ -59,7 +59,7 @@ public class BigIntegerLocaleConverter e * * @param locPattern Indicate whether the pattern is localized or not */ - public BigIntegerLocaleConverter(boolean locPattern) { + public BigIntegerLocaleConverter(final boolean locPattern) { this(Locale.getDefault(), locPattern); } @@ -71,7 +71,7 @@ public class BigIntegerLocaleConverter e * * @param locale The locale */ - public BigIntegerLocaleConverter(Locale locale) { + public BigIntegerLocaleConverter(final Locale locale) { this(locale, false); } @@ -84,7 +84,7 @@ public class BigIntegerLocaleConverter e * @param locale The locale * @param locPattern Indicate whether the pattern is localized or not */ - public BigIntegerLocaleConverter(Locale locale, boolean locPattern) { + public BigIntegerLocaleConverter(final Locale locale, final boolean locPattern) { this(locale, (String) null, locPattern); } @@ -97,7 +97,7 @@ public class BigIntegerLocaleConverter e * @param locale The locale * @param pattern The convertion pattern */ - public BigIntegerLocaleConverter(Locale locale, String pattern) { + public BigIntegerLocaleConverter(final Locale locale, final String pattern) { this(locale, pattern, false); } @@ -111,7 +111,7 @@ public class BigIntegerLocaleConverter e * @param pattern The convertion pattern * @param locPattern Indicate whether the pattern is localized or not */ - public BigIntegerLocaleConverter(Locale locale, String pattern, boolean locPattern) { + public BigIntegerLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) { super(locale, pattern, locPattern); } @@ -125,7 +125,7 @@ public class BigIntegerLocaleConverter e * * @param defaultValue The default value to be returned */ - public BigIntegerLocaleConverter(Object defaultValue) { + public BigIntegerLocaleConverter(final Object defaultValue) { this(defaultValue, false); } @@ -139,7 +139,7 @@ public class BigIntegerLocaleConverter e * @param defaultValue The default value to be returned * @param locPattern Indicate whether the pattern is localized or not */ - public BigIntegerLocaleConverter(Object defaultValue, boolean locPattern) { + public BigIntegerLocaleConverter(final Object defaultValue, final boolean locPattern) { this(defaultValue, Locale.getDefault(), locPattern); } @@ -152,7 +152,7 @@ public class BigIntegerLocaleConverter e * @param defaultValue The default value to be returned * @param locale The locale */ - public BigIntegerLocaleConverter(Object defaultValue, Locale locale) { + public BigIntegerLocaleConverter(final Object defaultValue, final Locale locale) { this(defaultValue, locale, false); } @@ -166,7 +166,7 @@ public class BigIntegerLocaleConverter e * @param locale The locale * @param locPattern Indicate whether the pattern is localized or not */ - public BigIntegerLocaleConverter(Object defaultValue, Locale locale, boolean locPattern) { + public BigIntegerLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) { this(defaultValue, locale, null, locPattern); } @@ -180,7 +180,7 @@ public class BigIntegerLocaleConverter e * @param locale The locale * @param pattern The convertion pattern */ - public BigIntegerLocaleConverter(Object defaultValue, Locale locale, String pattern) { + public BigIntegerLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) { this(defaultValue, locale, pattern, false); } @@ -195,7 +195,7 @@ public class BigIntegerLocaleConverter e * @param pattern The convertion pattern * @param locPattern Indicate whether the pattern is localized or not */ - public BigIntegerLocaleConverter(Object defaultValue, Locale locale, String pattern, boolean locPattern) { + public BigIntegerLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) { super(defaultValue, locale, pattern, locPattern); } @@ -214,9 +214,9 @@ public class BigIntegerLocaleConverter e * @since 1.8.0 */ @Override - protected Object parse(Object value, String pattern) throws ParseException { + protected Object parse(final Object value, final String pattern) throws ParseException { - Object result = super.parse(value, pattern); + final Object result = super.parse(value, pattern); if (result == null || result instanceof BigInteger) { return result; @@ -229,7 +229,7 @@ public class BigIntegerLocaleConverter e try { return new BigInteger(result.toString()); } - catch (NumberFormatException ex) { + catch (final NumberFormatException ex) { throw new ConversionException("Suplied number is not of type BigInteger: " + result); } Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.java Wed Oct 15 20:15:17 2014 @@ -60,7 +60,7 @@ public class ByteLocaleConverter extends * * @param locPattern Indicate whether the pattern is localized or not */ - public ByteLocaleConverter(boolean locPattern) { + public ByteLocaleConverter(final boolean locPattern) { this(Locale.getDefault(), locPattern); } @@ -72,7 +72,7 @@ public class ByteLocaleConverter extends * * @param locale The locale */ - public ByteLocaleConverter(Locale locale) { + public ByteLocaleConverter(final Locale locale) { this(locale, false); } @@ -85,7 +85,7 @@ public class ByteLocaleConverter extends * @param locale The locale * @param locPattern Indicate whether the pattern is localized or not */ - public ByteLocaleConverter(Locale locale, boolean locPattern) { + public ByteLocaleConverter(final Locale locale, final boolean locPattern) { this(locale, (String) null, locPattern); } @@ -98,7 +98,7 @@ public class ByteLocaleConverter extends * @param locale The locale * @param pattern The convertion pattern */ - public ByteLocaleConverter(Locale locale, String pattern) { + public ByteLocaleConverter(final Locale locale, final String pattern) { this(locale, pattern, false); } @@ -112,7 +112,7 @@ public class ByteLocaleConverter extends * @param pattern The convertion pattern * @param locPattern Indicate whether the pattern is localized or not */ - public ByteLocaleConverter(Locale locale, String pattern, boolean locPattern) { + public ByteLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) { super(locale, pattern, locPattern); } @@ -126,7 +126,7 @@ public class ByteLocaleConverter extends * * @param defaultValue The default value to be returned */ - public ByteLocaleConverter(Object defaultValue) { + public ByteLocaleConverter(final Object defaultValue) { this(defaultValue, false); } @@ -140,7 +140,7 @@ public class ByteLocaleConverter extends * @param defaultValue The default value to be returned * @param locPattern Indicate whether the pattern is localized or not */ - public ByteLocaleConverter(Object defaultValue, boolean locPattern) { + public ByteLocaleConverter(final Object defaultValue, final boolean locPattern) { this(defaultValue, Locale.getDefault(), locPattern); } @@ -153,7 +153,7 @@ public class ByteLocaleConverter extends * @param defaultValue The default value to be returned * @param locale The locale */ - public ByteLocaleConverter(Object defaultValue, Locale locale) { + public ByteLocaleConverter(final Object defaultValue, final Locale locale) { this(defaultValue, locale, false); } @@ -167,7 +167,7 @@ public class ByteLocaleConverter extends * @param locale The locale * @param locPattern Indicate whether the pattern is localized or not */ - public ByteLocaleConverter(Object defaultValue, Locale locale, boolean locPattern) { + public ByteLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) { this(defaultValue, locale, null, locPattern); } @@ -181,7 +181,7 @@ public class ByteLocaleConverter extends * @param locale The locale * @param pattern The convertion pattern */ - public ByteLocaleConverter(Object defaultValue, Locale locale, String pattern) { + public ByteLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) { this(defaultValue, locale, pattern, false); } @@ -196,7 +196,7 @@ public class ByteLocaleConverter extends * @param pattern The convertion pattern * @param locPattern Indicate whether the pattern is localized or not */ - public ByteLocaleConverter(Object defaultValue, Locale locale, String pattern, boolean locPattern) { + public ByteLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) { super(defaultValue, locale, pattern, locPattern); } @@ -214,7 +214,7 @@ public class ByteLocaleConverter extends * @throws ParseException if an error occurs parsing a String to a Number */ @Override - protected Object parse(Object value, String pattern) throws ParseException { + protected Object parse(final Object value, final String pattern) throws ParseException { final Number parsed = (Number) super.parse(value, pattern); if (parsed.longValue() != parsed.byteValue()) { throw new ConversionException("Supplied number is not of type Byte: " + parsed.longValue()); Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java Wed Oct 15 20:15:17 2014 @@ -80,7 +80,7 @@ public class DateLocaleConverter extends * * @param locPattern Indicate whether the pattern is localized or not */ - public DateLocaleConverter(boolean locPattern) { + public DateLocaleConverter(final boolean locPattern) { this(Locale.getDefault(), locPattern); } @@ -92,7 +92,7 @@ public class DateLocaleConverter extends * * @param locale The locale */ - public DateLocaleConverter(Locale locale) { + public DateLocaleConverter(final Locale locale) { this(locale, false); } @@ -105,7 +105,7 @@ public class DateLocaleConverter extends * @param locale The locale * @param locPattern Indicate whether the pattern is localized or not */ - public DateLocaleConverter(Locale locale, boolean locPattern) { + public DateLocaleConverter(final Locale locale, final boolean locPattern) { this(locale, (String) null, locPattern); } @@ -118,7 +118,7 @@ public class DateLocaleConverter extends * @param locale The locale * @param pattern The convertion pattern */ - public DateLocaleConverter(Locale locale, String pattern) { + public DateLocaleConverter(final Locale locale, final String pattern) { this(locale, pattern, false); } @@ -132,7 +132,7 @@ public class DateLocaleConverter extends * @param pattern The convertion pattern * @param locPattern Indicate whether the pattern is localized or not */ - public DateLocaleConverter(Locale locale, String pattern, boolean locPattern) { + public DateLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) { super(locale, pattern, locPattern); } @@ -146,7 +146,7 @@ public class DateLocaleConverter extends * * @param defaultValue The default value to be returned */ - public DateLocaleConverter(Object defaultValue) { + public DateLocaleConverter(final Object defaultValue) { this(defaultValue, false); } @@ -160,7 +160,7 @@ public class DateLocaleConverter extends * @param defaultValue The default value to be returned * @param locPattern Indicate whether the pattern is localized or not */ - public DateLocaleConverter(Object defaultValue, boolean locPattern) { + public DateLocaleConverter(final Object defaultValue, final boolean locPattern) { this(defaultValue, Locale.getDefault(), locPattern); } @@ -173,7 +173,7 @@ public class DateLocaleConverter extends * @param defaultValue The default value to be returned * @param locale The locale */ - public DateLocaleConverter(Object defaultValue, Locale locale) { + public DateLocaleConverter(final Object defaultValue, final Locale locale) { this(defaultValue, locale, false); } @@ -187,7 +187,7 @@ public class DateLocaleConverter extends * @param locale The locale * @param locPattern Indicate whether the pattern is localized or not */ - public DateLocaleConverter(Object defaultValue, Locale locale, boolean locPattern) { + public DateLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) { this(defaultValue, locale, null, locPattern); } @@ -202,7 +202,7 @@ public class DateLocaleConverter extends * @param locale The locale * @param pattern The convertion pattern */ - public DateLocaleConverter(Object defaultValue, Locale locale, String pattern) { + public DateLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) { this(defaultValue, locale, pattern, false); } @@ -217,7 +217,7 @@ public class DateLocaleConverter extends * @param pattern The convertion pattern * @param locPattern Indicate whether the pattern is localized or not */ - public DateLocaleConverter(Object defaultValue, Locale locale, String pattern, boolean locPattern) { + public DateLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) { super(defaultValue, locale, pattern, locPattern); } @@ -240,7 +240,7 @@ public class DateLocaleConverter extends * @param lenient true if the <code>DateFormat</code> used for formatting should be lenient * @see java.text.DateFormat#setLenient */ - public void setLenient(boolean lenient) { + public void setLenient(final boolean lenient) { isLenient = lenient; } @@ -259,7 +259,7 @@ public class DateLocaleConverter extends * @throws ParseException if an error occurs parsing */ @Override - protected Object parse(Object value, String pattern) throws ParseException { + protected Object parse(final Object value, String pattern) throws ParseException { // Handle Date if (value instanceof java.util.Date) { @@ -276,15 +276,15 @@ public class DateLocaleConverter extends } // Create Formatter - use default if pattern is null - DateFormat formatter = pattern == null ? DateFormat.getDateInstance(DateFormat.SHORT, locale) + final DateFormat formatter = pattern == null ? DateFormat.getDateInstance(DateFormat.SHORT, locale) : new SimpleDateFormat(pattern, locale); formatter.setLenient(isLenient); // Parse the Date - ParsePosition pos = new ParsePosition(0); - String strValue = value.toString(); - Object parsedValue = formatter.parseObject(strValue, pos); + final ParsePosition pos = new ParsePosition(0); + final String strValue = value.toString(); + final Object parsedValue = formatter.parseObject(strValue, pos); if (pos.getErrorIndex() > -1) { throw new ConversionException("Error parsing date '" + value + "' at position="+ pos.getErrorIndex()); @@ -304,7 +304,7 @@ public class DateLocaleConverter extends * @param localizedPattern The pattern in 'local' symbol format * @return pattern in 'default' symbol format */ - private String convertLocalizedPattern(String localizedPattern, Locale locale) { + private String convertLocalizedPattern(final String localizedPattern, final Locale locale) { if (localizedPattern == null) { return null; @@ -315,8 +315,8 @@ public class DateLocaleConverter extends // that works with some 1.4 series JVM. // Get the symbols for the localized pattern - DateFormatSymbols localizedSymbols = new DateFormatSymbols(locale); - String localChars = localizedSymbols.getLocalPatternChars(); + final DateFormatSymbols localizedSymbols = new DateFormatSymbols(locale); + final String localChars = localizedSymbols.getLocalPatternChars(); if (DEFAULT_PATTERN_CHARS.equals(localChars)) { return localizedPattern; @@ -328,7 +328,7 @@ public class DateLocaleConverter extends convertedPattern = convertPattern(localizedPattern, localChars, DEFAULT_PATTERN_CHARS); - } catch (Exception ex) { + } catch (final Exception ex) { log.debug("Converting pattern '" + localizedPattern + "' for " + locale, ex); } return convertedPattern; @@ -337,9 +337,9 @@ public class DateLocaleConverter extends /** * <p>Converts a Pattern from one character set to another.</p> */ - private String convertPattern(String pattern, String fromChars, String toChars) { + private String convertPattern(final String pattern, final String fromChars, final String toChars) { - StringBuilder converted = new StringBuilder(); + final StringBuilder converted = new StringBuilder(); boolean quoted = false; for (int i = 0; i < pattern.length(); ++i) { @@ -353,7 +353,7 @@ public class DateLocaleConverter extends quoted = true; } else if ((thisChar >= 'a' && thisChar <= 'z') || (thisChar >= 'A' && thisChar <= 'Z')) { - int index = fromChars.indexOf(thisChar ); + final int index = fromChars.indexOf(thisChar ); if (index == -1) { throw new IllegalArgumentException( "Illegal pattern character '" + thisChar + "'"); @@ -377,7 +377,7 @@ public class DateLocaleConverter extends * this data should just read that constant. */ private static String initDefaultChars() { - DateFormatSymbols defaultSymbols = new DateFormatSymbols(Locale.US); + final DateFormatSymbols defaultSymbols = new DateFormatSymbols(Locale.US); return defaultSymbols.getLocalPatternChars(); } Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java Wed Oct 15 20:15:17 2014 @@ -69,7 +69,7 @@ public class DecimalLocaleConverter exte * * @param locPattern Indicate whether the pattern is localized or not */ - public DecimalLocaleConverter(boolean locPattern) { + public DecimalLocaleConverter(final boolean locPattern) { this(Locale.getDefault(), locPattern); } @@ -81,7 +81,7 @@ public class DecimalLocaleConverter exte * * @param locale The locale */ - public DecimalLocaleConverter(Locale locale) { + public DecimalLocaleConverter(final Locale locale) { this(locale, false); } @@ -94,7 +94,7 @@ public class DecimalLocaleConverter exte * @param locale The locale * @param locPattern Indicate whether the pattern is localized or not */ - public DecimalLocaleConverter(Locale locale, boolean locPattern) { + public DecimalLocaleConverter(final Locale locale, final boolean locPattern) { this(locale, (String) null, locPattern); } @@ -107,7 +107,7 @@ public class DecimalLocaleConverter exte * @param locale The locale * @param pattern The convertion pattern */ - public DecimalLocaleConverter(Locale locale, String pattern) { + public DecimalLocaleConverter(final Locale locale, final String pattern) { this(locale, pattern, false); } @@ -121,7 +121,7 @@ public class DecimalLocaleConverter exte * @param pattern The convertion pattern * @param locPattern Indicate whether the pattern is localized or not */ - public DecimalLocaleConverter(Locale locale, String pattern, boolean locPattern) { + public DecimalLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) { super(locale, pattern, locPattern); } @@ -135,7 +135,7 @@ public class DecimalLocaleConverter exte * * @param defaultValue The default value to be returned */ - public DecimalLocaleConverter(Object defaultValue) { + public DecimalLocaleConverter(final Object defaultValue) { this(defaultValue, false); } @@ -149,7 +149,7 @@ public class DecimalLocaleConverter exte * @param defaultValue The default value to be returned * @param locPattern Indicate whether the pattern is localized or not */ - public DecimalLocaleConverter(Object defaultValue, boolean locPattern) { + public DecimalLocaleConverter(final Object defaultValue, final boolean locPattern) { this(defaultValue, Locale.getDefault(), locPattern); } @@ -162,7 +162,7 @@ public class DecimalLocaleConverter exte * @param defaultValue The default value to be returned * @param locale The locale */ - public DecimalLocaleConverter(Object defaultValue, Locale locale) { + public DecimalLocaleConverter(final Object defaultValue, final Locale locale) { this(defaultValue, locale, false); } @@ -176,7 +176,7 @@ public class DecimalLocaleConverter exte * @param locale The locale * @param locPattern Indicate whether the pattern is localized or not */ - public DecimalLocaleConverter(Object defaultValue, Locale locale, boolean locPattern) { + public DecimalLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) { this(defaultValue, locale, null, locPattern); } @@ -190,7 +190,7 @@ public class DecimalLocaleConverter exte * @param locale The locale * @param pattern The convertion pattern */ - public DecimalLocaleConverter(Object defaultValue, Locale locale, String pattern) { + public DecimalLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) { this(defaultValue, locale, pattern, false); } @@ -205,7 +205,7 @@ public class DecimalLocaleConverter exte * @param pattern The convertion pattern * @param locPattern Indicate whether the pattern is localized or not */ - public DecimalLocaleConverter(Object defaultValue, Locale locale, String pattern, boolean locPattern) { + public DecimalLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) { super(defaultValue, locale, pattern, locPattern); @@ -226,7 +226,7 @@ public class DecimalLocaleConverter exte * @throws ParseException if an error occurs parsing a String to a Number */ @Override - protected Object parse(Object value, String pattern) throws ParseException { + protected Object parse(final Object value, final String pattern) throws ParseException { if (value instanceof Number) { return value; @@ -236,7 +236,7 @@ public class DecimalLocaleConverter exte // fact that objects returned from this method have the same toString // representation, each call to getInstance actually returns a new // object. - DecimalFormat formatter = (DecimalFormat) DecimalFormat.getInstance(locale); + final DecimalFormat formatter = (DecimalFormat) DecimalFormat.getInstance(locale); // if some constructors default pattern to null, it makes only sense // to handle null pattern gracefully Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.java Wed Oct 15 20:15:17 2014 @@ -59,7 +59,7 @@ public class DoubleLocaleConverter exten * * @param locPattern Indicate whether the pattern is localized or not */ - public DoubleLocaleConverter(boolean locPattern) { + public DoubleLocaleConverter(final boolean locPattern) { this(Locale.getDefault(), locPattern); } @@ -71,7 +71,7 @@ public class DoubleLocaleConverter exten * * @param locale The locale */ - public DoubleLocaleConverter(Locale locale) { + public DoubleLocaleConverter(final Locale locale) { this(locale, false); } @@ -84,7 +84,7 @@ public class DoubleLocaleConverter exten * @param locale The locale * @param locPattern Indicate whether the pattern is localized or not */ - public DoubleLocaleConverter(Locale locale, boolean locPattern) { + public DoubleLocaleConverter(final Locale locale, final boolean locPattern) { this(locale, (String) null, locPattern); } @@ -97,7 +97,7 @@ public class DoubleLocaleConverter exten * @param locale The locale * @param pattern The convertion pattern */ - public DoubleLocaleConverter(Locale locale, String pattern) { + public DoubleLocaleConverter(final Locale locale, final String pattern) { this(locale, pattern, false); } @@ -111,7 +111,7 @@ public class DoubleLocaleConverter exten * @param pattern The convertion pattern * @param locPattern Indicate whether the pattern is localized or not */ - public DoubleLocaleConverter(Locale locale, String pattern, boolean locPattern) { + public DoubleLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) { super(locale, pattern, locPattern); } @@ -125,7 +125,7 @@ public class DoubleLocaleConverter exten * * @param defaultValue The default value to be returned */ - public DoubleLocaleConverter(Object defaultValue) { + public DoubleLocaleConverter(final Object defaultValue) { this(defaultValue, false); } @@ -139,7 +139,7 @@ public class DoubleLocaleConverter exten * @param defaultValue The default value to be returned * @param locPattern Indicate whether the pattern is localized or not */ - public DoubleLocaleConverter(Object defaultValue, boolean locPattern) { + public DoubleLocaleConverter(final Object defaultValue, final boolean locPattern) { this(defaultValue, Locale.getDefault(), locPattern); } @@ -152,7 +152,7 @@ public class DoubleLocaleConverter exten * @param defaultValue The default value to be returned * @param locale The locale */ - public DoubleLocaleConverter(Object defaultValue, Locale locale) { + public DoubleLocaleConverter(final Object defaultValue, final Locale locale) { this(defaultValue, locale, false); } @@ -166,7 +166,7 @@ public class DoubleLocaleConverter exten * @param locale The locale * @param locPattern Indicate whether the pattern is localized or not */ - public DoubleLocaleConverter(Object defaultValue, Locale locale, boolean locPattern) { + public DoubleLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) { this(defaultValue, locale, null, locPattern); } @@ -180,7 +180,7 @@ public class DoubleLocaleConverter exten * @param locale The locale * @param pattern The convertion pattern */ - public DoubleLocaleConverter(Object defaultValue, Locale locale, String pattern) { + public DoubleLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) { this(defaultValue, locale, pattern, false); } @@ -195,7 +195,7 @@ public class DoubleLocaleConverter exten * @param pattern The convertion pattern * @param locPattern Indicate whether the pattern is localized or not */ - public DoubleLocaleConverter(Object defaultValue, Locale locale, String pattern, boolean locPattern) { + public DoubleLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) { super(defaultValue, locale, pattern, locPattern); } @@ -213,8 +213,8 @@ public class DoubleLocaleConverter exten * @throws ParseException if an error occurs parsing a String to a Number */ @Override - protected Object parse(Object value, String pattern) throws ParseException { - Number result = (Number) super.parse(value, pattern); + protected Object parse(final Object value, final String pattern) throws ParseException { + final Number result = (Number) super.parse(value, pattern); if (result instanceof Long) { return new Double(result.doubleValue()); } else { Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.java Wed Oct 15 20:15:17 2014 @@ -60,7 +60,7 @@ public class FloatLocaleConverter extend * * @param locPattern Indicate whether the pattern is localized or not */ - public FloatLocaleConverter(boolean locPattern) { + public FloatLocaleConverter(final boolean locPattern) { this(Locale.getDefault(), locPattern); } @@ -72,7 +72,7 @@ public class FloatLocaleConverter extend * * @param locale The locale */ - public FloatLocaleConverter(Locale locale) { + public FloatLocaleConverter(final Locale locale) { this(locale, false); } @@ -85,7 +85,7 @@ public class FloatLocaleConverter extend * @param locale The locale * @param locPattern Indicate whether the pattern is localized or not */ - public FloatLocaleConverter(Locale locale, boolean locPattern) { + public FloatLocaleConverter(final Locale locale, final boolean locPattern) { this(locale, (String) null, locPattern); } @@ -98,7 +98,7 @@ public class FloatLocaleConverter extend * @param locale The locale * @param pattern The convertion pattern */ - public FloatLocaleConverter(Locale locale, String pattern) { + public FloatLocaleConverter(final Locale locale, final String pattern) { this(locale, pattern, false); } @@ -112,7 +112,7 @@ public class FloatLocaleConverter extend * @param pattern The convertion pattern * @param locPattern Indicate whether the pattern is localized or not */ - public FloatLocaleConverter(Locale locale, String pattern, boolean locPattern) { + public FloatLocaleConverter(final Locale locale, final String pattern, final boolean locPattern) { super(locale, pattern, locPattern); } @@ -126,7 +126,7 @@ public class FloatLocaleConverter extend * * @param defaultValue The default value to be returned */ - public FloatLocaleConverter(Object defaultValue) { + public FloatLocaleConverter(final Object defaultValue) { this(defaultValue, false); } @@ -140,7 +140,7 @@ public class FloatLocaleConverter extend * @param defaultValue The default value to be returned * @param locPattern Indicate whether the pattern is localized or not */ - public FloatLocaleConverter(Object defaultValue, boolean locPattern) { + public FloatLocaleConverter(final Object defaultValue, final boolean locPattern) { this(defaultValue, Locale.getDefault(), locPattern); } @@ -153,7 +153,7 @@ public class FloatLocaleConverter extend * @param defaultValue The default value to be returned * @param locale The locale */ - public FloatLocaleConverter(Object defaultValue, Locale locale) { + public FloatLocaleConverter(final Object defaultValue, final Locale locale) { this(defaultValue, locale, false); } @@ -167,7 +167,7 @@ public class FloatLocaleConverter extend * @param locale The locale * @param locPattern Indicate whether the pattern is localized or not */ - public FloatLocaleConverter(Object defaultValue, Locale locale, boolean locPattern) { + public FloatLocaleConverter(final Object defaultValue, final Locale locale, final boolean locPattern) { this(defaultValue, locale, null, locPattern); } @@ -181,7 +181,7 @@ public class FloatLocaleConverter extend * @param locale The locale * @param pattern The convertion pattern */ - public FloatLocaleConverter(Object defaultValue, Locale locale, String pattern) { + public FloatLocaleConverter(final Object defaultValue, final Locale locale, final String pattern) { this(defaultValue, locale, pattern, false); } @@ -196,7 +196,7 @@ public class FloatLocaleConverter extend * @param pattern The convertion pattern * @param locPattern Indicate whether the pattern is localized or not */ - public FloatLocaleConverter(Object defaultValue, Locale locale, String pattern, boolean locPattern) { + public FloatLocaleConverter(final Object defaultValue, final Locale locale, final String pattern, final boolean locPattern) { super(defaultValue, locale, pattern, locPattern); } @@ -215,10 +215,10 @@ public class FloatLocaleConverter extend * @throws ParseException if an error occurs parsing a String to a Number */ @Override -protected Object parse(Object value, String pattern) throws ParseException { +protected Object parse(final Object value, final String pattern) throws ParseException { final Number parsed = (Number) super.parse(value, pattern); - double doubleValue = parsed.doubleValue(); - double posDouble = (doubleValue >= 0) ? doubleValue : (doubleValue * -1); + final double doubleValue = parsed.doubleValue(); + final double posDouble = (doubleValue >= 0) ? doubleValue : (doubleValue * -1); if (posDouble != 0 && (posDouble < Float.MIN_VALUE || posDouble > Float.MAX_VALUE)) { throw new ConversionException("Supplied number is not of type Float: "+parsed); }
