From 1187cac58e4530f2552cec4cde2b9e8680f66c0f Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Mon, 20 Nov 2017 13:18:07 +0100 Subject: [PATCH] bug4210 Adjusted internal format of accuracy enumeration --- .../common/client/datetime/DateAndTimeInput.java | 4 ++-- .../gwt/common/client/datetime/DateTimeInput.java | 14 ++++++++------ .../client/datetime/NativeDatetimeLocalInput.java | 2 +- .../common/client/datetime/NativeTimeInput.java | 2 +- .../gwt/common/client/datetime/TimeInput.java | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateAndTimeInput.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateAndTimeInput.java index d74e5528800..93a1840403a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateAndTimeInput.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateAndTimeInput.java @@ -46,8 +46,8 @@ public class DateAndTimeInput extends Composite implements DateTimeInput { add(this.dateInput = new DateInput()); add(this.timeInput = new TimeInput(accuracy)); this.dateFormat = DateTimeFormat.getFormat("yyyy-MM-dd"); - this.timeFormat = DateTimeFormat.getFormat(accuracy.getTimeFormat()); - this.datetimeFormat = DateTimeFormat.getFormat(accuracy.getDatetimeFormat()); + this.timeFormat = accuracy.getTimeFormat(); + this.datetimeFormat = accuracy.getDatetimeFormat(); } @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateTimeInput.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateTimeInput.java index d6415523cef..36479316999 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateTimeInput.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/DateTimeInput.java @@ -3,31 +3,33 @@ package com.sap.sailing.gwt.common.client.datetime; import java.util.Date; import com.google.gwt.event.logical.shared.ValueChangeEvent; +import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.user.client.ui.HasValue; import com.google.gwt.user.client.ui.IsWidget; public interface DateTimeInput extends IsWidget, HasValue { - enum Accuracy { + public enum Accuracy { MINUTES(60, "yyyy-MM-dd'T'HH:mm", "HH:mm"), SECONDS(1, "yyyy-MM-dd'T'HH:mm:ss", "HH:mm:ss"); - private final String step, datetimeFormat, timeFormat; + private final String step; + private final DateTimeFormat datetimeFormat, timeFormat; private Accuracy(int step, String datetimeFormat, String timeFormat) { this.step = String.valueOf(step); - this.datetimeFormat = datetimeFormat; - this.timeFormat = timeFormat; + this.datetimeFormat = DateTimeFormat.getFormat(datetimeFormat); + this.timeFormat = DateTimeFormat.getFormat(timeFormat); } public String getStep() { return step; } - public String getDatetimeFormat() { + public DateTimeFormat getDatetimeFormat() { return datetimeFormat; } - public String getTimeFormat() { + public DateTimeFormat getTimeFormat() { return timeFormat; } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/NativeDatetimeLocalInput.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/NativeDatetimeLocalInput.java index de339986150..569be19ff09 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/NativeDatetimeLocalInput.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/NativeDatetimeLocalInput.java @@ -21,7 +21,7 @@ class NativeDatetimeLocalInput extends Widget implements DateTimeInput { this.input = Document.get().createElement(InputElement.TAG).cast(); this.input.setAttribute(ATTR_TYPE, DateTimeInputType.DATETIME_LOCAL.getType()); this.input.setAttribute(ATTR_STEP, accuracy.getStep()); - this.format = DateTimeFormat.getFormat(accuracy.getDatetimeFormat()); + this.format = accuracy.getDatetimeFormat(); setElement(input); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/NativeTimeInput.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/NativeTimeInput.java index 7616378d84d..084a29ee18e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/NativeTimeInput.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/NativeTimeInput.java @@ -21,7 +21,7 @@ class NativeTimeInput extends Widget implements DateTimeInput { this.input = Document.get().createElement(InputElement.TAG).cast(); this.input.setAttribute(ATTR_TYPE, DateTimeInputType.TIME.getType()); this.input.setAttribute(ATTR_STEP, accuracy.getStep()); - this.format = DateTimeFormat.getFormat(accuracy.getTimeFormat()); + this.format = accuracy.getTimeFormat(); setElement(input); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/TimeInput.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/TimeInput.java index 4aa36bbddc4..a43ce607226 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/TimeInput.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/datetime/TimeInput.java @@ -58,7 +58,7 @@ public class TimeInput extends Composite implements DateTimeInput { private final DateTimeFormat timeFormat; private TimeConverter(Accuracy accuracy) { - this.timeFormat = DateTimeFormat.getFormat(accuracy.getTimeFormat()); + this.timeFormat = accuracy.getTimeFormat(); } @Override