Author: lfryc(a)redhat.com Date: 2011-01-26 11:18:40 -0500 (Wed, 26 Jan 2011) New Revision: 21239 Added: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichPanelMenuGroupBean.properties modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichPanelMenuItemBean.properties Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuGroupBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml Log: rich:panelMenuGroup and rich:panelMenuItem - pre-automation activities (RFPL-950) Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuGroupBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuGroupBean.java 2011-01-26 16:17:34 UTC (rev 21238) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuGroupBean.java 2011-01-26 16:18:40 UTC (rev 21239) @@ -61,13 +61,7 @@ // already defined in source directly attributes.remove("name"); attributes.remove("label"); - - // attributes should be hidden - attributes.remove("panelMenu"); - attributes.remove("parentItem"); - attributes.remove("topItem"); - attributes.remove("submittedExpanded"); - attributes.remove("value"); + attributes.remove("changeExpandListener"); } public Attributes getAttributes() { @@ -79,7 +73,6 @@ } public void changeExpandListener(Object event) { - // TODO ajax or server expansion doesn't work yet - throw new UnsupportedOperationException("needs to be implemented in Metamer"); + RichBean.logToPage("* group expanded"); } } Added: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichPanelMenuGroupBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichPanelMenuGroupBean.properties (rev 0) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichPanelMenuGroupBean.properties 2011-01-26 16:18:40 UTC (rev 21239) @@ -0,0 +1,58 @@ +attr.mode.client=client +attr.mode.ajax=ajax +attr.mode.server=server +attr.mode.null= +attr.leftIconCollapsed.grid=grid +attr.leftIconCollapsed.disc=disc +attr.leftIconCollapsed.chevronUp=chevronUp +attr.leftIconCollapsed.chevronDown=chevronDown +attr.leftIconCollapsed.triangle=triangle +attr.leftIconCollapsed.triangleUp=triangleUp +attr.leftIconCollapsed.triangleDown=triangleDown +attr.leftIconCollapsed.customURL=/resources/images/loading.gif +attr.leftIconCollapsed.null= +attr.leftIconExpanded.grid=grid +attr.leftIconExpanded.disc=disc +attr.leftIconExpanded.chevronUp=chevronUp +attr.leftIconExpanded.chevronDown=chevronDown +attr.leftIconExpanded.triangle=triangle +attr.leftIconExpanded.triangleUp=triangleUp +attr.leftIconExpanded.triangleDown=triangleDown +attr.leftIconExpanded.customURL=/resources/images/loading.gif +attr.leftIconExpanded.null= +attr.leftIconDisabled.grid=grid +attr.leftIconDisabled.disc=disc +attr.leftIconDisabled.chevronUp=chevronUp +attr.leftIconDisabled.chevronDown=chevronDown +attr.leftIconDisabled.triangle=triangle +attr.leftIconDisabled.triangleUp=triangleUp +attr.leftIconDisabled.triangleDown=triangleDown +attr.leftIconDisabled.customURL=/resources/images/loading.gif +attr.leftIconDisabled.null= +attr.rightIconCollapsed.grid=grid +attr.rightIconCollapsed.disc=disc +attr.rightIconCollapsed.chevronUp=chevronUp +attr.rightIconCollapsed.chevronDown=chevronDown +attr.rightIconCollapsed.triangle=triangle +attr.rightIconCollapsed.triangleUp=triangleUp +attr.rightIconCollapsed.triangleDown=triangleDown +attr.rightIconCollapsed.customURL=/resources/images/loading.gif +attr.rightIconCollapsed.null= +attr.rightIconExpanded.grid=grid +attr.rightIconExpanded.disc=disc +attr.rightIconExpanded.chevronUp=chevronUp +attr.rightIconExpanded.chevronDown=chevronDown +attr.rightIconExpanded.triangle=triangle +attr.rightIconExpanded.triangleUp=triangleUp +attr.rightIconExpanded.triangleDown=triangleDown +attr.rightIconExpanded.customURL=/resources/images/loading.gif +attr.rightIconExpanded.null= +attr.rightIconDisabled.grid=grid +attr.rightIconDisabled.disc=disc +attr.rightIconDisabled.chevronUp=chevronUp +attr.rightIconDisabled.chevronDown=chevronDown +attr.rightIconDisabled.triangle=triangle +attr.rightIconDisabled.triangleUp=triangleUp +attr.rightIconDisabled.triangleDown=triangleDown +attr.rightIconDisabled.customURL=/resources/images/loading.gif +attr.rightIconDisabled.null= \ No newline at end of file Added: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichPanelMenuItemBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichPanelMenuItemBean.properties (rev 0) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichPanelMenuItemBean.properties 2011-01-26 16:18:40 UTC (rev 21239) @@ -0,0 +1,40 @@ +attr.mode.client=client +attr.mode.ajax=ajax +attr.mode.server=server +attr.mode.null= +attr.leftIcon.grid=grid +attr.leftIcon.disc=disc +attr.leftIcon.chevronUp=chevronUp +attr.leftIcon.chevronDown=chevronDown +attr.leftIcon.triangle=triangle +attr.leftIcon.triangleUp=triangleUp +attr.leftIcon.triangleDown=triangleDown +attr.leftIcon.customURL=/resources/images/loading.gif +attr.leftIcon.null= +attr.leftIconDisabled.grid=grid +attr.leftIconDisabled.disc=disc +attr.leftIconDisabled.chevronUp=chevronUp +attr.leftIconDisabled.chevronDown=chevronDown +attr.leftIconDisabled.triangle=triangle +attr.leftIconDisabled.triangleUp=triangleUp +attr.leftIconDisabled.triangleDown=triangleDown +attr.leftIconDisabled.customURL=/resources/images/loading.gif +attr.leftIconDisabled.null= +attr.rightIcon.grid=grid +attr.rightIcon.disc=disc +attr.rightIcon.chevronUp=chevronUp +attr.rightIcon.chevronDown=chevronDown +attr.rightIcon.triangle=triangle +attr.rightIcon.triangleUp=triangleUp +attr.rightIcon.triangleDown=triangleDown +attr.rightIcon.customURL=/resources/images/loading.gif +attr.rightIcon.null= +attr.rightIconDisabled.grid=grid +attr.rightIconDisabled.disc=disc +attr.rightIconDisabled.chevronUp=chevronUp +attr.rightIconDisabled.chevronDown=chevronDown +attr.rightIconDisabled.triangle=triangle +attr.rightIconDisabled.triangleUp=triangleUp +attr.rightIconDisabled.triangleDown=triangleDown +attr.rightIconDisabled.customURL=/resources/images/loading.gif +attr.rightIconDisabled.null= \ No newline at end of file Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml 2011-01-26 16:17:34 UTC (rev 21238) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml 2011-01-26 16:18:40 UTC (rev 21239) @@ -40,10 +40,7 @@ <ui:define name="component"> - <rich:panelMenu id="panelMenu" style="width: 250px; " - action="#{richBean.dummyAction}" - actionListener="#{richBean.dummyActionListener}" - activeItem="#{richPanelMenuBean.attributes['activeItem'].value}" + <rich:panelMenu id="panelMenu" style="width: 250px;" itemChangeListener="#{richPanelMenuBean.itemChangeListener}"> <rich:panelMenuGroup id="group1" name="group1" label="Group 1"> @@ -69,13 +66,14 @@ expanded="#{richPanelMenuGroupBean.attributes['expanded'].value}" hoverClass="#{richPanelMenuGroupBean.attributes['hoverClass'].value}" iconLeftClass="#{richPanelMenuGroupBean.attributes['iconLeftClass'].value}" - iconLeftCollapsed="#{richPanelMenuGroupBean.attributes['iconLeftCollapsed'].value}" - iconLeftDisabled="#{richPanelMenuGroupBean.attributes['iconLeftDisabled'].value}" - iconLeftExpanded="#{richPanelMenuGroupBean.attributes['iconLeftExpanded'].value}" - iconRightClass="#{richPanelMenuGroupBean.attributes['iconRightClass'].value}" - iconRightCollapsed="#{richPanelMenuGroupBean.attributes['iconRightCollapsed'].value}" - iconRightDisabled="#{richPanelMenuGroupBean.attributes['iconRightDisabled'].value}" - iconRightExpanded="#{richPanelMenuGroupBean.attributes['iconRightExpanded'].value}" + leftIcon="#{richPanelMenuGroupBean.attributes['leftIcon'].value}" + leftIconCollapsed="#{richPanelMenuGroupBean.attributes['leftIconCollapsed'].value}" + leftIconDisabled="#{richPanelMenuGroupBean.attributes['leftIconDisabled'].value}" + leftIconExpanded="#{richPanelMenuGroupBean.attributes['leftIconExpanded'].value}" + rightIcon="#{richPanelMenuGroupBean.attributes['rightIcon'].value}" + rightIconCollapsed="#{richPanelMenuGroupBean.attributes['rightIconCollapsed'].value}" + rightIconDisabled="#{richPanelMenuGroupBean.attributes['rightIconDisabled'].value}" + rightIconExpanded="#{richPanelMenuGroupBean.attributes['rightIconExpanded'].value}" immediate="#{richPanelMenuGroupBean.attributes['immediate'].value}" limitRender="#{richPanelMenuGroupBean.attributes['limitRender'].value}" mode="#{richPanelMenuGroupBean.attributes['mode'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml 2011-01-26 16:17:34 UTC (rev 21238) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml 2011-01-26 16:18:40 UTC (rev 21239) @@ -57,12 +57,12 @@ disabledClass="#{richPanelMenuItemBean.attributes['disabledClass'].value}" execute="#{richPanelMenuItemBean.attributes['disabledClass'].value}" hoverClass="#{richPanelMenuItemBean.attributes['hoverClass'].value}" - iconLeft="#{richPanelMenuItemBean.attributes['iconLeft'].value}" - iconLeftClass="#{richPanelMenuItemBean.attributes['iconLeftClass'].value}" - iconLeftDisabled="#{richPanelMenuItemBean.attributes['iconLeftDisabled'].value}" - iconRight="#{richPanelMenuItemBean.attributes['iconRight'].value}" - iconRightClass="#{richPanelMenuItemBean.attributes['iconRightClass'].value}" - iconRightDisabled="#{richPanelMenuItemBean.attributes['iconRightDisabled'].value}" + leftIcon="#{richPanelMenuItemBean.attributes['leftIcon'].value}" + leftIconClass="#{richPanelMenuItemBean.attributes['leftIconClass'].value}" + leftIconDisabled="#{richPanelMenuItemBean.attributes['leftIconDisabled'].value}" + rightIcon="#{richPanelMenuItemBean.attributes['rightIcon'].value}" + rightIconClass="#{richPanelMenuItemBean.attributes['rightIconClass'].value}" + rightIconDisabled="#{richPanelMenuItemBean.attributes['rightIconDisabled'].value}" immediate="#{richPanelMenuItemBean.attributes['immediate'].value}" limitRender="#{richPanelMenuItemBean.attributes['limitRender'].value}" mode="#{richPanelMenuItemBean.attributes['mode'].value}"