Repository: wicket Updated Branches: refs/heads/WICKET-6105-java.time c9904a492 -> 5f978f188
[WICKET-6105] serialVersionUID are added and whitespaces are fixed Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5f978f18 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5f978f18 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5f978f18 Branch: refs/heads/WICKET-6105-java.time Commit: 5f978f1888354e159031544b936aec3e2785aaf5 Parents: c9904a4 Author: Maxim Solodovnik <[email protected]> Authored: Mon Oct 16 15:00:03 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Oct 16 15:00:03 2017 +0700 ---------------------------------------------------------------------- .../examples/datetime/DateTimeApplication.java | 4 ++-- .../wicket/examples/datetime/DateTimePage.java | 21 ++++++++++++++++++++ .../wicket/extensions/Initializer.properties | 2 +- .../form/datetime/AbstractDateTimeField.java | 4 ++++ .../html/form/datetime/LocalDateTextField.java | 11 ++++++---- .../form/datetime/LocalDateTimeTextField.java | 9 ++++++--- .../html/form/datetime/LocalTimeTextField.java | 9 ++++++--- .../markup/html/form/datetime/TimeField.java | 2 ++ .../html/form/datetime/ZonedDateTimeField.java | 2 +- .../datetime/ZonedToLocalDateTimeModel.java | 3 ++- 10 files changed, 52 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/5f978f18/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimeApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimeApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimeApplication.java index 713f5b7..fa29a21 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimeApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimeApplication.java @@ -37,5 +37,5 @@ public class DateTimeApplication extends WicketExampleApplication public Class< ? extends Page> getHomePage() { return DateTimePage.class; - } -} \ No newline at end of file + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/5f978f18/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.java index b102c2e..de0f8ea 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.java @@ -95,6 +95,8 @@ public class DateTimePage extends WicketExamplePage // Link to return to default locale form.add(new Link<Void>("defaultLocaleLink") { + private static final long serialVersionUID = 1L; + public void onClick() { WebRequest request = (WebRequest)getRequest(); @@ -127,6 +129,8 @@ public class DateTimePage extends WicketExamplePage final LocalDateTimeField datetimeField0 = new LocalDateTimeField("datetime0", new PropertyModel<>(this, "dateTime0")) { + private static final long serialVersionUID = 1L; + @Override protected LocalTime getDefaultTime() { @@ -139,6 +143,8 @@ public class DateTimePage extends WicketExamplePage final LocalDateTimeField datetimeField1 = new LocalDateTimeField("datetime1", new ZonedToLocalDateTimeModel(zonedDateTime1) { + private static final long serialVersionUID = 1L; + @Override protected ZoneId getClientTimeZone() { @@ -158,6 +164,8 @@ public class DateTimePage extends WicketExamplePage LocalDateTimeTextField datetime2 = new LocalDateTimeTextField("datetime2", new ZonedToLocalDateTimeModel(zonedDateTime2) { + private static final long serialVersionUID = 1L; + @Override protected ZoneId getClientTimeZone() { @@ -197,6 +205,8 @@ public class DateTimePage extends WicketExamplePage */ private final class LocaleChoiceRenderer extends ChoiceRenderer<Locale> { + private static final long serialVersionUID = 1L; + @Override public Object getDisplayValue(Locale locale) { @@ -209,6 +219,8 @@ public class DateTimePage extends WicketExamplePage */ private final class LocaleDropDownChoice extends DropDownChoice<Locale> { + private static final long serialVersionUID = 1L; + /** * Construct. * @@ -223,6 +235,8 @@ public class DateTimePage extends WicketExamplePage add(new FormComponentUpdatingBehavior() { + private static final long serialVersionUID = 1L; + @Override protected void onUpdate() { @@ -234,11 +248,14 @@ public class DateTimePage extends WicketExamplePage private class ZoneDropDownChoice extends DropDownChoice<ZoneId> { + private static final long serialVersionUID = 1L; public ZoneDropDownChoice(String id) { super(id, new IModel<List<ZoneId>>() { + private static final long serialVersionUID = 1L; + @Override public List<ZoneId> getObject() { @@ -251,6 +268,8 @@ public class DateTimePage extends WicketExamplePage setChoiceRenderer(new IChoiceRenderer<ZoneId>() { + private static final long serialVersionUID = 1L; + @Override public Object getDisplayValue(ZoneId object) { @@ -276,6 +295,8 @@ public class DateTimePage extends WicketExamplePage add(new FormComponentUpdatingBehavior() { + private static final long serialVersionUID = 1L; + protected void onUpdate() { // clear raw input of all inputs so that values are reformatted http://git-wip-us.apache.org/repos/asf/wicket/blob/5f978f18/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties b/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties index b9a7819..98f7925 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties @@ -44,4 +44,4 @@ AbstractDateTimeField.CSS.date=datetime-date AbstractDateTimeField.CSS.time=datetime-time TimeField.hoursSeparator=\u00a0:\u00a0 TimeField.CSS.hours=time-hours -TimeField.CSS.minutes=time-minutes \ No newline at end of file +TimeField.CSS.minutes=time-minutes http://git-wip-us.apache.org/repos/asf/wicket/blob/5f978f18/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/AbstractDateTimeField.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/AbstractDateTimeField.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/AbstractDateTimeField.java index 2f86c19..a9e9cf2 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/AbstractDateTimeField.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/AbstractDateTimeField.java @@ -207,6 +207,8 @@ abstract class AbstractDateTimeField<T extends Temporal> extends FormComponentPa protected LocalDateTextField newDateField(String id, IModel<LocalDate> dateFieldModel) { return new LocalDateTextField(id, dateFieldModel, FormatStyle.SHORT) { + private static final long serialVersionUID = 1L; + @Override protected void onComponentTag(ComponentTag tag) { @@ -229,6 +231,8 @@ abstract class AbstractDateTimeField<T extends Temporal> extends FormComponentPa protected TimeField newTimeField(String id, IModel<LocalTime> timeFieldModel) { return new TimeField(id, timeFieldModel) { + private static final long serialVersionUID = 1L; + @Override protected void onComponentTag(ComponentTag tag) { http://git-wip-us.apache.org/repos/asf/wicket/blob/5f978f18/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextField.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextField.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextField.java index a1d1dc0..68d46de 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextField.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTextField.java @@ -61,7 +61,8 @@ public class LocalDateTextField extends TextField<LocalDate> implements ITextFor super(id, model, LocalDate.class); this.converter = new TextFormatConverter() { - + private static final long serialVersionUID = 1L; + @Override public DateTimeFormatter getDateTimeFormatter(Locale locale) { @@ -104,7 +105,8 @@ public class LocalDateTextField extends TextField<LocalDate> implements ITextFor super(id, model, LocalDate.class); this.converter = new TextFormatConverter() { - + private static final long serialVersionUID = 1L; + @Override public DateTimeFormatter getDateTimeFormatter(Locale locale) { @@ -157,7 +159,8 @@ public class LocalDateTextField extends TextField<LocalDate> implements ITextFor } private abstract class TextFormatConverter extends LocalDateConverter { - + private static final long serialVersionUID = 1L; + public abstract String getTextFormat(Locale locale); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/5f978f18/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTimeTextField.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTimeTextField.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTimeTextField.java index 772b5f3..5095334 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTimeTextField.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateTimeTextField.java @@ -61,7 +61,8 @@ public class LocalDateTimeTextField extends TextField<LocalDateTime> implements super(id, model, LocalDateTime.class); this.converter = new TextFormatConverter() { - + private static final long serialVersionUID = 1L; + @Override public DateTimeFormatter getDateTimeFormatter(Locale locale) { @@ -104,7 +105,8 @@ public class LocalDateTimeTextField extends TextField<LocalDateTime> implements super(id, model, LocalDateTime.class); this.converter = new TextFormatConverter() { - + private static final long serialVersionUID = 1L; + @Override public DateTimeFormatter getDateTimeFormatter(Locale locale) { @@ -157,7 +159,8 @@ public class LocalDateTimeTextField extends TextField<LocalDateTime> implements } private abstract class TextFormatConverter extends LocalDateTimeConverter { - + private static final long serialVersionUID = 1L; + public abstract String getTextFormat(Locale locale); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/5f978f18/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalTimeTextField.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalTimeTextField.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalTimeTextField.java index 5ea7e3a..36df2e1 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalTimeTextField.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalTimeTextField.java @@ -61,7 +61,8 @@ public class LocalTimeTextField extends TextField<LocalTime> implements ITextFor super(id, model, LocalTime.class); this.converter = new TextFormatConverter() { - + private static final long serialVersionUID = 1L; + @Override public DateTimeFormatter getDateTimeFormatter(Locale locale) { @@ -104,7 +105,8 @@ public class LocalTimeTextField extends TextField<LocalTime> implements ITextFor super(id, model, LocalTime.class); this.converter = new TextFormatConverter() { - + private static final long serialVersionUID = 1L; + @Override public DateTimeFormatter getDateTimeFormatter(Locale locale) { @@ -157,7 +159,8 @@ public class LocalTimeTextField extends TextField<LocalTime> implements ITextFor } private abstract class TextFormatConverter extends LocalTimeConverter { - + private static final long serialVersionUID = 1L; + public abstract String getTextFormat(Locale locale); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/5f978f18/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/TimeField.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/TimeField.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/TimeField.java index 976bc49..8f56031 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/TimeField.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/TimeField.java @@ -138,6 +138,8 @@ public class TimeField extends FormComponentPanel<LocalTime> // Create and add the "AM/PM" choice add(amOrPmChoice = new DropDownChoice<AM_PM>("amOrPmChoice", new AmPmModel(), Arrays.asList(AM_PM.values())) { + private static final long serialVersionUID = 1L; + @Override protected boolean localizeDisplayValues() { http://git-wip-us.apache.org/repos/asf/wicket/blob/5f978f18/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedDateTimeField.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedDateTimeField.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedDateTimeField.java index 4b3143d..c1b8403 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedDateTimeField.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedDateTimeField.java @@ -77,4 +77,4 @@ public class ZonedDateTimeField extends AbstractDateTimeField<ZonedDateTime> { return temporal.toLocalTime(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/5f978f18/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModel.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModel.java index 0fcb79c..4571b36 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModel.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedToLocalDateTimeModel.java @@ -36,6 +36,7 @@ import org.apache.wicket.util.lang.Args; */ public class ZonedToLocalDateTimeModel implements IModel<LocalDateTime> { + private static final long serialVersionUID = 1L; private IModel<ZonedDateTime> model; /** @@ -115,4 +116,4 @@ public class ZonedToLocalDateTimeModel implements IModel<LocalDateTime> { return new ZonedToLocalDateTimeModel(new Model<ZonedDateTime>(dateTime)); } -} \ No newline at end of file +}
