[richfaces-svn-commits] JBoss Rich Faces SVN: r10655 - in trunk/test-applications/jsp/src/main/webapp: DropDownMenu and 5 other directories.

Author: tromanovich Date: 2008-10-03 05:05:15 -0400 (Fri, 03 Oct 2008) New Revision: 10655 Modified: trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInputProperty.jsp trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelectProperty.jsp trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp trunk/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Tree.xml Log: Modified: trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp 2008-10-03 09:00:29 UTC (rev 10654) +++ trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp 2008-10-03 09:05:15 UTC (rev 10655) @@ -100,7 +100,7 @@ </rich:dataTable> <rich:spacer height="20" width="150"></rich:spacer> - <rich:dataTable value="#{columns.data1}" var="cust"> + <rich:dataTable id="latsTable" value="#{columns.data1}" var="cust" > <f:facet name="header"> <rich:columnGroup> <rich:column> @@ -115,5 +115,7 @@ </f:facet> </rich:column> </rich:dataTable> +<a4j:commandButton value="reRender" + reRender="lastTable"></a4j:commandButton> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp 2008-10-03 09:00:29 UTC (rev 10654) +++ trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp 2008-10-03 09:05:15 UTC (rev 10655) @@ -51,10 +51,12 @@ <h:outputText value="GroupDirection:" /> <h:selectOneRadio value="#{dDMenu.groupDirection}"> - <f:selectItem itemLabel="top-up" itemValue="top-up" /> - <f:selectItem itemLabel="top-down" itemValue="top-down" /> - <f:selectItem itemLabel="bottom-up" itemValue="bottom-up" /> - <f:selectItem itemLabel="bottom-down" itemValue="bottom-down" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="left-down" itemValue="left-down" /> + <f:selectItem itemLabel="left-up" itemValue="left-up" /> + <f:selectItem itemLabel="right-down" itemValue="right-down" /> + <f:selectItem itemLabel="right-up" itemValue="right-up" /> <f:selectItem itemLabel="auto" itemValue="auto" /> <a4j:support event="onclick" reRender="ddmId" /> </h:selectOneRadio> Modified: trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp 2008-10-03 09:00:29 UTC (rev 10654) +++ trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp 2008-10-03 09:05:15 UTC (rev 10655) @@ -2,7 +2,7 @@ <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<<script type="text/javascript"> +<script type="text/javascript"> <!-- function onClick() { Modified: trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInputProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInputProperty.jsp 2008-10-03 09:00:29 UTC (rev 10654) +++ trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInputProperty.jsp 2008-10-03 09:05:15 UTC (rev 10655) @@ -107,7 +107,7 @@ value="cancel"></a4j:commandLink> <br /> <a4j:commandLink - onclick="$('formID:inplaceInputSubviewID:inplaceInputId').component.getValue()" + onclick="alert($('formID:inplaceInputSubviewID:inplaceInputId').component.getValue())" value="getValue"></a4j:commandLink> <br /> <a4j:commandLink Modified: trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelectProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelectProperty.jsp 2008-10-03 09:00:29 UTC (rev 10654) +++ trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelectProperty.jsp 2008-10-03 09:05:15 UTC (rev 10655) @@ -102,11 +102,11 @@ value="cancel"></a4j:commandLink> <br /> <a4j:commandLink - onclick="$('formID:inplaceSelectSubviewID:inplaceSelectID').component.getValue()" + onclick="alert ($('formID:inplaceSelectSubviewID:inplaceSelectID').component.getValue())" value="getValue"></a4j:commandLink> <br /> <a4j:commandLink - onclick="$('formID:inplaceSelectSubviewID:inplaceSelectID').component.setValue('setValue')" + onclick="$('formID:inplaceSelectSubviewID:inplaceSelectID').component.setValue('passeds','passeds')" value="setValue"></a4j:commandLink> <br /> @@ -122,7 +122,7 @@ <br /> <a href="#" id="getValueID">getValue()</a> <br /> - <a href="#" id="setValueID">setValue('newValue')</a> + <a href="#" id="setValueID">setValue('passeds','passeds')</a> </f:verbatim> <rich:componentControl attachTo="editID" event="onclick" @@ -132,9 +132,13 @@ <rich:componentControl attachTo="cancelID" event="onclick" for="inplaceSelectID" operation="cancel"></rich:componentControl> <rich:componentControl attachTo="getValueID" event="onclick" - for="inplaceSelectID" operation="getValue"></rich:componentControl> + for="inplaceSelectID" operation="getValue" name="alert"> + </rich:componentControl> <rich:componentControl attachTo="setValueID" event="onclick" - for="inplaceSelectID" operation="setValue('newValue')"></rich:componentControl> + for="inplaceSelectID" operation="setValue"> + <f:param name="value" value="passeds"/> + <f:param name="label" value="passeds"/> + </rich:componentControl> <br /> <br /> <div style="FONT-WEIGHT: bold;">rich:findComponent</div> Modified: trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp 2008-10-03 09:00:29 UTC (rev 10654) +++ trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp 2008-10-03 09:05:15 UTC (rev 10655) @@ -80,6 +80,7 @@ <rich:column sortBy="#{data.int0}" selfSorted="#{sortingAndFiltering.selfSorted}" sortOrder="#{sortingAndFiltering.sortOrder}" filterBy="#{data.int0}"> + <f:facet name="header"> <h:outputText value="#1" /> </f:facet> Modified: trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp 2008-10-03 09:00:29 UTC (rev 10654) +++ trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp 2008-10-03 09:05:15 UTC (rev 10655) @@ -36,20 +36,20 @@ <h:messages /> </a4j:outputPanel> - <rich:tree id="tree" switchType="#{bean.switchType}" - value="#{bean.data}" var="data" selectedClass="#{style.selectedClass}" + <rich:tree id="tree" switchType="#{treeBean.switchType}" + value="#{treeBean.data}" var="dataTree" selectedClass="#{style.selectedClass}" styleClass="#{style.styleClass}" style="#{style.style}" highlightedClass="#{style.highlightedClass}" - nodeFace="#{data.name != 'param-value' ? 'input' : 'text'}" - changeExpandListener="#{bean.onExpand}" - nodeSelectListener="#{bean.onSelect}" binding="#{bean.tree}" + nodeFace="#{dataTree.name != 'param-value' ? 'input' : 'text'}" + changeExpandListener="#{treeBean.onExpand}" + nodeSelectListener="#{treeBean.onSelect}" binding="#{treeBean.tree}" onselected="window.status='selectedNode: '+event.selectedNode;" onexpand="window.status='expandedNode: '+event.expandedNode" oncollapse="window.status='collapsedNode: '+ event.collapsedNode" ajaxSubmitSelection="true" reRender="outputText, selectOneListbox" preserveModel="none" dragIndicator="treeIndicator" immediate="false" - acceptedTypes="file1" dragType="#{bean.dragOn ? 'file1' : ''}" - icon="#{bean.icon}" dropListener="#{bean.processDrop}" + acceptedTypes="file1" dragType="#{treeBean.dragOn ? 'file1' : ''}" + icon="#{treeBean.icon}" dropListener="#{treeBean.processDrop}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" ondragend="#{event.ondragend}" ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondragstart="#{event.ondragstart}" @@ -60,26 +60,26 @@ onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onbeforedomupdate="#{event.onbeforedomupdate}" oncomplete="#{event.oncomplete}" ondropout="#{event.ondropout}" - ondropover="#{event.ondropover}" adviseNodeOpened="#{bean.adviseNodeOpened}" - adviseNodeSelected="#{bean.adviseNodeSelected}"> + ondropover="#{event.ondropover}" adviseNodeOpened="#{treeBean.adviseNodeOpened}" + adviseNodeSelected="#{treeBean.adviseNodeSelected}"> <!-- <f:facet name="icon"> - <h:outputText value="icon" rendered="#{bean.renderFacets}" /> + <h:outputText value="icon" rendered="#{treeBean.renderFacets}" /> </f:facet> <f:facet name="iconLeaf"> - <h:outputText value="leaf" rendered="#{bean.renderFacets}" /> + <h:outputText value="leaf" rendered="#{treeBean.renderFacets}" /> </f:facet> <f:facet name="iconExpanded"> - <h:outputText value="expanded" rendered="#{bean.renderFacets}" /> + <h:outputText value="expanded" rendered="#{treeBean.renderFacets}" /> </f:facet> <f:facet name="iconCollapsed"> - <h:outputText value="collapsed" rendered="#{bean.renderFacets}" /> + <h:outputText value="collapsed" rendered="#{treeBean.renderFacets}" /> </f:facet> --> <rich:dndParam name="treeParam" value="Tree Parameter" /> <rich:dndParam name="accept" value="accept" /> - <rich:treeNode type="input" dropListener="#{bean.processDrop}" + <rich:treeNode type="input" dropListener="#{treeBean.processDrop}" oncollapse="Element.removeClassName(event['treeItem'].getElement(), 'colored')" onexpand="Element.addClassName(event['treeItem'].getElement(), 'colored')" onbeforedomupdate="#{event.onbeforedomupdate}" @@ -94,8 +94,8 @@ onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselected="#{event.onselected}"> - <h:outputText value="#{data} : " /> - <h:inputText value="#{data.name}" required="true" styleClass="inputs"> + <h:outputText value="#{dataTree} : " /> + <h:inputText value="#{dataTree.name}" required="true" styleClass="inputs"> </h:inputText> <rich:dndParam name="nodeParam" value="Node Parameter" /> @@ -103,7 +103,7 @@ </rich:treeNode> <rich:treeNode type="text" nodeClass="customNode" acceptedTypes="file2" onselected="return false;"> - <h:outputText value="#{data}" /> + <h:outputText value="#{dataTree}" /> </rich:treeNode> </rich:tree> @@ -112,30 +112,30 @@ </f:verbatim> <h:outputText value="Enter path to expand:" /> - <h:inputText value="#{bean.pathToExpand}"> + <h:inputText value="#{treeBean.pathToExpand}"> <a4j:support event="onchange" reRender="tree" - action="#{bean.expandNode}" /> + action="#{treeBean.expandNode}" /> </h:inputText> <rich:separator></rich:separator> <h:panelGrid columns="2"> <h:outputText value="Change tree switchType:" /> - <h:selectOneRadio value="#{bean.switchType}" onclick="submit()"> + <h:selectOneRadio value="#{treeBean.switchType}" onclick="submit()"> <f:selectItem itemLabel="client" itemValue="client" /> <f:selectItem itemLabel="server" itemValue="server" /> <f:selectItem itemLabel="ajax" itemValue="ajax" /> </h:selectOneRadio> <h:outputText value="Drag switch:" /> - <h:selectBooleanCheckbox value="#{bean.dragOn}" onchange="submit();"></h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="#{treeBean.dragOn}" onchange="submit();"></h:selectBooleanCheckbox> <h:outputText value="Render facets:" /> - <h:selectBooleanCheckbox value="#{bean.renderFacets}" + <h:selectBooleanCheckbox value="#{treeBean.renderFacets}" onchange="submit();"></h:selectBooleanCheckbox> - <h:commandButton value="#{bean.commandButtonCaption}" - actionListener="#{bean.changeIcons}" /> + <h:commandButton value="#{treeBean.commandButtonCaption}" + actionListener="#{treeBean.changeIcons}" /> </h:panelGrid> <f:verbatim> @@ -144,8 +144,8 @@ </f:verbatim> <rich:tree id="testTree" var="_data" switchType="ajax" - ajaxSubmitSelection="true" preserveModel="none" value="#{bean.data1}" - nodeSelectListener="#{bean.onSelectInc}" nodeFace="node"> + ajaxSubmitSelection="true" preserveModel="none" value="#{treeBean.data1}" + nodeSelectListener="#{treeBean.onSelectInc}" nodeFace="node"> <rich:treeNode type="node"> <h:outputText value="#{_data}" /> </rich:treeNode> Modified: trunk/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp 2008-10-03 09:00:29 UTC (rev 10654) +++ trunk/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp 2008-10-03 09:05:15 UTC (rev 10655) @@ -6,7 +6,7 @@ <f:subview id="treePropertySubviewID"> <br /> <br /> - <h:commandButton value="add test" action="#{bean.addHtmlTree}"></h:commandButton> + <h:commandButton value="add test" action="#{treeBean.addHtmlTree}"></h:commandButton> <div style="FONT-WEIGHT: bold;">rich:findComponent</div> <h:panelGrid columns="2"> <rich:column> @@ -15,5 +15,10 @@ <rich:column id="findID"> <h:outputText value="#{rich:findComponent('tree').adviseNodeSelected}" /> </rich:column> + <rich:column> + <a4j:commandLink + onclick="$('formID:treeSubviewID:tree').component.isRowAvailable()" + value="isRowAvailable"></a4j:commandLink> + </rich:column> </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Tree.xml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Tree.xml 2008-10-03 09:00:29 UTC (rev 10654) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Tree.xml 2008-10-03 09:05:15 UTC (rev 10655) @@ -3,7 +3,7 @@ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> <faces-config> <managed-bean> - <managed-bean-name>bean</managed-bean-name> + <managed-bean-name>treeBean</managed-bean-name> <managed-bean-class>tree.Bean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean>