Author: ppitonak(a)redhat.com Date: 2010-12-23 08:45:36 -0500 (Thu, 23 Dec 2010) New Revision: 20767 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CalendarModel.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CalendarModelItem.java modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/dataModel.xhtml Log: * fixed sample for calendar with data model Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CalendarModel.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CalendarModel.java 2010-12-23 12:58:58 UTC (rev 20766) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CalendarModel.java 2010-12-23 13:45:36 UTC (rev 20767) @@ -79,4 +79,9 @@ return modelItems; } + + @Override + public Object getToolTip(Date date) { + return null; + } } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CalendarModelItem.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CalendarModelItem.java 2010-12-23 12:58:58 UTC (rev 20766) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CalendarModelItem.java 2010-12-23 13:45:36 UTC (rev 20767) @@ -49,4 +49,20 @@ public String getStyleClass() { return styleClass; } + + public Object getData() { + return null; + } + + public boolean hasToolTip() { + return false; + } + + public Object getToolTip() { + return null; + } + + public int getDay() { + return 0; + } } Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/dataModel.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/dataModel.xhtml 2010-12-23 12:58:58 UTC (rev 20766) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/dataModel.xhtml 2010-12-23 13:45:36 UTC (rev 20767) @@ -55,13 +55,17 @@ <ui:define name="component"> <div style="padding: 250px"> <rich:calendar id="calendar" boundaryDatesMode="scroll" dataModel="#{calendarModel}" mode="ajax" > - <a4j:ajax event="change" render="output, requestTime" limitRender="#{true}"/> + <a4j:ajax event="change" render="output, phasesPanel" limitRender="#{true}"/> </rich:calendar> </div> <br/><br/> - output: <h:outputText id="output" value="#{richCalendarBean.attributes['value'].value}"/> + output: + <h:outputText id="output" value="#{richCalendarBean.attributes['value'].value}"> + <f:convertDateTime pattern="#{richCalendarBean.attributes['datePattern'].value}" + timeZone="#{richCalendarBean.timeZone}"/> + </h:outputText> </ui:define>