svn commit: r581316 - in /wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar: DatePicker.java wicket-date.js

[gseitz]

Author: gseitz
Date: Tue Oct  2 10:42:37 2007
New Revision: 581316

URL: http://svn.apache.org/viewvc?rev=581316&view=rev
Log:
WICKET-1030: add support for CalendarGroup

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

Modified: 
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=581316&r1=581315&r2=581316&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
 Tue Oct  2 10:42:37 2007
@@ -45,6 +45,7 @@
 import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
 import org.apache.wicket.util.convert.IConverter;
 import org.apache.wicket.util.convert.converters.DateConverter;
+import org.apache.wicket.util.lang.Objects;
 import org.apache.wicket.util.string.Strings;
 import org.apache.wicket.util.template.PackagedTextTemplate;
 import org.apache.wicket.util.template.TextTemplate;
@@ -192,6 +193,13 @@
                // print out the initialization properties
                Properties p = new Properties();
                configure(p);
+
+               if (enableMonthYearSelection() && p.containsKey("pages")
+                               && Objects.longValue(p.get("pages")) > 1)
+               {
+                       throw new IllegalStateException(
+                                       "You cannot use a CalendarGroup with 
month/year selection!");
+               }
 
                // ${calendarInit}
                StringBuffer calendarInit = new StringBuffer();

Modified: 
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js?rev=581316&r1=581315&r2=581316&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
 Tue Oct  2 10:42:37 2007
@@ -242,7 +242,11 @@
        cfg.dp = cfg.widgetId + "Dp";
        cfg.icon = cfg.widgetId +"Icon";
        YAHOO.namespace("wicket");
-       YAHOO.wicket[cfg.dpJs] = new YAHOO.widget.Calendar(cfg.dpJs,cfg.dp, 
cfg.calendarInit);  
+       if (cfg.calendarInit.pages && cfg.calendarInit.pages > 1) {
+               YAHOO.wicket[cfg.dpJs] = new 
YAHOO.widget.CalendarGroup(cfg.dpJs,cfg.dp, cfg.calendarInit);
+       } else {
+               YAHOO.wicket[cfg.dpJs] = new 
YAHOO.widget.Calendar(cfg.dpJs,cfg.dp, cfg.calendarInit);
+       }       
        YAHOO.wicket[cfg.dpJs].isVisible = function() { return 
YAHOO.wicket[cfg.dpJs].oDomContainer.style.display == 'block'; }
        if (cfg.enableMonthYearSelection) 
Wicket.DateTime.enableMonthYearSelection(YAHOO.wicket[cfg.dpJs]);