make converters use formatting locale
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fc408eee Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fc408eee Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fc408eee Branch: refs/heads/wicket-7.x Commit: fc408eeeb806b745f77e60a015eb6dd888039d2f Parents: 50744f2 Author: Carl-Eric Menzel <cmen...@wicketbuch.de> Authored: Mon Nov 14 00:06:34 2016 +0100 Committer: Carl-Eric Menzel <cmen...@wicketbuch.de> Committed: Mon Nov 14 00:06:34 2016 +0100 ---------------------------------------------------------------------- .../extensions/markup/html/form/DateTextField.java | 2 +- .../util/convert/converter/AbstractDateConverter.java | 2 +- .../util/convert/converter/AbstractNumberConverter.java | 2 +- .../wicket/util/convert/converter/SqlTimeConverter.java | 2 +- .../util/convert/converter/SqlTimestampConverter.java | 2 +- .../main/java/org/apache/wicket/util/lang/Bytes.java | 4 ++-- .../java/org/apache/wicket/util/string/StringValue.java | 2 +- .../main/java/org/apache/wicket/util/time/Duration.java | 2 +- .../wicket/util/convert/converters/ConvertersTest.java | 12 ++++++------ .../java/org/apache/wicket/util/lang/BytesTest.java | 6 +++--- .../java/org/apache/wicket/util/size/BytesTest.java | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/fc408eee/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/DateTextField.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/DateTextField.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/DateTextField.java index 2f76bb8..ba19d38 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/DateTextField.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/DateTextField.java @@ -129,7 +129,7 @@ public class DateTextField extends TextField<Date> implements ITextFormatProvide { if (locale == null) { - locale = Locale.getDefault(); + locale = Locale.getDefault(Locale.Category.FORMAT); } return new SimpleDateFormat(DateTextField.this.datePattern, locale); } http://git-wip-us.apache.org/repos/asf/wicket/blob/fc408eee/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDateConverter.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDateConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDateConverter.java index 22598cc..0baff73 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDateConverter.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDateConverter.java @@ -77,7 +77,7 @@ public abstract class AbstractDateConverter<D extends Date> extends AbstractConv { if (locale == null) { - locale = Locale.getDefault(); + locale = Locale.getDefault(Locale.Category.FORMAT); } // return a clone because DateFormat.getDateInstance uses a pool http://git-wip-us.apache.org/repos/asf/wicket/blob/fc408eee/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractNumberConverter.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractNumberConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractNumberConverter.java index da3df42..de237d2 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractNumberConverter.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractNumberConverter.java @@ -93,7 +93,7 @@ public abstract class AbstractNumberConverter<N extends Number> extends Abstract { if (locale == null) { - locale = Locale.getDefault(); + locale = Locale.getDefault(Locale.Category.FORMAT); } if (value == null) http://git-wip-us.apache.org/repos/asf/wicket/blob/fc408eee/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java index 2f3d069..ca5d538 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java @@ -38,7 +38,7 @@ public class SqlTimeConverter extends AbstractDateConverter<Time> { if (locale == null) { - locale = Locale.getDefault(); + locale = Locale.getDefault(Locale.Category.FORMAT); } // return a clone because DateFormat.getDateInstance uses a pool http://git-wip-us.apache.org/repos/asf/wicket/blob/fc408eee/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java index 2dd7d4b..a3a528b 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java @@ -70,7 +70,7 @@ public class SqlTimestampConverter extends AbstractDateConverter<Timestamp> { if (locale == null) { - locale = Locale.getDefault(); + locale = Locale.getDefault(Locale.Category.FORMAT); } // return a clone because DateFormat.getDateInstance uses a pool http://git-wip-us.apache.org/repos/asf/wicket/blob/fc408eee/wicket-util/src/main/java/org/apache/wicket/util/lang/Bytes.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/Bytes.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/Bytes.java index 425b061..04cdc7d 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/lang/Bytes.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/Bytes.java @@ -361,7 +361,7 @@ public final class Bytes extends LongValue */ public static Bytes valueOf(final String string) throws StringValueConversionException { - return valueOf(string, Locale.getDefault()); + return valueOf(string, Locale.getDefault(Locale.Category.FORMAT)); } /** @@ -372,7 +372,7 @@ public final class Bytes extends LongValue @Override public String toString() { - return toString(Locale.getDefault()); + return toString(Locale.getDefault(Locale.Category.FORMAT)); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/fc408eee/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java b/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java index 5ec2860..9bf5d8e 100755 --- a/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java @@ -106,7 +106,7 @@ public class StringValue implements IClusterable */ public static StringValue valueOf(final double value) { - return valueOf(value, Locale.getDefault()); + return valueOf(value, Locale.getDefault(Locale.Category.FORMAT)); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/fc408eee/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java b/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java index c32abb6..bd2bb9e 100755 --- a/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java @@ -315,7 +315,7 @@ public class Duration extends AbstractTimeValue */ public static Duration valueOf(final String string) throws StringValueConversionException { - return valueOf(string, Locale.getDefault()); + return valueOf(string, Locale.getDefault(Locale.Category.FORMAT)); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/fc408eee/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java index 58c7fb2..1f30783 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java @@ -87,10 +87,10 @@ public final class ConvertersTest { BooleanConverter converter = new BooleanConverter(); assertEquals(Boolean.FALSE, converter.convertToObject("", Locale.US)); - assertEquals("true", converter.convertToString(Boolean.TRUE, Locale.getDefault())); - assertEquals("false", converter.convertToString(Boolean.FALSE, Locale.getDefault())); - assertEquals(Boolean.TRUE, converter.convertToObject("true", Locale.getDefault())); - assertEquals(Boolean.FALSE, converter.convertToObject("false", Locale.getDefault())); + assertEquals("true", converter.convertToString(Boolean.TRUE, Locale.getDefault(Locale.Category.FORMAT))); + assertEquals("false", converter.convertToString(Boolean.FALSE, Locale.getDefault(Locale.Category.FORMAT))); + assertEquals(Boolean.TRUE, converter.convertToObject("true", Locale.getDefault(Locale.Category.FORMAT))); + assertEquals(Boolean.FALSE, converter.convertToObject("false", Locale.getDefault(Locale.Category.FORMAT))); } @Test(expected = ConversionException.class) @@ -99,7 +99,7 @@ public final class ConvertersTest BooleanConverter converter = new BooleanConverter(); // should throw an exception - converter.convertToObject("whatever", Locale.getDefault()); + converter.convertToObject("whatever", Locale.getDefault(Locale.Category.FORMAT)); } @Test @@ -452,4 +452,4 @@ public final class ConvertersTest converter.convertToObject("four", Locale.US); fail("Conversion should have thrown an exception"); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/fc408eee/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java index 505f8f3..10026c3 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java @@ -40,10 +40,10 @@ public class BytesTest extends Assert @Before public void before() { - defaultLocale = Locale.getDefault(); + defaultLocale = Locale.getDefault(Locale.Category.FORMAT); // these tests run in US locale. - Locale.setDefault(Locale.US); + Locale.setDefault(Locale.Category.FORMAT, Locale.US); } /** @@ -52,7 +52,7 @@ public class BytesTest extends Assert @After public void after() { - Locale.setDefault(defaultLocale); + Locale.setDefault(Locale.Category.FORMAT, defaultLocale); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/fc408eee/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java index 277366a..f0fc62f 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java @@ -44,7 +44,7 @@ public final class BytesTest extends Assert @Before public void before() { - defaultLocale = Locale.getDefault(); + defaultLocale = Locale.getDefault(Locale.Category.FORMAT); } /** @@ -53,7 +53,7 @@ public final class BytesTest extends Assert @After public void after() { - Locale.setDefault(defaultLocale); + Locale.setDefault(Locale.Category.FORMAT, defaultLocale); } /**
