You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by so...@apache.org on 2017/10/05 04:05:30 UTC
wicket git commit: redundant IDateConverter is removed
Repository: wicket
Updated Branches:
refs/heads/WICKET-6105-java.time e68844016 -> 3dc016119
redundant IDateConverter is removed
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3dc01611
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3dc01611
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3dc01611
Branch: refs/heads/WICKET-6105-java.time
Commit: 3dc0161193cc938833ec3650c592b5b5a955229b
Parents: e688440
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Oct 5 11:05:22 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Oct 5 11:05:22 2017 +0700
----------------------------------------------------------------------
.../markup/html/form/datetime/DateField.java | 10 ++--
.../html/form/datetime/IDateConverter.java | 54 --------------------
.../html/form/datetime/LocalDateConverter.java | 3 +-
.../html/form/datetime/LocalTimeConverter.java | 3 +-
.../markup/html/form/datetime/TimeField.java | 10 ++--
.../form/datetime/ZonedDateTimeConverter.java | 6 +--
6 files changed, 16 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3dc01611/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateField.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateField.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateField.java
index 88d2637..895c0c6 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateField.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateField.java
@@ -153,7 +153,7 @@ public class DateField extends TextField<LocalDate> implements ITextFormatProvid
* the date converter
* @return DateField
*/
- public static DateField withConverter(String id, IDateConverter<LocalDate> converter)
+ public static DateField withConverter(String id, LocalDateConverter converter)
{
return withConverter(id, null, converter);
}
@@ -169,7 +169,7 @@ public class DateField extends TextField<LocalDate> implements ITextFormatProvid
* the date converter
* @return DateField
*/
- public static DateField withConverter(String id, IModel<LocalDate> model, IDateConverter<LocalDate> converter)
+ public static DateField withConverter(String id, IModel<LocalDate> model, LocalDateConverter converter)
{
return new DateField(id, model, converter);
}
@@ -177,7 +177,7 @@ public class DateField extends TextField<LocalDate> implements ITextFormatProvid
/**
* The converter for the TextField
*/
- private final IDateConverter<LocalDate> converter;
+ private final LocalDateConverter converter;
/**
* Construct with a converter.
@@ -189,7 +189,7 @@ public class DateField extends TextField<LocalDate> implements ITextFormatProvid
* @param converter
* The converter to use
*/
- public DateField(String id, IModel<LocalDate> model, IDateConverter<LocalDate> converter)
+ public DateField(String id, IModel<LocalDate> model, LocalDateConverter converter)
{
super(id, model, LocalDate.class);
@@ -205,7 +205,7 @@ public class DateField extends TextField<LocalDate> implements ITextFormatProvid
* @param converter
* The converter to use
*/
- public DateField(String id, IDateConverter<LocalDate> converter)
+ public DateField(String id, LocalDateConverter converter)
{
this(id, null, converter);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/3dc01611/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/IDateConverter.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/IDateConverter.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/IDateConverter.java
deleted file mode 100644
index 59351e7..0000000
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/IDateConverter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.extensions.markup.html.form.datetime;
-
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.Temporal;
-import java.util.Locale;
-
-import org.apache.wicket.util.convert.IConverter;
-
-
-/**
- * Base class for javax.time based date converters. It contains the logic to parse and format,
- * optionally taking the time zone difference between clients and the server into account.
- * <p>
- * Converters of this class are best suited for per-component use.
- * </p>
- *
- * @author eelcohillenius
- */
-public interface IDateConverter<T extends Temporal> extends IConverter<T>
-{
-
- T convertToObject(String value, DateTimeFormatter format, Locale locale);
-
- /**
- * @param locale
- * The locale used to convert the value
- * @return Gets the pattern that is used for printing and parsing
- */
- String getPattern(Locale locale);
-
- /**
- * @param locale
- * The locale used to convert the value
- *
- * @return formatter The formatter for the current conversion
- */
- DateTimeFormatter getFormat(Locale locale);
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/3dc01611/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateConverter.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateConverter.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateConverter.java
index 28554bd..95e1a47 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateConverter.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalDateConverter.java
@@ -21,6 +21,7 @@ import java.time.format.DateTimeFormatter;
import java.util.Locale;
import org.apache.wicket.util.convert.ConversionException;
+import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
@@ -34,7 +35,7 @@ import org.apache.wicket.util.string.Strings;
*
* @author eelcohillenius
*/
-public abstract class LocalDateConverter implements IDateConverter<LocalDate>
+public abstract class LocalDateConverter implements IConverter<LocalDate>
{
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3dc01611/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalTimeConverter.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalTimeConverter.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalTimeConverter.java
index a10a662..1597ab6 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalTimeConverter.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/LocalTimeConverter.java
@@ -21,6 +21,7 @@ import java.time.format.DateTimeFormatter;
import java.util.Locale;
import org.apache.wicket.util.convert.ConversionException;
+import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
@@ -34,7 +35,7 @@ import org.apache.wicket.util.string.Strings;
*
* @author eelcohillenius
*/
-public abstract class LocalTimeConverter implements IDateConverter<LocalTime>
+public abstract class LocalTimeConverter implements IConverter<LocalTime>
{
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/wicket/blob/3dc01611/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 51e63c3..68af251 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
@@ -201,7 +201,7 @@ public class TimeField extends FormComponentPanel<LocalTime> implements ITextFor
* the date converter
* @return TimeField
*/
- public static TimeField withConverter(String id, IDateConverter<LocalTime> converter)
+ public static TimeField withConverter(String id, LocalTimeConverter converter)
{
return withConverter(id, null, converter);
}
@@ -217,7 +217,7 @@ public class TimeField extends FormComponentPanel<LocalTime> implements ITextFor
* the date converter
* @return TimeField
*/
- public static TimeField withConverter(String id, IModel<LocalTime> model, IDateConverter<LocalTime> converter)
+ public static TimeField withConverter(String id, IModel<LocalTime> model, LocalTimeConverter converter)
{
return new TimeField(id, model, converter);
}
@@ -225,7 +225,7 @@ public class TimeField extends FormComponentPanel<LocalTime> implements ITextFor
/**
* The converter for the TextField
*/
- private final IDateConverter<LocalTime> converter;
+ private final LocalTimeConverter converter;
/**
* Construct.
@@ -233,7 +233,7 @@ public class TimeField extends FormComponentPanel<LocalTime> implements ITextFor
* @param id
* the component id
*/
- public TimeField(String id, IDateConverter<LocalTime> converter)
+ public TimeField(String id, LocalTimeConverter converter)
{
this(id, null, converter);
}
@@ -246,7 +246,7 @@ public class TimeField extends FormComponentPanel<LocalTime> implements ITextFor
* @param model
* the component's model
*/
- public TimeField(String id, IModel<LocalTime> model, IDateConverter<LocalTime> converter)
+ public TimeField(String id, IModel<LocalTime> model, LocalTimeConverter converter)
{
super(id, model);
http://git-wip-us.apache.org/repos/asf/wicket/blob/3dc01611/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedDateTimeConverter.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedDateTimeConverter.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedDateTimeConverter.java
index 2d45aa0..9286f2e 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedDateTimeConverter.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/ZonedDateTimeConverter.java
@@ -26,6 +26,7 @@ import org.apache.wicket.Session;
import org.apache.wicket.core.request.ClientInfo;
import org.apache.wicket.protocol.http.request.WebClientInfo;
import org.apache.wicket.util.convert.ConversionException;
+import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
@@ -39,7 +40,7 @@ import org.apache.wicket.util.string.Strings;
*
* @author eelcohillenius
*/
-public abstract class ZonedDateTimeConverter implements IDateConverter<ZonedDateTime>
+public abstract class ZonedDateTimeConverter implements IConverter<ZonedDateTime>
{
private static final long serialVersionUID = 1L;
@@ -64,7 +65,6 @@ public abstract class ZonedDateTimeConverter implements IDateConverter<ZonedDate
this.applyTimeZoneDifference = applyTimeZoneDifference;
}
- @Override
public ZonedDateTime convertToObject(String value, DateTimeFormatter format, Locale locale) {
try
{
@@ -164,7 +164,6 @@ public abstract class ZonedDateTimeConverter implements IDateConverter<ZonedDate
* The locale used to convert the value
* @return Gets the pattern that is used for printing and parsing
*/
- @Override
public abstract String getPattern(Locale locale);
/**
@@ -189,7 +188,6 @@ public abstract class ZonedDateTimeConverter implements IDateConverter<ZonedDate
*
* @return formatter The formatter for the current conversion
*/
- @Override
public abstract DateTimeFormatter getFormat(Locale locale);
/**