Author: lfryc(a)redhat.com Date: 2010-12-15 12:12:33 -0500 (Wed, 15 Dec 2010) New Revision: 20589 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml Log: rich:tree - sample supporting execute/render (RF-9719, RF-9827) Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java 2010-12-15 17:11:51 UTC (rev 20588) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java 2010-12-15 17:12:33 UTC (rev 20589) @@ -88,6 +88,8 @@ attributes.setAttribute("iconClass", null); attributes.setAttribute("labelClass", null); attributes.setAttribute("nodeClass", null); + attributes.setAttribute("execute", null); + attributes.setAttribute("render", null); // hidden attributes attributes.remove("selectionChangeListener"); Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml 2010-12-15 17:11:51 UTC (rev 20588) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml 2010-12-15 17:12:33 UTC (rev 20589) @@ -87,7 +87,8 @@ nodeClass="#{richTreeBean.attributes['nodeClass'].value}" selectionChangeListener="#{richTreeListenerBean.processSelectionChange}" toggleListener="#{richTreeListenerBean.processToggle}" - render="@this treeInfo" + render="#{richTreeBean.attributes['render'].value}" + execute="#{richTreeBean.attributes['execute'].value}" <rich:treeNode type="country" @@ -185,6 +186,8 @@ nodeClass="#{richTreeBean.attributes['nodeClass'].value}" selectionChangeListener="#{richTreeListenerBean.processSelectionChange}" toggleListener="#{richTreeListenerBean.processToggle}" + render="#{richTreeBean.attributes['render'].value}" + execute="#{richTreeBean.attributes['execute'].value}" </rich:tree> </p> @@ -193,7 +196,7 @@ <ui:define name="outOfTemplateAfter"> - <a4j:outputPanel id="treeInfo"> + <a4j:outputPanel ajaxRendered="true"> <h:panelGrid columns="2"> <h:outputLabel value="Test Loading Facet:" /> <h:selectBooleanCheckbox value="#{richTreeBean.testLoadingFacet}"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml 2010-12-15 17:11:51 UTC (rev 20588) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml 2010-12-15 17:12:33 UTC (rev 20589) @@ -27,6 +27,7 @@ --> <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="richTree" /> <ui:define name="head"> <f:metadata> @@ -80,8 +81,10 @@ labelClass="#{richTreeBean.attributes['labelClass'].value}" nodeClass="#{richTreeBean.attributes['nodeClass'].value}" selectionChangeListener="#{richTreeListenerBean.processSelectionChange}" - toggleListener="#{richTreeListenerBean.processToggle}"> - > + toggleListener="#{richTreeListenerBean.processToggle}" + render="#{richTreeBean.attributes['render'].value}" + execute="#{richTreeBean.attributes['execute'].value}" + > <rich:treeModelRecursiveAdaptor roots="#{richTreeModelRecursiveAdaptorBean.rootNodes}"