Repository: wicket Updated Branches: refs/heads/master 6c30740cd -> 4d18b76a6
WICKET-6004 Wicket 8 cleanup - removed deprecated ZeroPaddingIntegerConverter Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4d18b76a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4d18b76a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4d18b76a Branch: refs/heads/master Commit: 4d18b76a6d8500c9b9047997b46ee8f55dd0fc9d Parents: 3d03435 Author: Sven Meier <svenme...@apache.org> Authored: Mon Oct 19 14:37:34 2015 +0200 Committer: Sven Meier <svenme...@apache.org> Committed: Mon Oct 19 14:45:11 2015 +0200 ---------------------------------------------------------------------- .../extensions/yui/calendar/DateTimeField.java | 10 +++- .../converter/ZeroPaddingIntegerConverter.java | 63 -------------------- 2 files changed, 8 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/4d18b76a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java ---------------------------------------------------------------------- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java index 25e15f2..83c7a60 100644 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java +++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.extensions.yui.calendar; +import java.text.DecimalFormat; +import java.text.NumberFormat; import java.util.Arrays; import java.util.Calendar; import java.util.Date; @@ -37,7 +39,7 @@ import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.protocol.http.request.WebClientInfo; import org.apache.wicket.util.convert.IConverter; -import org.apache.wicket.util.convert.converter.ZeroPaddingIntegerConverter; +import org.apache.wicket.util.convert.converter.IntegerConverter; import org.apache.wicket.validation.validator.RangeValidator; import org.joda.time.DateTimeFieldType; import org.joda.time.DateTimeZone; @@ -113,7 +115,11 @@ public class DateTimeField extends FormComponentPanel<Date> // PropertyModel string to access getAmOrPm private static final String AM_OR_PM = "amOrPm"; - private static final IConverter<Integer> MINUTES_CONVERTER = new ZeroPaddingIntegerConverter(2); + private static final IConverter<Integer> MINUTES_CONVERTER = new IntegerConverter() { + protected NumberFormat newNumberFormat(Locale locale) { + return new DecimalFormat("00"); + } + }; // The dropdown list for AM/PM and it's associated model object private DropDownChoice<AM_PM> amOrPmChoice; http://git-wip-us.apache.org/repos/asf/wicket/blob/4d18b76a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java deleted file mode 100644 index 181be0b..0000000 --- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/ZeroPaddingIntegerConverter.java +++ /dev/null @@ -1,63 +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.util.convert.converter; - -import java.util.Locale; - -/** - * Converts from Object to Integer, adding zero-padding. - * - * @author Eelco Hillenius - * @author Jonathan Locke - * @author Al Maw - * - * @deprecated use an {@link IntegerConverter} with suitable format string instead - */ -public class ZeroPaddingIntegerConverter extends IntegerConverter -{ - private static final long serialVersionUID = 1L; - - private final int zeroPadLength; - - /** - * Constructs this converter. - * - * @param zeroPadLength - * Minimum length of String to be outputted (will be zero-padded). - */ - public ZeroPaddingIntegerConverter(final int zeroPadLength) - { - this.zeroPadLength = zeroPadLength; - } - - /** - * @see org.apache.wicket.util.convert.converter.AbstractNumberConverter#convertToString(java.lang.Object, - * java.util.Locale) - */ - @Override - public String convertToString(final Integer value, final Locale locale) - { - String result = super.convertToString(value, locale); - - while (result.length() < zeroPadLength) - { - result = "0" + result; - } - - return result; - } -} \ No newline at end of file
