Author: ppitonak(a)redhat.com Date: 2010-08-18 08:11:41 -0400 (Wed, 18 Aug 2010) New Revision: 18750 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichToggleControlBean.properties modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/rf9013.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml Log: * toggle controls fixed because attribute forPanel changed to targetPanel Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java 2010-08-18 11:46:39 UTC (rev 18749) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java 2010-08-18 12:11:41 UTC (rev 18750) @@ -56,7 +56,7 @@ attributes = Attributes.getBehaviorAttributes(ToggleControl.class, getClass()); - attributes.setAttribute("forPanel", "panel1"); + attributes.setAttribute("targetPanel", "panel1"); attributes.setAttribute("targetItem", "item1"); // TODO following attributes have to be tested in another way Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichToggleControlBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichToggleControlBean.properties 2010-08-18 11:46:39 UTC (rev 18749) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichToggleControlBean.properties 2010-08-18 12:11:41 UTC (rev 18750) @@ -1,6 +1,6 @@ -attr.forPanel.panel1=panel1 -attr.forPanel.panel2=panel2 -attr.forPanel.null= +attr.targetPanel.panel1=panel1 +attr.targetPanel.panel2=panel2 +attr.targetPanel.null= attr.targetItem.item1=item1 attr.targetItem.item2=item2 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/simple.xhtml 2010-08-18 11:46:39 UTC (rev 18749) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/simple.xhtml 2010-08-18 12:11:41 UTC (rev 18750) @@ -42,38 +42,38 @@ <h:panelGrid id="panel1Controls" columns="6"> panel1: - <h:commandLink value="Toggle Panel Item 1"> - <rich:toggleControl id="tc11" forPanel="panel1" targetItem="item1" /> + <h:commandLink id="tcLink11" value="Toggle Panel Item 1"> + <rich:toggleControl id="tc11" targetPanel="panel1" targetItem="item1" /> </h:commandLink> <h:outputText value=" | " /> - <h:commandLink value="Toggle Panel Item 2"> - <rich:toggleControl id="tc12" forPanel="panel1" targetItem="item2" /> + <h:commandLink id="tcLink12" value="Toggle Panel Item 2"> + <rich:toggleControl id="tc12" targetPanel="panel1" targetItem="item2" /> </h:commandLink> <h:outputText value=" | " /> - <h:commandLink value="Toggle Panel Item 3"> - <rich:toggleControl id="tc13" forPanel="panel1" targetItem="item3" /> + <h:commandLink id="tcLink13" value="Toggle Panel Item 3"> + <rich:toggleControl id="tc13" targetPanel="panel1" targetItem="item3" /> </h:commandLink> </h:panelGrid> <h:panelGrid id="panel2Controls" columns="6"> panel2: - <h:commandLink value="Toggle Panel Item 1"> - <rich:toggleControl id="tc21" forPanel="panel2" targetItem="item1" /> + <h:commandLink id="tcLink21" value="Toggle Panel Item 1"> + <rich:toggleControl id="tc21" targetPanel="panel2" targetItem="item1" /> </h:commandLink> <h:outputText value=" | " /> - <h:commandLink value="Toggle Panel Item 2"> - <rich:toggleControl id="tc22" forPanel="panel2" targetItem="item2" /> + <h:commandLink id="tcLink22" value="Toggle Panel Item 2"> + <rich:toggleControl id="tc22" targetPanel="panel2" targetItem="item2" /> </h:commandLink> <h:outputText value=" | " /> - <h:commandLink value="Toggle Panel Item 3"> - <rich:toggleControl id="tc23" forPanel="panel2" targetItem="item3" /> + <h:commandLink id="tcLink23" value="Toggle Panel Item 3"> + <rich:toggleControl id="tc23" targetPanel="panel2" targetItem="item3" /> </h:commandLink> </h:panelGrid> universal toggle control (settings below) - <h:commandLink value="Toggle Panel Item"> + <h:commandLink id="toggleControlLink" value="Toggle Panel Item"> <rich:toggleControl id="richToggleControl" - forPanel="#{richToggleControlBean.attributes['forPanel'].value}" + targetPanel="#{richToggleControlBean.attributes['targetPanel'].value}" targetItem="#{richToggleControlBean.attributes['targetItem'].value}" /> </h:commandLink> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/rf9013.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/rf9013.xhtml 2010-08-18 11:46:39 UTC (rev 18749) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/rf9013.xhtml 2010-08-18 12:11:41 UTC (rev 18750) @@ -40,16 +40,16 @@ <ui:define name="component"> - <h:commandLink value="Toggle Panel Item 1"> - <rich:toggleControl forPanel="panel1" targetItem="item1" /> + <h:commandLink id="tcLink1" value="Toggle Panel Item 1"> + <rich:toggleControl targetPanel="panel1" targetItem="item1" /> </h:commandLink> <h:outputText value=" | " /> - <h:commandLink value="Toggle Panel Item 2"> - <rich:toggleControl forPanel="panel1" targetItem="item2" /> + <h:commandLink id="tcLink2" value="Toggle Panel Item 2"> + <rich:toggleControl targetPanel="panel1" targetItem="item2" /> </h:commandLink> <h:outputText value=" | " /> - <h:commandLink value="Toggle Panel Item 3"> - <rich:toggleControl forPanel="panel1" targetItem="item3" /> + <h:commandLink id="tcLink3" value="Toggle Panel Item 3"> + <rich:toggleControl targetPanel="panel1" targetItem="item3" /> </h:commandLink> <br/><br/> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2010-08-18 11:46:39 UTC (rev 18749) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2010-08-18 12:11:41 UTC (rev 18750) @@ -40,16 +40,16 @@ <ui:define name="component"> - <h:commandLink value="Toggle Panel Item 1"> - <rich:toggleControl forPanel="richTogglePanel" targetItem="item1" /> + <h:commandLink id="tcLink1" value="Toggle Panel Item 1"> + <rich:toggleControl targetPanel="richTogglePanel" targetItem="item1" /> </h:commandLink> <h:outputText value=" | " /> - <h:commandLink value="Toggle Panel Item 2"> - <rich:toggleControl forPanel="richTogglePanel" targetItem="item2" /> + <h:commandLink id="tcLink2" value="Toggle Panel Item 2"> + <rich:toggleControl targetPanel="richTogglePanel" targetItem="item2" /> </h:commandLink> <h:outputText value=" | " /> - <h:commandLink value="Toggle Panel Item 3"> - <rich:toggleControl forPanel="richTogglePanel" targetItem="item3" /> + <h:commandLink id="tcLink3" value="Toggle Panel Item 3"> + <rich:toggleControl targetPanel="richTogglePanel" targetItem="item3" /> </h:commandLink> <br/><br/>