Author: gseitz
Date: Mon Nov 12 10:21:57 2007
New Revision: 594247

URL: http://svn.apache.org/viewvc?rev=594247&view=rev
Log:
WICKET-1151

Modified:
    
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java

Modified: 
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java?rev=594247&r1=594246&r2=594247&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
 Mon Nov 12 10:21:57 2007
@@ -347,6 +347,13 @@
        protected void onBeforeRender()
        {
                dateField.setRequired(isRequired());
+               hoursField.setRequired(isRequired());
+               minutesField.setRequired(isRequired());
+
+               dateField.setEnabled(isEnabled() && isEnableAllowed());
+               hoursField.setEnabled(isEnabled() && isEnableAllowed());
+               minutesField.setEnabled(isEnabled() && isEnableAllowed());
+               amOrPmChoice.setEnabled(isEnabled() && isEnableAllowed());
 
                Date d = (Date)getModelObject();
                if (d != null)
@@ -374,7 +381,7 @@
                        amOrPm = (date.get(DateTimeFieldType.halfdayOfDay()) == 
0) ? AM_PM.AM : AM_PM.PM;
 
                        // we don't really have to reset the date field to the 
server's
-                       // timezone, as it's the same milis from EPOCH anyway, 
and toDate
+                       // timezone, as it's the same milliseconds from EPOCH 
anyway, and toDate
                        // will always get the Date object initialized for the 
time zone
                        // of the server
                }


Reply via email to