You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/01/29 20:15:18 UTC
[14/18] isis git commit: ISIS-1012 Preserve the datePattern for
DateConverterForJavaSqlTimestamp. It could be used as a fallback
ISIS-1012 Preserve the datePattern for DateConverterForJavaSqlTimestamp. It could be used as a fallback
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5441f511
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5441f511
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5441f511
Branch: refs/heads/master
Commit: 5441f5114a9dff6529f608d650ad5e753ca8be14
Parents: 7c33c1a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jan 27 23:24:41 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jan 27 23:24:41 2015 +0200
----------------------------------------------------------------------
.../jdkdates/DateConverterForJavaSqlTimestamp.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5441f511/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java
index aecb1f9..ae749da 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java
@@ -32,10 +32,10 @@ public class DateConverterForJavaSqlTimestamp extends DateConverterForJavaAbstra
private static final long serialVersionUID = 1L;
public DateConverterForJavaSqlTimestamp(WicketViewerSettings settings, int adjustBy) {
- this(settings.getTimestampPattern(), adjustBy);
+ this(settings.getDatePattern(), settings.getTimestampPattern(), adjustBy);
}
- public DateConverterForJavaSqlTimestamp(String datetimePattern, int adjustBy) {
- super(java.sql.Timestamp.class, datetimePattern, datetimePattern, datetimePattern, adjustBy);
+ public DateConverterForJavaSqlTimestamp(final String datePattern, String timestampPattern, int adjustBy) {
+ super(java.sql.Timestamp.class, datePattern, timestampPattern, timestampPattern, adjustBy);
}
@Override
@@ -50,7 +50,11 @@ public class DateConverterForJavaSqlTimestamp extends DateConverterForJavaAbstra
Date parsed = newSimpleDateFormatUsingDateTimePattern().parse(valueStr);
return new java.sql.Timestamp(parsed.getTime());
} catch (ParseException ex) {
- throw new ConversionException("Value cannot be converted as a date/time", ex);
+ try {
+ return new java.sql.Timestamp(newSimpleDateFormatUsingDatePattern().parse(valueStr).getTime());
+ } catch (ParseException ex2) {
+ throw new ConversionException("Value cannot be converted as a date/time", ex);
+ }
}
}