Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

polish of formatters

Browse Source 
fixed bug in number formatter not corectly catching exceptions
This commit is contained in:
Keith Donald
2008-05-05 16:18:54 +00:00
parent 4d5a2c4463
commit 9d9fa464bf
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-binding/src/main/java/org/springframework/binding/format/formatters/DateFormatter.java
View File

@@ -69,19 +69,15 @@ public class DateFormatter implements Formatter {
}
protected DateFormat getDateFormat() {
if (pattern != null) {
if (locale != null) {
return new SimpleDateFormat(pattern, locale);
} else {
return new SimpleDateFormat(pattern);
}
} else {
if (locale != null) {
return new SimpleDateFormat(DEFAULT_PATTERN, locale);
} else {
return new SimpleDateFormat(DEFAULT_PATTERN);
}
String pattern = this.pattern;
if (pattern == null) {
pattern = DEFAULT_PATTERN;
}
Locale locale = this.locale;
if (locale == null) {
locale = Locale.getDefault();
}
return new SimpleDateFormat(pattern, locale);
}
}

26
spring-binding/src/main/java/org/springframework/binding/format/formatters/NumberFormatter.java
View File

@@ -24,17 +24,31 @@ import org.springframework.util.Assert;
import org.springframework.util.NumberUtils;
import org.springframework.util.StringUtils;
/**
* A formatter for the common number types such as integers, and big decimals.
*
* @author Keith Donald
*/
public class NumberFormatter implements Formatter {
private String pattern;
private Class numberClass;
/**
* Creates a number formatter for the specified number type.
* @param numberClass the number type, a class extending from {@link Number}.
*/
public NumberFormatter(Class numberClass) {
Assert.notNull(numberClass, "The number class is required");
this.numberClass = numberClass;
}
/**
* Sets the pattern for formatting numbers.
* @param pattern the format pattern
* @see DecimalFormat
*/
public void setPattern(String pattern) {
this.pattern = pattern;
}
@@ -55,9 +69,17 @@ public class NumberFormatter implements Formatter {
return null;
}
if (pattern != null) {
return NumberUtils.parseNumber(formattedString, numberClass, getNumberFormat());
try {
return NumberUtils.parseNumber(formattedString, numberClass, getNumberFormat());
} catch (IllegalArgumentException e) {
throw new InvalidFormatException(formattedString, pattern, e);
}
} else {
return NumberUtils.parseNumber(formattedString, numberClass);
try {
return NumberUtils.parseNumber(formattedString, numberClass);
} catch (NumberFormatException e) {
throw new InvalidFormatException(formattedString, "A " + numberClass.getName(), e);
}
}
}