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 2013/11/29 10:12:01 UTC
[2/2] git commit: ISIS-617: fix rendering of isis datetime Wicket
viewer collections
ISIS-617: fix rendering of isis datetime Wicket viewer collections
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d852a683
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d852a683
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d852a683
Branch: refs/heads/master
Commit: d852a683b4c4215938f38e8256b4506f65213911
Parents: 75a07eb
Author: Dan Haywood <da...@apache.org>
Authored: Fri Nov 29 09:11:47 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Nov 29 09:11:47 2013 +0000
----------------------------------------------------------------------
.../components/scalars/isisapplib/DateConverterForApplibDate.java | 2 +-
.../scalars/isisapplib/DateConverterForApplibDateTime.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d852a683/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDate.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDate.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDate.java
index 9325136..ee201cc 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDate.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDate.java
@@ -35,7 +35,7 @@ public class DateConverterForApplibDate extends DateConverterAbstract<org.apache
}
private DateConverterForApplibDate(String datePattern, String datePickerPattern, int adjustBy) {
- super(org.apache.isis.applib.value.Date.class, null, null, null, adjustBy); // not used
+ super(org.apache.isis.applib.value.Date.class, datePattern, datePattern, datePickerPattern, adjustBy);
converter = new DateConverterForJavaUtilDate(datePattern, datePattern, datePickerPattern, adjustBy);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d852a683/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDateTime.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDateTime.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDateTime.java
index 770af35..35106a8 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDateTime.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDateTime.java
@@ -31,7 +31,7 @@ public class DateConverterForApplibDateTime extends DateConverterAbstract<org.ap
private final DateConverterForJavaUtilDate converter;
public DateConverterForApplibDateTime(WicketViewerSettings settings, int adjustBy) {
- super(org.apache.isis.applib.value.DateTime.class, null, null, null, adjustBy); // not used
+ super(org.apache.isis.applib.value.DateTime.class, settings.getDatePattern(), settings.getDateTimePattern(), settings.getDatePickerPattern(), adjustBy); // not used
converter = new DateConverterForJavaUtilDate(settings, adjustBy);
}