Author: ayanul Date: 2008-03-24 11:11:35 -0400 (Mon, 24 Mar 2008) New Revision: 7116 Modified: trunk/test-applications/jsp/src/main/java/util/data/Data.java trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp Log: Modified: trunk/test-applications/jsp/src/main/java/util/data/Data.java =================================================================== --- trunk/test-applications/jsp/src/main/java/util/data/Data.java 2008-03-24 15:10:44 UTC (rev 7115) +++ trunk/test-applications/jsp/src/main/java/util/data/Data.java 2008-03-24 15:11:35 UTC (rev 7116) @@ -232,4 +232,9 @@ return true; } + @Override + public String toString() { + + return str0 + ":" + str1 + ":" + str2 + ":" + str3 + ":" + int0 + ":" + int1 + ":" + int2 + ":" + int3 + ":" + bool0 + ":" + bool1 + ":" + bool2 + ":" + bool3; + } } Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2008-03-24 15:10:44 UTC (rev 7115) +++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2008-03-24 15:11:35 UTC (rev 7116) @@ -14,11 +14,14 @@ <h:outputText value="Ajax mode" rendered="#{calendarBean.renderedAjax}" /> - <rich:calendar id="calendarClientID" horizontalOffset="#{calendarBean.horizontalOffset}" - verticalOffset="#{calendarBean.verticalOffset}" ignoreDupResponses="#{calendarBean.ignoreDupResponses}" - inputSize="#{calendarBean.inputSize}" eventsQueue="myEventsQueue" label="calendarLabel" limitToList="#{calendarBean.limitToList}" - dataModel="#{calendarDataModel}" - style="#{style.style}" styleClass="#{style.styleClass}" inputStyle="#{style.inputStyle}" + <rich:calendar id="calendarClientID" + horizontalOffset="#{calendarBean.horizontalOffset}" + verticalOffset="#{calendarBean.verticalOffset}" + ignoreDupResponses="#{calendarBean.ignoreDupResponses}" + inputSize="#{calendarBean.inputSize}" eventsQueue="myEventsQueue" + label="calendarLabel" limitToList="#{calendarBean.limitToList}" + dataModel="#{calendarDataModel}" style="#{style.style}" + styleClass="#{style.styleClass}" inputStyle="#{style.inputStyle}" locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" @@ -57,7 +60,7 @@ immediate="#{calendarBean.immediate}" onbeforedomupdate="#{event.onbeforedomupdate}" onchanged="#{event.onchanged}" oncollapse="#{event.oncollapse}" - oncomplete="#{event.oncomplete}" + oncomplete="#{event.oncomplete}" oncurrentdateselect="#{event.oncurrentdateselect}" ondatemouseout="#{event.ondatemouseout}" ondatemouseover="#{event.ondatemouseover}" @@ -102,9 +105,9 @@ </h:panelGrid> </rich:calendar> - <rich:calendar id="calendarAjaxID" dataModel="#{calendarDataModel}" - locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" - datePattern="#{calendarBean.pattern}" + <rich:calendar id="calendarAjaxID" + dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}" + popup="#{calendarBean.popup}" datePattern="#{calendarBean.pattern}" weekDayLabels="#{calendarBean.weekDayLabels}" weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" monthLabels="#{calendarBean.monthLabels}" @@ -150,7 +153,7 @@ oninputselect="#{event.oninputselect}" ontimeselect="#{event.ontimeselect}" ontimeselected="#{event.ontimeselected}"> - + <f:facet name="weekDay"> <f:verbatim> <span style="padding: 2px; font-size: 4">{weekDayLabel + @@ -181,5 +184,6 @@ </h:panelGrid> </rich:calendar> </h:panelGrid> - <h:outputLink value="http://www.jboss.com/index.html?module=bb&op=viewforum&am... + <h:outputLink + value="http://www.jboss.com/index.html?module=bb&op=viewforum&am... </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp 2008-03-24 15:10:44 UTC (rev 7115) +++ trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp 2008-03-24 15:11:35 UTC (rev 7116) @@ -47,7 +47,7 @@ <h:outputText value="cellWidth: "></h:outputText> <h:inputText value="#{calendarBean.cellWidth}" onchange="submit();"></h:inputText> - <h:outputText value="Custom day labels" /> + <h:outputText value="todayControlMode" /> <h:selectOneRadio value="#{calendarBean.todayControlMode}" onchange="submit();"> <f:selectItem itemLabel="scroll" itemValue="scroll" /> <f:selectItem itemLabel="select" itemValue="select" /> Modified: trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2008-03-24 15:10:44 UTC (rev 7115) +++ trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2008-03-24 15:11:35 UTC (rev 7116) @@ -42,13 +42,27 @@ <br /> <br /> </f:verbatim> - + + <a4j:commandLink onclick="Richfaces.showModalPanel('modalPanel2ID');return false;" value="show ModalPanel 2"> + </a4j:commandLink> + <f:verbatim> + <br /> + <br /> + </f:verbatim> <h:outputLink onclick="Richfaces.hideModalPanel('modalPanelID');return false;" value="Close"> <f:verbatim>Close</f:verbatim> </h:outputLink> - <jsp:include flush="true" page="${richBean.pathComponentContainer}" /> </rich:modalPanel> + + <rich:modalPanel id="modalPanel2ID" minHeight="100" minWidth="200" > + <h:outputText value="text"></h:outputText> + <h:inputText value="input"></h:inputText> + <h:outputLink onclick="Richfaces.hideModalPanel('modalPanel2ID');return false;" value="Close"> + <f:verbatim>Close</f:verbatim> + </h:outputLink> + </rich:modalPanel> + <a onclick="Richfaces.showModalPanel('modalPanelID');" href="#">Show MP</a> Modified: trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp 2008-03-24 15:10:44 UTC (rev 7115) +++ trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp 2008-03-24 15:11:35 UTC (rev 7116) @@ -4,7 +4,8 @@ <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <f:subview id="progressBarSubviewID"> - <rich:progressBar id="progressBarID" value="#{progressBar.value}" + <rich:progressBar id="progressBarID" ajaxSingle="#{progressBar.ajaxSingle}" label="#{progressBar.label}" immediate="#{progressBar.immediate}" + value="#{progressBar.value}" style="width: 450px; height: 19px;#{style.style};" completeClass="#{style.completeClass}" finishClass="#{style.finishClass}" initialClass="#{style.initialClass}" remainClass="#{style.remainClass}" styleClass="#{style.styleClass}" mode="#{progressBar.mode}" enabled="#{progressBar.enabled}" actionListener="#{progressBar.actionListener}" @@ -46,6 +47,8 @@ onclick="alert($('formID:progressBarSubviewID:progressBarID').component.getValue())"></a4j:commandButton> <a4j:commandLink value="setLabel" onclick="$('formID:progressBarSubviewID:progressBarID').component.setLabel('setLabel work')"></a4j:commandLink> + <a4j:commandLink value="setValue(0)" + onclick="$('formID:progressBarSubviewID:progressBarID').component.setValue('0')"></a4j:commandLink> <a4j:commandLink value="disable" onclick="$('formID:progressBarSubviewID:progressBarID').component.disable();"></a4j:commandLink> <a4j:commandLink value="enable" @@ -64,6 +67,10 @@ <h:inputText id="valuePBID" value="#{progressBar.value}"> <a4j:support event="onchange" reRender="progressBarID"></a4j:support> </h:inputText> + <h:outputText value="label:" /> + <h:inputText value="#{progressBar.label}"> + <a4j:support event="onchange" reRender="progressBarID"></a4j:support> + </h:inputText> <h:outputText value="interval:" /> <h:inputText value="#{progressBar.interval}"> @@ -82,6 +89,11 @@ <a4j:support event="onchange" reRender="progressBarID"></a4j:support> </h:selectBooleanCheckbox> + <h:outputText value="ajaxSingle" /> + <h:selectBooleanCheckbox value="#{progressBar.ajaxSingle}"> + <a4j:support event="onchange" reRender="progressBarID"></a4j:support> + </h:selectBooleanCheckbox> + <h:outputText value="permanent:" /> <h:selectBooleanCheckbox value="#{progressBar.permanent}" onchange="submit();" /> @@ -92,10 +104,6 @@ <h:outputText value="maxValue:" /> <h:inputText value="#{progressBar.maxValue}" onchange="submit();" /> - <h:outputText value="dualColoredLabel:" /> - <h:selectBooleanCheckbox value="#{progressBar.dualColoredLabel}" - onchange="submit();" /> - <h:outputText value="ignoreDupResponses" /> <h:selectBooleanCheckbox value="#{progressBar.ignoreDupResponses}" onchange="submit();" /> @@ -103,5 +111,11 @@ <h:outputText value="rendered:" /> <h:selectBooleanCheckbox value="#{progressBar.rendered}" onchange="submit();" /> + + <h:outputText value="immediate" /> + <h:selectBooleanCheckbox value="#{progressBar.immediate}"> + <a4j:support event="onchange" reRender="progressBarID"></a4j:support> + </h:selectBooleanCheckbox> + </h:panelGrid> </f:subview> \ No newline at end of file