You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/04/10 06:50:49 UTC
svn commit: r527023 - in
/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/datetime/util:
PatternDateConverter.java StyleDateConverter.java
Author: ehillenius
Date: Mon Apr 9 21:50:49 2007
New Revision: 527023
URL: http://svn.apache.org/viewvc?view=rev&rev=527023
Log:
set pivot year by default. removed hack.
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/datetime/util/PatternDateConverter.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/datetime/util/StyleDateConverter.java
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/datetime/util/PatternDateConverter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/datetime/util/PatternDateConverter.java?view=diff&rev=527023&r1=527022&r2=527023
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/datetime/util/PatternDateConverter.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/datetime/util/PatternDateConverter.java Mon Apr 9 21:50:49 2007
@@ -44,7 +44,8 @@
*
* @author eelcohillenius
*/
-public class PatternDateConverter extends DateConverter {
+public class PatternDateConverter extends DateConverter
+{
private static final long serialVersionUID = 1L;
@@ -72,11 +73,12 @@
* @throws IllegalArgumentException
* in case the date pattern is null
*/
- public PatternDateConverter(String datePattern,
- boolean applyTimeZoneDifference) {
+ public PatternDateConverter(String datePattern, boolean applyTimeZoneDifference)
+ {
super(applyTimeZoneDifference);
- if (datePattern == null) {
+ if (datePattern == null)
+ {
throw new IllegalArgumentException("datePattern must be not null");
}
this.datePattern = datePattern;
@@ -87,15 +89,17 @@
*
* @return datePattern
*/
- public final String getDatePattern() {
+ public final String getDatePattern()
+ {
return datePattern;
}
/**
* @return formatter The formatter for the current conversion
*/
- protected DateTimeFormatter getFormat() {
- return DateTimeFormat.forPattern(datePattern).withLocale(
- Session.get().getLocale());
+ protected DateTimeFormatter getFormat()
+ {
+ return DateTimeFormat.forPattern(datePattern).withLocale(Session.get().getLocale())
+ .withPivotYear(2000);
}
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/datetime/util/StyleDateConverter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/datetime/util/StyleDateConverter.java?view=diff&rev=527023&r1=527022&r2=527023
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/datetime/util/StyleDateConverter.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/datetime/util/StyleDateConverter.java Mon Apr 9 21:50:49 2007
@@ -40,7 +40,8 @@
*
* @author eelcohillenius
*/
-public class StyleDateConverter extends DateConverter {
+public class StyleDateConverter extends DateConverter
+{
private static final long serialVersionUID = 1L;
@@ -68,7 +69,8 @@
* whether to apply the difference in time zones between client
* and server
*/
- public StyleDateConverter(boolean applyTimeZoneDifference) {
+ public StyleDateConverter(boolean applyTimeZoneDifference)
+ {
this("S-", applyTimeZoneDifference);
}
@@ -96,9 +98,11 @@
* @throws IllegalArgumentException
* in case dateStyle is null
*/
- public StyleDateConverter(String dateStyle, boolean applyTimeZoneDifference) {
+ public StyleDateConverter(String dateStyle, boolean applyTimeZoneDifference)
+ {
super(applyTimeZoneDifference);
- if (dateStyle == null) {
+ if (dateStyle == null)
+ {
throw new IllegalArgumentException("dateStyle must be not null");
}
this.dateStyle = dateStyle;
@@ -109,22 +113,17 @@
*
* @return datePattern
*/
- public final String getDatePattern() {
- String str = DateTimeFormat.patternForStyle(dateStyle, Session.get()
- .getLocale());
- // a bit of a hack, but yy shouldn't be used then the datepicker will make from 1/1/07 -> 1/1/1907
- if (str.indexOf("yyy") == -1)
- {
- str = str.replaceAll("yy", "yyyy");
- }
- return str;
+ public final String getDatePattern()
+ {
+ return DateTimeFormat.patternForStyle(dateStyle, Session.get().getLocale());
}
/**
* @return formatter The formatter for the current conversion
*/
- protected DateTimeFormatter getFormat() {
- DateTimeFormatter dtf = DateTimeFormat.forPattern(getDatePattern());
+ protected DateTimeFormatter getFormat()
+ {
+ DateTimeFormatter dtf = DateTimeFormat.forPattern(getDatePattern()).withPivotYear(2000);
return dtf;
}
}