You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by cm...@apache.org on 2016/11/23 15:36:21 UTC
[1/5] wicket git commit: make Duration use the FORMAT category of a
locale
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 72ad2383b -> 16e097d25
make Duration use the FORMAT category of a locale
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/efff42eb
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/efff42eb
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/efff42eb
Branch: refs/heads/wicket-7.x
Commit: efff42eb7a1fa5ee85344dc1fef831c85c17a3c9
Parents: 423a93f
Author: Carl-Eric Menzel <cm...@apache.org>
Authored: Tue Aug 9 16:45:46 2016 +0200
Committer: Carl-Eric Menzel <cm...@apache.org>
Committed: Mon Nov 7 13:23:50 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/util/time/Duration.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/efff42eb/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 c366990..c32abb6 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
@@ -17,6 +17,7 @@
package org.apache.wicket.util.time;
import java.util.Locale;
+import java.util.Locale.Category;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -491,7 +492,7 @@ public class Duration extends AbstractTimeValue
@Override
public String toString()
{
- return toString(Locale.getDefault());
+ return toString(Locale.getDefault(Category.FORMAT));
}
/**
[5/5] wicket git commit: WICKET-6273 use formatting locale where
appropriate
Posted by cm...@apache.org.
WICKET-6273 use formatting locale where appropriate
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/16e097d2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/16e097d2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/16e097d2
Branch: refs/heads/wicket-7.x
Commit: 16e097d25b5eba43db25bc59e9e8e62a4299e13b
Parents: 72ad238 1ea7b7e
Author: Carl-Eric Menzel <cm...@apache.org>
Authored: Wed Nov 23 16:30:50 2016 +0100
Committer: Carl-Eric Menzel <cm...@apache.org>
Committed: Wed Nov 23 16:30:50 2016 +0100
----------------------------------------------------------------------
.../markup/html/form/DateTextField.java | 2 +-
.../convert/converter/AbstractDateConverter.java | 2 +-
.../converter/AbstractNumberConverter.java | 2 +-
.../util/convert/converter/SqlTimeConverter.java | 2 +-
.../convert/converter/SqlTimestampConverter.java | 2 +-
.../java/org/apache/wicket/util/lang/Bytes.java | 4 ++--
.../apache/wicket/util/string/StringValue.java | 2 +-
.../org/apache/wicket/util/time/Duration.java | 5 +++--
.../util/convert/converters/ConvertersTest.java | 12 ++++++------
.../org/apache/wicket/util/lang/BytesTest.java | 15 ++++++++++-----
.../org/apache/wicket/util/size/BytesTest.java | 4 ++--
.../apache/wicket/util/time/DurationTest.java | 19 +++++++++++++++++++
12 files changed, 48 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
[2/5] wicket git commit: add test for Duration when default locale
and formatting locale differ
Posted by cm...@apache.org.
add test for Duration when default locale and formatting locale differ
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/50744f28
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/50744f28
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/50744f28
Branch: refs/heads/wicket-7.x
Commit: 50744f28cdb8d77390e41234ccd5821c43e69464
Parents: efff42e
Author: Carl-Eric Menzel <cm...@apache.org>
Authored: Mon Nov 7 15:06:06 2016 +0100
Committer: Carl-Eric Menzel <cm...@apache.org>
Committed: Mon Nov 7 15:06:06 2016 +0100
----------------------------------------------------------------------
.../apache/wicket/util/time/DurationTest.java | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/50744f28/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java b/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
index d9b6392..47f3c4a 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue;
import java.text.NumberFormat;
import java.util.Locale;
+import java.util.Locale.Category;
import org.apache.wicket.util.string.StringValueConversionException;
import org.junit.Test;
@@ -74,6 +75,24 @@ public final class DurationTest
assertEquals("12 hours", Duration.days(0.5).toString());
}
+ @Test
+ public void formatLocale() throws Exception
+ {
+ final Locale oldFormatLocale = Locale.getDefault(Category.FORMAT);
+ final Locale oldDefaultLocale = Locale.getDefault();
+ try
+ {
+ Locale.setDefault(Locale.US);
+ Locale.setDefault(Category.FORMAT, Locale.GERMANY);
+ assertEquals("should take formatting locale into account", "1,5 minutes", Duration.seconds(90)
+ .toString());
+ } finally
+ {
+ Locale.setDefault(oldDefaultLocale);
+ Locale.setDefault(Category.FORMAT, oldFormatLocale);
+ }
+ }
+
/** */
@Test
public void testSleep()
[3/5] wicket git commit: make converters use formatting locale
Posted by cm...@apache.org.
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 <cm...@wicketbuch.de>
Authored: Mon Nov 14 00:06:34 2016 +0100
Committer: Carl-Eric Menzel <cm...@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);
}
/**
[4/5] wicket git commit: WICKET-6273 make BytesTest work with split
locale
Posted by cm...@apache.org.
WICKET-6273 make BytesTest work with split locale
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1ea7b7e4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1ea7b7e4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1ea7b7e4
Branch: refs/heads/wicket-7.x
Commit: 1ea7b7e44c73884abb6458c834988e1baa92f342
Parents: fc408ee
Author: Carl-Eric Menzel <cm...@apache.org>
Authored: Wed Nov 23 10:52:10 2016 +0100
Committer: Carl-Eric Menzel <cm...@apache.org>
Committed: Wed Nov 23 10:52:10 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/wicket/util/lang/BytesTest.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1ea7b7e4/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 10026c3..ec2c5c0 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
@@ -32,7 +32,8 @@ public class BytesTest extends Assert
/**
* Backup of the default locale.
*/
- private Locale defaultLocale = null;
+ private Locale originalFormatLocale = null;
+ private Locale originalDefaultLocale = null;
/**
* Save the default locale.
@@ -40,9 +41,12 @@ public class BytesTest extends Assert
@Before
public void before()
{
- defaultLocale = Locale.getDefault(Locale.Category.FORMAT);
+ originalFormatLocale = Locale.getDefault(Locale.Category.FORMAT);
+ originalDefaultLocale = Locale.getDefault();
- // these tests run in US locale.
+ // these tests run in US locale for formatting and German default locale - they should still work with split
+ // locale.
+ Locale.setDefault(Locale.GERMANY);
Locale.setDefault(Locale.Category.FORMAT, Locale.US);
}
@@ -52,7 +56,8 @@ public class BytesTest extends Assert
@After
public void after()
{
- Locale.setDefault(Locale.Category.FORMAT, defaultLocale);
+ Locale.setDefault(originalDefaultLocale);
+ Locale.setDefault(Locale.Category.FORMAT, originalFormatLocale);
}
/**