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 2019/10/01 07:18:23 UTC
[isis] 02/04: ISIS-2086: refactors
'isis.viewer.wicket.datePicker.minDate' and
'isis.viewer.wicket.datePicker.maxDate' to type-safe config
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2086
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 2ba21839ee8cde376938203ee21dd0d913e132f0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 1 07:57:45 2019 +0100
ISIS-2086: refactors 'isis.viewer.wicket.datePicker.minDate' and 'isis.viewer.wicket.datePicker.maxDate' to type-safe config
---
.../org/apache/isis/config/IsisConfiguration.java | 15 ++++++++++++++
.../datepicker/TextFieldWithDateTimePicker.java | 23 ++++++++--------------
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index 590adfd..379a733 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -610,6 +610,21 @@ public class IsisConfiguration {
private int maxSize = 15;
}
+ private final DatePicker datePicker = new DatePicker();
+ @Data
+ public static class DatePicker {
+
+ /**
+ * As per http://eonasdan.github.io/bootstrap-datetimepicker/Options/#maxdate, in ISO format (per https://github.com/moment/moment/issues/1407).
+ */
+ private String minDate = "1900-01-01T00:00:00.000Z";
+
+ /**
+ * As per http://eonasdan.github.io/bootstrap-datetimepicker/Options/#maxdate, in ISO format (per https://github.com/moment/moment/issues/1407).
+ */
+ private String maxDate = "2100-01-01T00:00:00.000Z";
+ }
+
private final DevelopmentUtilities developmentUtilities = new DevelopmentUtilities();
@Data
public static class DevelopmentUtilities {
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
index 763527c..2c8c674 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
@@ -20,6 +20,7 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.datepicker;
import java.util.Locale;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -51,18 +52,6 @@ public class TextFieldWithDateTimePicker<T> extends TextField<T> implements ICon
private static final long serialVersionUID = 1L;
- /**
- * As per http://eonasdan.github.io/bootstrap-datetimepicker/Options/#mindate, in ISO format (per https://github.com/moment/moment/issues/1407).
- */
- private static final String KEY_DATE_PICKER_MIN_DATE = "isis.viewer.wicket.datePicker.minDate";
- private static final String KEY_DATE_PICKER_MIN_DATE_DEFAULT = "1900-01-01T00:00:00.000Z";
-
- /**
- * As per http://eonasdan.github.io/bootstrap-datetimepicker/Options/#maxdate, in ISO format (per https://github.com/moment/moment/issues/1407).
- */
- private static final String KEY_DATE_PICKER_MAX_DATE = "isis.viewer.wicket.datePicker.maxDate";
- private static final String KEY_DATE_PICKER_MAX_DATE_DEFAULT = "2100-01-01T00:00:00.000Z";
-
protected final DateConverter<T> converter;
private final DateTimeConfig config;
@@ -94,8 +83,8 @@ public class TextFieldWithDateTimePicker<T> extends TextField<T> implements ICon
// seems not to do anything...
//config.allowKeyboardNavigation(true);
- final String datePickerMinDate = getConfiguration().getString(KEY_DATE_PICKER_MIN_DATE, KEY_DATE_PICKER_MIN_DATE_DEFAULT);
- final String datePickerMaxDate = getConfiguration().getString(KEY_DATE_PICKER_MAX_DATE, KEY_DATE_PICKER_MAX_DATE_DEFAULT);
+ final String datePickerMinDate = getConfiguration().getViewer().getWicket().getDatePicker().getMinDate();
+ final String datePickerMaxDate = getConfiguration().getViewer().getWicket().getDatePicker().getMaxDate();
config.minDate(datePickerMinDate);
config.maxDate(datePickerMaxDate);
@@ -162,10 +151,14 @@ public class TextFieldWithDateTimePicker<T> extends TextField<T> implements ICon
return $(this).chain("datetimepicker", config).get();
}
- IsisConfigurationLegacy getConfiguration() {
+ IsisConfigurationLegacy getConfigurationLegacy() {
return IsisContext.getConfigurationLegacy();
}
+ IsisConfiguration getConfiguration() {
+ return IsisContext.getConfiguration();
+ }
+
IsisSessionFactory getIsisSessionFactory() {
return IsisContext.getSessionFactory();
}