Author: nbelaevski Date: 2011-01-27 10:04:13 -0500 (Thu, 27 Jan 2011) New Revision: 21280 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-groupDis.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-itemDis.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topItemDis.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml Log: https://issues.jboss.org/browse/RF-10297 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-01-27 14:52:21 UTC (rev 21279) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-01-27 15:04:13 UTC (rev 21280) @@ -237,7 +237,7 @@ public abstract String getItemClass(); @Attribute - public abstract String getItemDisableClass(); + public abstract String getItemDisabledClass(); @Attribute(generate = false) public String getItemLeftIcon() { @@ -279,7 +279,7 @@ public abstract String getTopItemClass(); @Attribute - public abstract String getTopItemClassDisabled(); + public abstract String getTopItemDisabledClass(); @Attribute(generate = false) public String getTopItemLeftIcon() { @@ -321,7 +321,7 @@ public abstract String getGroupClass(); @Attribute - public abstract String getGroupDisableClass(); + public abstract String getGroupDisabledClass(); @Attribute(generate = false) public String getGroupLeftIconExpanded() { @@ -381,7 +381,7 @@ public abstract String getTopGroupClass(); @Attribute - public abstract String getTopGroupClassDisabled(); + public abstract String getTopGroupDisabledClass(); @Attribute(generate = false) public String getTopGroupLeftIconExpanded() { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java 2011-01-27 14:52:21 UTC (rev 21279) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java 2011-01-27 15:04:13 UTC (rev 21280) @@ -265,7 +265,7 @@ @Attribute(generate = false) public String getDisabledClass() { return (String) getStateHelper().eval(Properties.disabledClass, - isTopItem() ? getPanelMenu().getTopGroupClassDisabled() : getPanelMenu().getGroupDisableClass()); + isTopItem() ? getPanelMenu().getTopGroupDisabledClass() : getPanelMenu().getGroupDisabledClass()); } public void setDisabledClass(String disabledClass) { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java 2011-01-27 14:52:21 UTC (rev 21279) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java 2011-01-27 15:04:13 UTC (rev 21280) @@ -23,11 +23,15 @@ package org.richfaces.component; +import javax.faces.component.UIComponent; + import org.richfaces.PanelMenuMode; -import org.richfaces.cdk.annotations.*; +import org.richfaces.cdk.annotations.Attribute; +import org.richfaces.cdk.annotations.EventName; +import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.Tag; +import org.richfaces.cdk.annotations.TagType; -import javax.faces.component.UIComponent; - /** * @author akolonitsky * @since 2010-10-25 @@ -131,7 +135,7 @@ @Attribute(generate = false) public String getDisabledClass() { return (String) getStateHelper().eval(Properties.disabledClass, - isTopItem() ? getPanelMenu().getTopItemClassDisabled() : getPanelMenu().getItemDisableClass()); + isTopItem() ? getPanelMenu().getTopItemDisabledClass() : getPanelMenu().getItemDisabledClass()); } public void setDisabledClass(String disabledClass) { Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-groupDis.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-groupDis.xmlunit.xml 2011-01-27 14:52:21 UTC (rev 21279) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-groupDis.xmlunit.xml 2011-01-27 15:04:13 UTC (rev 21280) @@ -1,4 +1,4 @@ -<div id="f:panelMenuGroup-dis" class="rf-pm-gr groupClass rf-pm-gr-dis groupDisableClass"> +<div id="f:panelMenuGroup-dis" class="rf-pm-gr groupClass rf-pm-gr-dis groupDisabledClass"> <input id="f:panelMenuGroup-dis:expanded" name="f:panelMenuGroup-dis:expanded" type="hidden" value="false"/> <div id="f:panelMenuGroup-dis:hdr" class="rf-pm-gr-hdr rf-pm-hdr-colps rf-pm-gr-hdr-dis"> <table class="rf-pm-gr-gr"> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-itemDis.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-itemDis.xmlunit.xml 2011-01-27 14:52:21 UTC (rev 21279) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-itemDis.xmlunit.xml 2011-01-27 15:04:13 UTC (rev 21280) @@ -1,4 +1,4 @@ -<div id="f:panelMenuItem-dis" class="rf-pm-itm itemClass rf-pm-itm-dis itemDisableClass"> +<div id="f:panelMenuItem-dis" class="rf-pm-itm itemClass rf-pm-itm-dis itemDisabledClass"> <table class="rf-pm-itm-gr"> <tbody> <tr> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml 2011-01-27 14:52:21 UTC (rev 21279) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml 2011-01-27 15:04:13 UTC (rev 21280) @@ -1,4 +1,4 @@ -<div id="f:panelMenuGroup-topDis" class="rf-pm-top-gr topGroupClass rf-pm-top-gr-dis topGroupClassDisabled"> +<div id="f:panelMenuGroup-topDis" class="rf-pm-top-gr topGroupClass rf-pm-top-gr-dis topGroupDisabledClass"> <input id="f:panelMenuGroup-topDis:expanded" name="f:panelMenuGroup-topDis:expanded" type="hidden" value="false"/> <div id="f:panelMenuGroup-topDis:hdr" class="rf-pm-top-gr-hdr rf-pm-hdr-colps rf-pm-top-gr-hdr-dis"> <table class="rf-pm-top-gr-gr"> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topItemDis.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topItemDis.xmlunit.xml 2011-01-27 14:52:21 UTC (rev 21279) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topItemDis.xmlunit.xml 2011-01-27 15:04:13 UTC (rev 21280) @@ -1,4 +1,4 @@ -<div id="f:panelMenuItem-topDis" class="rf-pm-top-itm topItemClass rf-pm-top-itm-dis topItemClassDisabled"> +<div id="f:panelMenuItem-topDis" class="rf-pm-top-itm topItemClass rf-pm-top-itm-dis topItemDisabledClass"> <table class="rf-pm-top-itm-gr"> <tbody> <tr> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml 2011-01-27 14:52:21 UTC (rev 21279) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml 2011-01-27 15:04:13 UTC (rev 21280) @@ -44,7 +44,7 @@ itemRightIconDisabled="chevronUp" itemLeftIconDisabled="chevronDown" - itemDisableClass="itemDisableClass" + itemDisabledClass="itemDisabledClass" topItemRightIcon="triangle" topItemLeftIcon="triangle" @@ -52,7 +52,7 @@ topItemRightIconDisabled="chevron" topItemLeftIconDisabled="chevron" - topItemClassDisabled="topItemClassDisabled" + topItemDisabledClass="topItemDisabledClass" groupRightIconCollapsed="triangleUp" groupRightIconExpanded="disc" @@ -62,7 +62,7 @@ groupRightIconDisabled="chevronUp" groupLeftIconDisabled="chevronDown" - groupDisableClass="groupDisableClass" + groupDisabledClass="groupDisabledClass" topGroupRightIconCollapsed="triangle" topGroupRightIconExpanded="disc" @@ -72,7 +72,7 @@ topGroupRightIconDisabled="chevron" topGroupLeftIconDisabled="chevron" - topGroupClassDisabled="topGroupClassDisabled" + topGroupDisabledClass="topGroupDisabledClass" <pn:panelMenuGroup id="panelMenuGroup-top"></pn:panelMenuGroup>