Author: akushunin Date: 2007-08-30 11:47:07 -0400 (Thu, 30 Aug 2007) New Revision: 2622 Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java Log: RF-759 and added CurrentDateChangeListener Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java =================================================================== --- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-08-30 15:09:59 UTC (rev 2621) +++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-08-30 15:47:07 UTC (rev 2622) @@ -35,11 +35,11 @@ import javax.faces.context.FacesContext; import javax.faces.convert.ConverterException; import javax.faces.convert.DateTimeConverter; +import javax.faces.el.MethodBinding; import javax.faces.el.ValueBinding; import javax.faces.event.AbortProcessingException; import javax.faces.event.FacesEvent; import javax.faces.event.ValueChangeEvent; - import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.event.AjaxEvent; import org.apache.commons.logging.Log; @@ -135,6 +135,11 @@ public abstract String getBoundaryDatesMode(); public abstract void setBoundaryDatesMode(String boundaryDatesMode); + + public abstract MethodBinding getCurrentDateChangeListener(); + + public abstract void setCurrentDateChangeListener(MethodBinding scrollerListener); + //TODO onclick add users onclick @@ -306,7 +311,15 @@ CurrentDateChangeEvent newDateChangeEvent = new CurrentDateChangeEvent( this, currentDate); newDateChangeEvent.queue(); + MethodBinding binding = getCurrentDateChangeListener(); + if(binding!=null){ + + binding.invoke(facesContext, new Object[]{event}); + } + + + } catch (Exception e) { // XXX nick - kaa - add log.debug(...) // XXX nick - kaa - we should stop processing on exc. Modified: trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java =================================================================== --- trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java 2007-08-30 15:09:59 UTC (rev 2621) +++ trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java 2007-08-30 15:47:07 UTC (rev 2622) @@ -21,6 +21,7 @@ import com.gargoylesoftware.htmlunit.ElementNotFoundException; import com.gargoylesoftware.htmlunit.html.HtmlButton; import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlImage; import com.gargoylesoftware.htmlunit.html.HtmlInput; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlScript; @@ -48,6 +49,7 @@ javaScripts .add("org/richfaces/renderkit/html/scripts/json/json-dom.js"); javaScripts.add("org/richfaces/renderkit/html/scripts/calendar.js"); + javaScripts.add("org/richfaces/renderkit/html/scripts/scriptaculous/effects.js"); } public CalendarComponentTest(String name) { @@ -169,7 +171,7 @@ */ HtmlPage page = renderView(); assertNotNull(page); - //System.out.println(page.asXml()); + System.out.println(page.asXml()); HtmlElement htmlCalendar = page.getHtmlElementById(calendar .getClientId(facesContext)); @@ -178,7 +180,7 @@ HtmlInput htmlCalendarInput = (HtmlInput) page .getHtmlElementById(calendar.getClientId(facesContext) + "InputDate"); - HtmlButton htmlCalendarButton = (HtmlButton) page + HtmlImage htmlCalendarButton = (HtmlImage) page .getHtmlElementById(calendar.getClientId(facesContext) + "PopupButton"); HtmlSpan htmlCalendarSpan = (HtmlSpan) page.getHtmlElementById(calendar