Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2026-03-20 00:00:03 -04:00
Code Issues Projects Releases Wiki Activity

Fixed DateConverter to not have locale-aware formats (thanks, Fredrik Gustafsson).

Browse Source 
Rewrote test cases for better readability/new code style.
This commit is contained in:
Harald Kuhr
2011-11-01 13:11:11 +01:00
parent 8edc448bf9
commit 38b197f6c1
3 changed files with 70 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/common-lang/src/main/java/com/twelvemonkeys/util/convert/DateConverter.java
View File

@@ -38,7 +38,7 @@ import java.lang.reflect.InvocationTargetException;
* Converts strings to dates and back.
* <p/>
* <small>This class has a static cache of {@code DateFormats}, to avoid
* creation and parsing of dateformats every time one is used.</small>
* creation and parsing of date formats every time one is used.</small>
*
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @author last modified by $Author: haku $
@@ -68,8 +68,7 @@ public class DateConverter extends NumberConverter {
*
* @throws ConversionException
*/
public Object toObject(String pString, Class pType, String pFormat)
throws ConversionException {
public Object toObject(String pString, Class pType, String pFormat) throws ConversionException {
if (StringUtil.isEmpty(pString))
return null;
@@ -123,13 +122,13 @@ public class DateConverter extends NumberConverter {
* @see Date
* @see java.text.DateFormat
*/
public String toString(Object pObject, String pFormat)
throws ConversionException {
public String toString(Object pObject, String pFormat) throws ConversionException {
if (pObject == null)
return null;
if (!(pObject instanceof Date))
if (!(pObject instanceof Date)) {
throw new TypeMismathException(pObject.getClass());
}
try {
// Convert to string, default way
@@ -139,6 +138,7 @@ public class DateConverter extends NumberConverter {
// Convert to string, using format
DateFormat format = getDateFormat(pFormat);
return format.format(pObject);
}
catch (RuntimeException rte) {
@@ -147,6 +147,6 @@ public class DateConverter extends NumberConverter {
}
private DateFormat getDateFormat(String pFormat) {
return (DateFormat) getFormat(SimpleDateFormat.class, pFormat);
return (DateFormat) getFormat(SimpleDateFormat.class, pFormat, Locale.US);
}
}