You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2011/01/08 20:44:00 UTC
svn commit: r1056776 - in /wicket/trunk:
wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/
wicket-util/src/main/java/org/apache/wicket/util/time/
Author: ivaynberg
Date: Sat Jan 8 19:44:00 2011
New Revision: 1056776
URL: http://svn.apache.org/viewvc?rev=1056776&view=rev
Log:
WICKET-3301
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/AbstractTime.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java
Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java?rev=1056776&r1=1056775&r2=1056776&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java Sat Jan 8 19:44:00 2011
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.extensions.yui.calendar;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
@@ -52,17 +50,6 @@ import org.apache.wicket.util.string.Jav
// JsDatePicker?)
public abstract class AbstractCalendar extends WebComponent
{
- /**
- * Format to be used when configuring YUI calendar. Can be used when using the
- * "selected" property.
- */
- public static final DateFormat FORMAT_DATE = new SimpleDateFormat("MM/dd/yyyy");
-
- /**
- * For specifying which page (month/year) to show in the calendar, use this format for the date.
- * This is to be used together with the property "pagedate"
- */
- public static final DateFormat FORMAT_PAGEDATE = new SimpleDateFormat("MM/yyyy");
private static final long serialVersionUID = 1L;
private final boolean contributeDependencies;
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/AbstractTime.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/AbstractTime.java?rev=1056776&r1=1056775&r2=1056776&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/AbstractTime.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/AbstractTime.java Sat Jan 8 19:44:00 2011
@@ -19,6 +19,7 @@ package org.apache.wicket.util.time;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
+import java.util.Locale;
/**
* Abstract base class for subclasses that represent a point in time (as opposed to a
@@ -35,7 +36,7 @@ abstract class AbstractTime extends Abst
static final Calendar localtime = Calendar.getInstance();
/** time format */
- static final SimpleDateFormat timeFormat = new SimpleDateFormat("h.mma");
+ static final SimpleDateFormat timeFormat = new SimpleDateFormat("h.mma", Locale.ENGLISH);
/**
* @param milliseconds
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java?rev=1056776&r1=1056775&r2=1056776&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Time.java Sat Jan 8 19:44:00 2011
@@ -20,6 +20,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
+import java.util.Locale;
/**
* An immutable <code>Time</code> class that represents a specific point in time. The underlying
@@ -39,10 +40,12 @@ public final class Time extends Abstract
public static final Time START_OF_UNIX_TIME = milliseconds(0);
/** parser in 'yyyy.MM.dd' format. */
- private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd");
+ private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd",
+ Locale.ENGLISH);
/** parser in 'yyyy.MM.dd-h.mma' format. */
- private static final SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy.MM.dd-h.mma");
+ private static final SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy.MM.dd-h.mma",
+ Locale.ENGLISH);
/**
* Retrieves a <code>Time</code> instance based on the given milliseconds.
@@ -202,7 +205,7 @@ public final class Time extends Abstract
*/
public static Time valueOf(final String string, final String pattern) throws ParseException
{
- final SimpleDateFormat dateTimeFormat = new SimpleDateFormat(pattern);
+ final SimpleDateFormat dateTimeFormat = new SimpleDateFormat(pattern, Locale.ENGLISH);
dateTimeFormat.setCalendar(localtime);
return valueOf(dateTimeFormat.parse(string));
}
@@ -530,7 +533,7 @@ public final class Time extends Abstract
*/
public String toString(final Calendar calendar, final String format)
{
- final SimpleDateFormat dateTimeFormat = new SimpleDateFormat(format);
+ final SimpleDateFormat dateTimeFormat = new SimpleDateFormat(format, Locale.ENGLISH);
dateTimeFormat.setCalendar(calendar == null ? localtime : calendar);
return dateTimeFormat.format(new Date(getMilliseconds()));
}