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/02 08:17:11 UTC
[6/6] wicket git commit: Comments are addressed
Comments are addressed
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/adeae9ce
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/adeae9ce
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/adeae9ce
Branch: refs/heads/WICKET-6105-java.time
Commit: adeae9ceaef182858867f71ffab5d715b523b984
Parents: 9051b43
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Oct 2 15:16:57 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Oct 2 15:16:57 2017 +0700
----------------------------------------------------------------------
.../markup/html/form/datetime/DateTimeField.java | 10 ----------
.../markup/html/form/datetime/IDateConverter.java | 5 +++--
.../markup/html/form/datetime/StyleTimeConverter.java | 4 ----
.../markup/html/form/datetime/ZonedDateTimeConverter.java | 2 +-
4 files changed, 4 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/adeae9ce/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateTimeField.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateTimeField.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateTimeField.java
index 200129f..0c6531d 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateTimeField.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/DateTimeField.java
@@ -256,11 +256,6 @@ public class DateTimeField extends FormComponentPanel<ZonedDateTime>
dateTime = dateTime.with(ChronoField.MONTH_OF_YEAR, date.getMonthValue());
dateTime = dateTime.with(ChronoField.DAY_OF_YEAR, date.getDayOfMonth());
}
-
- @Override
- public void detach()
- {
- }
}
protected class TimeModel implements IModel<LocalTime>
@@ -279,10 +274,5 @@ public class DateTimeField extends FormComponentPanel<ZonedDateTime>
dateTime = dateTime.with(ChronoField.HOUR_OF_DAY, time.getHour());
dateTime = dateTime.with(ChronoField.MINUTE_OF_HOUR, time.getMinute());
}
-
- @Override
- public void detach()
- {
- }
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/adeae9ce/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
index 6312716..59351e7 100644
--- 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
@@ -17,13 +17,14 @@
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 Joda Time based date converters. It contains the logic to parse and format,
+ * 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.
@@ -31,7 +32,7 @@ import org.apache.wicket.util.convert.IConverter;
*
* @author eelcohillenius
*/
-public interface IDateConverter<T> extends IConverter<T>
+public interface IDateConverter<T extends Temporal> extends IConverter<T>
{
T convertToObject(String value, DateTimeFormatter format, Locale locale);
http://git-wip-us.apache.org/repos/asf/wicket/blob/adeae9ce/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/StyleTimeConverter.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/StyleTimeConverter.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/StyleTimeConverter.java
index 8ac59b4..1197f2a 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/StyleTimeConverter.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/datetime/StyleTimeConverter.java
@@ -32,10 +32,6 @@ import java.util.Locale;
* </p>
*
* @see org.apache.wicket.extensions.markup.html.form.DateTextField
- * @see java.time.LocalTime
- * @see DateTimeFormatter
- *
- * @author eelcohillenius
*/
public class StyleTimeConverter extends LocalTimeConverter
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/adeae9ce/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 9d0f430..2d45aa0 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
@@ -31,7 +31,7 @@ import org.apache.wicket.util.string.Strings;
/**
- * Base class for Joda Time based date converters. It contains the logic to parse and format,
+ * 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.