You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2011/04/13 23:27:10 UTC
svn commit: r1091924 - in /wicket/trunk:
wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalPanel1.java
Author: pete
Date: Wed Apr 13 21:27:10 2011
New Revision: 1091924
URL: http://svn.apache.org/viewvc?rev=1091924&view=rev
Log:
use joda time where appropriate + minor fix
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalPanel1.java
Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java?rev=1091924&r1=1091923&r2=1091924&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java Wed Apr 13 21:27:10 2011
@@ -40,6 +40,7 @@ import org.apache.wicket.util.convert.co
import org.apache.wicket.validation.validator.RangeValidator;
import org.joda.time.DateTimeFieldType;
import org.joda.time.DateTimeZone;
+import org.joda.time.LocalDate;
import org.joda.time.MutableDateTime;
import org.joda.time.format.DateTimeFormat;
@@ -346,11 +347,10 @@ public class DateTimeField extends FormC
}
// Get year, month and day ignoring any timezone of the Date object
- Calendar cal = Calendar.getInstance();
- cal.setTime(dateFieldInput);
- int year = cal.get(Calendar.YEAR);
- int month = cal.get(Calendar.MONTH) + 1;
- int day = cal.get(Calendar.DAY_OF_MONTH);
+ final LocalDate localDate = new LocalDate(dateFieldInput);
+ int year = localDate.getYear();
+ int month = localDate.getMonthOfYear();
+ int day = localDate.getDayOfMonth();
int hours = (hoursInput == null ? 0 : hoursInput % 24);
int minutes = (minutesInput == null ? 0 : minutesInput);
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalPanel1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalPanel1.java?rev=1091924&r1=1091923&r2=1091924&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalPanel1.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalPanel1.java Wed Apr 13 21:27:10 2011
@@ -39,9 +39,8 @@ public class ModalPanel1 extends Panel
/**
* @see org.apache.wicket.extensions.yui.calendar.DateTimeField#configure(java.util.Map)
*/
- @SuppressWarnings("unchecked")
@Override
- protected void configure(Map widgetProperties)
+ protected void configure(Map<String, Object> widgetProperties)
{
super.configure(widgetProperties);
// IE 6 breaks layout with iframe - is that a YUI bug?