Jeroen Hoffman pushed to branch bugfix/CMS-11063 at cms-community / hippo-cms
Commits:
827f5dad by Jeroen Hoffman at 2018-02-06T10:39:34+01:00
CMS-11063 non-functional: (mostly) add @deprecated Javadoc
- - - - -
6 changed files:
-
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/GMTDateLabel.java
-
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
-
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java
-
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
-
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.java
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/DatePickerPlugin.java
Changes:
=====================================
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/GMTDateLabel.java
=====================================
---
a/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/GMTDateLabel.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/GMTDateLabel.java
@@ -27,6 +27,9 @@ import org.apache.wicket.model.IModel;
/**
* Label component to render a date (year-month-day) of the {@link Date}
object in GMT timezone.
+ *
+ * @deprecated no longer used because it uses a hardcoded GMT timezone, while
user session time zone is to be used.
+ * Use DateTimeLabel instead.
*/
@Deprecated
public class GMTDateLabel extends ZonedDateLabel {
=====================================
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
=====================================
---
a/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
@@ -30,6 +30,8 @@ import org.apache.wicket.model.IModel;
/**
* Label component that represents only the date (year-month-day) of the
* {@link ZonedDateTime} model object in current session locale format.
+ *
+ * @deprecated no longer used because it was only used by deprecated
GMTDateLabel.
*/
@Deprecated
public class ZonedDateLabel extends Label {
=====================================
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java
=====================================
---
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2018 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
=====================================
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
=====================================
---
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java
@@ -49,7 +49,6 @@ import java.util.TimeZone;
*
* @see YuiDatePickerSettings for all configuration options
*/
-
public class YuiDateTimeField extends DateTimeField {
public static final String DATE_LABEL = "date-label";
@@ -65,18 +64,20 @@ public class YuiDateTimeField extends DateTimeField {
this(id, model, null);
}
- public YuiDateTimeField(final String id, final IModel<Date> model,
YuiDatePickerSettings settings) {
+ public YuiDateTimeField(final String id, final IModel<Date> model, final
YuiDatePickerSettings settings) {
this(id, model, settings, false);
}
- public YuiDateTimeField(final String id, final IModel<Date> model,
YuiDatePickerSettings settings, final boolean hideTime) {
+ public YuiDateTimeField(final String id, final IModel<Date> model, final
YuiDatePickerSettings settings, final boolean hideTime) {
super(id, model);
- this.hideTime = hideTime;
- if (settings == null) {
- settings = new YuiDatePickerSettings();
- settings.setLanguage(getLocale().getLanguage());
+
+ if (settings != null) {
+ this.settings = settings;
+ }
+ else {
+ this.settings = new YuiDatePickerSettings();
+ this.settings.setLanguage(getLocale().getLanguage());
}
- this.settings = settings;
setOutputMarkupId(true);
@@ -139,13 +140,14 @@ public class YuiDateTimeField extends DateTimeField {
}
});
}
+
if (hideTime) {
// hiding the "hours" component hides the entire "hours"
wicket:enclosure
get(HOURS).setVisibilityAllowed(false);
// hide the minutes field to prevent wicket.ajax javascript errors
get(MINUTES).setVisibilityAllowed(false);
}
-
+ this.hideTime = hideTime;
}
private int calculateDateLength() {
=====================================
api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.java
=====================================
---
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiGMTDateField.java
@@ -22,6 +22,9 @@ import org.apache.wicket.model.IModel;
/**
* The component to represent only the date section of the {@link Date} object
value in GMT timezone.
+ *
+ * @deprecated no longer used because it uses a hardcoded GMT timezone, while
user session time zone is to be used.
+ * Use YuiDateTimeField instead.
*/
@Deprecated
public class YuiGMTDateField extends YuiDateTimeField {
=====================================
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/DatePickerPlugin.java
=====================================
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/DatePickerPlugin.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/DatePickerPlugin.java
@@ -23,7 +23,6 @@ import org.apache.wicket.model.IModel;
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IPluginConfig;
import org.hippoecm.frontend.plugins.standards.datetime.DateTimeLabel;
-import org.hippoecm.frontend.plugins.standards.datetime.GMTDateLabel;
import org.hippoecm.frontend.plugins.yui.datetime.DateFieldWidget;
import org.hippoecm.frontend.model.properties.MapEmptyDateToNullModel;
import org.hippoecm.frontend.service.IEditor.Mode;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/827f5dadc0d4e27d207baeb5aa375c8194df9658
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/827f5dadc0d4e27d207baeb5aa375c8194df9658
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
