Author: artdaw Date: 2011-01-28 12:08:21 -0500 (Fri, 28 Jan 2011) New Revision: 21310 Modified: trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordion.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java 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/main/java/org/richfaces/component/AbstractTab.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml Log: RF-10297: classes and icons are renamed Modified: trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml 2011-01-28 17:08:21 UTC (rev 21310) @@ -17,7 +17,7 @@ <h:form id="f" style="border:blue solid thin;"> <h:panelGroup> <pn:accordion width="500px" height="300px" itemChangeListener="#{togglePanelBean.itemChangeActionListener}" switchType="ajax" - itemRightIconActive="triangleDown" itemRightIconInactive="triangleUp" itemRightIconDisabled="disc" itemLeftIconDisabled="disc" > + itemRightIconActive="triangleDown" itemInactiveRightIcon="triangleUp" itemDisabledRightIcon="disc" itemDisabledLeftIcon="disc" > <pn:accordionItem header="label 1" >Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here.</pn:accordionItem> <pn:accordionItem header="label 2" >content 2</pn:accordionItem> <pn:accordionItem header="label 3" onenter="alert('hello, world!')" >content 3</pn:accordionItem> Modified: trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml 2011-01-28 17:08:21 UTC (rev 21310) @@ -42,12 +42,12 @@ <rich:panelMenu id="panelMenu" itemLeftIcon="grid" - groupLeftIconCollapsed="grid" - topGroupLeftIconCollapsed="grid" - topGroupLeftIconExpanded="chevronLeft" - topGroupLeftIconDisabled="disc" - itemLeftIconDisabled="triangleLeft" - topItemLeftIconDisabled="triangleUp" + groupCollapsedLeftIcon="grid" + topGroupCollapsedLeftIcon="grid" + topGroupExpandedLeftIcon="chevronLeft" + topGroupDisabledLeftIcon="disc" + itemDisabledLeftIcon="triangleLeft" + topItemDisabledLeftIcon="triangleUp" topItemLeftIcon="triangleDown" groupMode="client" activeItem="item41"> <rich:panelMenuGroup id="group1" label="Group 1" disabled="true"> Modified: trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml 2011-01-28 17:08:21 UTC (rev 21310) @@ -15,8 +15,8 @@ <p>Page</p> <h:form id="f"> - <pn:tabPanel id="panel" switchType="ajax" tabHeaderClassDisabled="myClass_01" itemChangeListener="#{togglePanelBean.itemChangeActionListener}"> - <pn:tab header="tab1 header" headerClassDisabled="myClass_02" onenter="alert('onenter 01')"> + <pn:tabPanel id="panel" switchType="ajax" tabDisabledHeaderClass="myClass_01" itemChangeListener="#{togglePanelBean.itemChangeActionListener}"> + <pn:tab header="tab1 header" headerDisabledClass="myClass_02" onenter="alert('onenter 01')"> Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. </pn:tab> <pn:tab header="tab 1a (disabled) header" disabled="true"> Modified: trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2011-01-28 17:08:21 UTC (rev 21310) @@ -52,10 +52,10 @@ itemMode="server" groupMode="server" activeItem="myFavariteIten" - itemLeftIconDisabled="disc" - groupLeftIconDisabled="disc" - topItemLeftIconDisabled="disc" - topGroupLeftIconDisabled="disc" + itemDisabledLeftIcon="disc" + groupDisabledLeftIcon="disc" + topItemDisabledLeftIcon="disc" + topGroupDisabledLeftIcon="disc" itemChangeListener="#{modalPanel.itemChangeEventListener}" expandEvent="dblclick" collapseEvent="dblclick" @@ -68,13 +68,13 @@ </pn:panelMenuGroup> <pn:panelMenuGroup label="Group 2" - leftIconCollapsed="triangle" - leftIconExpanded="triangleDown"> + leftCollapsedIcon="triangle" + leftExpandedIcon="triangleDown"> <pn:panelMenuItem label="Item 2.1" /> <pn:panelMenuGroup label="Group 2.2" - leftIconCollapsed="chevron" - leftIconExpanded="chevronDown"> + leftCollapsedIcon="chevron" + leftExpandedIcon="chevronDown"> <pn:panelMenuItem label="Item 2.2.1" action="#{modalPanel.action}"/> <pn:panelMenuItem label="Item 2.2.2" name="myFavariteIten" /> <pn:panelMenuItem label="Item 2.2.3"/> Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml 2011-01-28 17:08:21 UTC (rev 21310) @@ -13,10 +13,10 @@ <h:form id="form"> <h:panelGrid columns="2" columnClasses="cols,cols" width="400"> <rich:panelMenu style="width:200px" mode="ajax" groupMode="ajax" - groupLeftIconExpanded="triangleUp" - groupLeftIconCollapsed="triangleDown" - topGroupRightIconExpanded="chevronUp" - topGroupRightIconCollapsed="chevronDown" itemLeftIcon="disc" + groupExpandedLeftIcon="triangleUp" + groupCollapsedLeftIcon="triangleDown" + topGroupExpandedRightIcon="chevronUp" + topGroupCollapsedRightIcon="chevronDown" itemLeftIcon="disc" itemChangeListener="#{panelMenuBean.updateCurrent}"> <rich:panelMenuGroup label="Group 1"> <rich:panelMenuItem label="Item 1.1" name="Item_1_1" /> Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -215,7 +215,7 @@ public abstract String getButtonIcon(); @Attribute - public abstract String getButtonIconDisabled(); + public abstract String getButtonDisabledIcon(); @Attribute public abstract Object getDefaultTime(); Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -22,29 +22,6 @@ package org.richfaces.renderkit; -import java.io.IOException; -import java.text.DateFormatSymbols; -import java.text.Format; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.MissingResourceException; -import java.util.ResourceBundle; -import java.util.TimeZone; - -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.PartialViewContext; -import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; -import javax.faces.convert.DateTimeConverter; - import org.ajax4jsf.javascript.JSFunction; import org.ajax4jsf.javascript.JSReference; import org.richfaces.component.AbstractCalendar; @@ -57,6 +34,20 @@ import org.richfaces.event.CurrentDateChangeEvent; import org.richfaces.utils.CalendarHelper; +import javax.faces.application.ResourceDependencies; +import javax.faces.application.ResourceDependency; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.PartialViewContext; +import javax.faces.convert.Converter; +import javax.faces.convert.ConverterException; +import javax.faces.convert.DateTimeConverter; +import java.io.IOException; +import java.text.DateFormatSymbols; +import java.text.Format; +import java.text.SimpleDateFormat; +import java.util.*; + /** * @author amarkhel * @@ -252,7 +243,7 @@ boolean disable = (Boolean)component.getAttributes().get(OPTION_DISABLED); String buttonIcon = (String)component.getAttributes().get("buttonIcon"); if (disable) { - buttonIcon = (String)component.getAttributes().get("buttonIconDisabled"); + buttonIcon = (String)component.getAttributes().get("buttonDisabledIcon"); } if(buttonIcon != null && buttonIcon.trim().length() != 0) { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordion.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordion.java 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordion.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -59,22 +59,22 @@ // ------------------------------------------------ Html Attributes @Attribute - public abstract String getItemLeftIconActive(); + public abstract String getItemActiveLeftIcon(); @Attribute - public abstract String getItemLeftIconInactive(); + public abstract String getItemInactiveLeftIcon(); @Attribute - public abstract String getItemLeftIconDisabled(); + public abstract String getItemDisabledLeftIcon(); @Attribute - public abstract String getItemRightIconActive(); + public abstract String getItemActiveRightIcon(); @Attribute - public abstract String getItemRightIconInactive(); + public abstract String getItemRightInactiveIcon(); @Attribute - public abstract String getItemRightIconDisabled(); + public abstract String getItemDisabledRightIcon(); @Attribute public abstract String getWidth(); @@ -83,13 +83,13 @@ public abstract String getHeight(); @Attribute - public abstract String getItemHeaderClassActive(); + public abstract String getItemActiveHeaderClass(); @Attribute - public abstract String getItemHeaderClassDisabled(); + public abstract String getItemDisabledHeaderClass(); @Attribute - public abstract String getItemHeaderClassInactive(); + public abstract String getItemInactiveHeaderClass(); @Attribute public abstract String getItemContentClass(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -39,7 +39,17 @@ public static final String COMPONENT_FAMILY = "org.richfaces.AccordionItem"; enum Properties { - contentClass, leftIconActive, leftIconInactive, leftIconDisabled, rightIconActive, rightIconDisabled, rightIconInactive, headerClassActive, headerClassDisabled, headerClassInactive, headerClass; + contentClass, + leftActiveIcon, + leftInactiveIcon, + leftDisabledIcon, + rightActiveIcon, + rightDisabledIcon, + rightInactiveIcon, + headerActiveClass, + headerDisabledClass, + headerInactiveClass, + headerClass } public AbstractAccordionItem() { @@ -50,86 +60,86 @@ return (AbstractAccordion) ToggleControl.getEnclosedPanel(this); } - @Attribute(defaultValue = "getAccordion().getItemLeftIconActive()", generate = false) - public String getLeftIconActive() { - return (String) getStateHelper().eval(Properties.leftIconActive, getAccordion().getItemLeftIconActive()); + @Attribute(defaultValue = "getAccordion().getItemActiveLeftIcon()", generate = false) + public String getLeftActiveIcon() { + return (String) getStateHelper().eval(Properties.leftActiveIcon, getAccordion().getItemActiveLeftIcon()); } - public void setLeftIconActive(String leftIconActive) { - getStateHelper().put(Properties.leftIconActive, leftIconActive); + public void setLeftActiveIcon(String leftActiveIcon) { + getStateHelper().put(Properties.leftActiveIcon, leftActiveIcon); } - @Attribute(defaultValue = "getAccordion().getItemLeftIconDisabled()", generate = false) - public String getLeftIconDisabled() { - return (String) getStateHelper().eval(Properties.leftIconDisabled, getAccordion().getItemLeftIconDisabled()); + @Attribute(defaultValue = "getAccordion().getItemDisabledLeftIcon()", generate = false) + public String getLeftDisabledIcon() { + return (String) getStateHelper().eval(Properties.leftDisabledIcon, getAccordion().getItemDisabledLeftIcon()); } - public void setLeftIconDisabled(String leftIconDisabled) { - getStateHelper().put(Properties.leftIconDisabled, leftIconDisabled); + public void setLeftDisabledIcon(String leftDisabledIcon) { + getStateHelper().put(Properties.leftDisabledIcon, leftDisabledIcon); } - @Attribute(defaultValue = "getAccordion().getItemLeftIconInactive()", generate = false) - public String getLeftIconInactive() { - return (String) getStateHelper().eval(Properties.leftIconInactive, getAccordion().getItemLeftIconInactive()); + @Attribute(defaultValue = "getAccordion().getItemInactiveLeftIcon()", generate = false) + public String getLeftInactiveIcon() { + return (String) getStateHelper().eval(Properties.leftInactiveIcon, getAccordion().getItemInactiveLeftIcon()); } - public void setLeftIconInactive(String leftIconInactive) { - getStateHelper().put(Properties.leftIconInactive, leftIconInactive); + public void setLeftInactiveIcon(String leftInactiveIcon) { + getStateHelper().put(Properties.leftInactiveIcon, leftInactiveIcon); } - @Attribute(defaultValue = "getAccordion().getItemRightIconActive()", generate = false) - public String getRightIconActive() { - return (String) getStateHelper().eval(Properties.rightIconActive, getAccordion().getItemRightIconActive()); + @Attribute(defaultValue = "getAccordion().getItemActiveRightIcon()", generate = false) + public String getRightActiveIcon() { + return (String) getStateHelper().eval(Properties.rightActiveIcon, getAccordion().getItemActiveRightIcon()); } - public void setRightIconActive(String rightIconActive) { - getStateHelper().put(Properties.rightIconActive, rightIconActive); + public void setRightActiveIcon(String rightActiveIcon) { + getStateHelper().put(Properties.rightActiveIcon, rightActiveIcon); } - @Attribute(defaultValue = "getAccordion().getItemRightIconDisabled()", generate = false) - public String getRightIconDisabled() { - return (String) getStateHelper().eval(Properties.rightIconDisabled, getAccordion().getItemRightIconDisabled()); + @Attribute(defaultValue = "getAccordion().getItemDisabledRightIcon()", generate = false) + public String getRightDisabledIcon() { + return (String) getStateHelper().eval(Properties.rightDisabledIcon, getAccordion().getItemDisabledRightIcon()); } - public void setRightIconDisabled(String rightIconDisabled) { - getStateHelper().put(Properties.rightIconDisabled, rightIconDisabled); + public void setRightDisabledIcon(String rightDisabledIcon) { + getStateHelper().put(Properties.rightDisabledIcon, rightDisabledIcon); } - @Attribute(defaultValue = "getAccordion().getItemRightIconInactive()", generate = false) - public String getRightIconInactive() { - return (String) getStateHelper().eval(Properties.rightIconInactive, getAccordion().getItemRightIconInactive()); + @Attribute(defaultValue = "getAccordion().getItemRightInactiveIcon()", generate = false) + public String getRightInactiveIcon() { + return (String) getStateHelper().eval(Properties.rightInactiveIcon, getAccordion().getItemRightInactiveIcon()); } - public void setRightIconInactive(String rightIconInactive) { - getStateHelper().put(Properties.rightIconInactive, rightIconInactive); + public void setRightInactiveIcon(String rightInactiveIcon) { + getStateHelper().put(Properties.rightInactiveIcon, rightInactiveIcon); } - @Attribute(defaultValue = "getAccordion().getItemHeaderClassActive()", generate = false) - public String getHeaderClassActive() { - return (String) getStateHelper().eval(Properties.headerClassActive, getAccordion().getItemHeaderClassActive()); + @Attribute(defaultValue = "getAccordion().getItemHeaderActiveClass()", generate = false) + public String getHeaderActiveClass() { + return (String) getStateHelper().eval(Properties.headerActiveClass, getAccordion().getItemActiveHeaderClass()); } - public void setHeaderClassActive(String headerClassActive) { - getStateHelper().put(Properties.headerClassActive, headerClassActive); + public void setHeaderActiveClass(String headerActiveClass) { + getStateHelper().put(Properties.headerActiveClass, headerActiveClass); } - @Attribute(defaultValue = "getAccordion().getItemHeaderClassDisabled()", generate = false) - public String getHeaderClassDisabled() { - return (String) getStateHelper().eval(Properties.headerClassDisabled, getAccordion().getItemHeaderClassDisabled()); + @Attribute(defaultValue = "getAccordion().getItemDisabledHeaderClass()", generate = false) + public String getHeaderDisabledClass() { + return (String) getStateHelper().eval(Properties.headerDisabledClass, getAccordion().getItemDisabledHeaderClass()); } - public void setHeaderClassDisabled(String headerClassDisabled) { - getStateHelper().put(Properties.headerClassDisabled, headerClassDisabled); + public void setHeaderDisabledClass(String headerDisabledClass) { + getStateHelper().put(Properties.headerDisabledClass, headerDisabledClass); } - @Attribute(defaultValue = "getAccordion().getItemHeaderClassInactive()", generate = false) - public String getHeaderClassInactive() { - return (String) getStateHelper().eval(Properties.headerClassInactive, getAccordion().getItemHeaderClassInactive()); + @Attribute(defaultValue = "getAccordion().getItemInactiveHeaderClass()", generate = false) + public String getHeaderInactiveClass() { + return (String) getStateHelper().eval(Properties.headerInactiveClass, getAccordion().getItemInactiveHeaderClass()); } - public void setHeaderClassInactive(String headerClassInactive) { - getStateHelper().put(Properties.headerClassInactive, headerClassInactive); + public void setHeaderInactiveClass(String headerInactiveClass) { + getStateHelper().put(Properties.headerInactiveClass, headerInactiveClass); } @Attribute(defaultValue = "getAccordion().getItemHeaderClass()") Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -109,16 +109,16 @@ // ------------------------------------------------ Html Attributes @Attribute - public abstract String getLeftIconCollapsed(); + public abstract String getLeftCollapsedIcon(); @Attribute - public abstract String getLeftIconExpanded(); + public abstract String getLeftExpandedIcon(); @Attribute - public abstract String getRightIconCollapsed(); + public abstract String getRightCollapsedIcon(); @Attribute - public abstract String getRightIconExpanded(); + public abstract String getRightExpandedIcon(); @Attribute public abstract String getBodyClass(); 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-28 17:07:14 UTC (rev 21309) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -23,6 +23,13 @@ package org.richfaces.component; +import org.richfaces.PanelMenuMode; +import org.richfaces.cdk.annotations.*; +import org.richfaces.event.ItemChangeEvent; +import org.richfaces.event.ItemChangeListener; +import org.richfaces.event.ItemChangeSource; +import org.richfaces.renderkit.util.PanelIcons; + import javax.el.MethodExpression; import javax.el.ValueExpression; import javax.faces.component.UIComponent; @@ -32,18 +39,6 @@ import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; -import org.richfaces.PanelMenuMode; -import org.richfaces.cdk.annotations.Attribute; -import org.richfaces.cdk.annotations.EventName; -import org.richfaces.cdk.annotations.JsfComponent; -import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.cdk.annotations.Tag; -import org.richfaces.cdk.annotations.TagType; -import org.richfaces.event.ItemChangeEvent; -import org.richfaces.event.ItemChangeListener; -import org.richfaces.event.ItemChangeSource; -import org.richfaces.renderkit.util.PanelIcons; - /** * @author akolonitsky * @since 2010-10-25 @@ -220,8 +215,26 @@ // ------------------------------------------------ Html Attributes enum Properties { - itemRightIcon, itemLeftIconDisabled, itemRightIconDisabled, topItemLeftIcon, topItemRightIcon, topItemLeftIconDisabled, topItemRightIconDisabled, groupLeftIconExpanded, groupRightIconExpanded, groupLeftIconCollapsed, groupRightIconCollapsed, groupLeftIconDisabled, groupRightIconDisabled, topGroupLeftIconExpanded, topGroupRightIconExpanded, topGroupLeftIconCollapsed, topGroupRightIconCollapsed, topGroupLeftIconDisabled, topGroupRightIconDisabled, itemLeftIcon - + itemRightIcon, + itemDisabledLeftIcon, + itemDisabledRightIcon, + topItemLeftIcon, + topItemRightIcon, + topItemDisabledLeftIcon, + topItemDisabledRightIcon, + groupExpandedLeftIcon, + groupExpandedRightIcon, + groupCollapsedLeftIcon, + groupCollapsedRightIcon, + groupDisabledLeftIcon, + groupDisabledRightIcon, + topGroupExpandedLeftIcon, + topGroupExpandedRightIcon, + topGroupCollapsedLeftIcon, + topGroupCollapsedRightIcon, + topGroupDisabledLeftIcon, + topGroupDisabledRightIcon, + itemLeftIcon } @Attribute @@ -258,21 +271,21 @@ } @Attribute(generate = false) - public String getItemLeftIconDisabled() { - return (String) getStateHelper().eval(Properties.itemLeftIconDisabled, PanelIcons.transparent.toString()); + public String getItemDisabledLeftIcon() { + return (String) getStateHelper().eval(Properties.itemDisabledLeftIcon, PanelIcons.transparent.toString()); } - public void setItemLeftIconDisabled(String itemLeftIconDisabled) { - getStateHelper().put(Properties.itemLeftIconDisabled, itemLeftIconDisabled); + public void setItemDisabledLeftIcon(String itemDisabledLeftIcon) { + getStateHelper().put(Properties.itemDisabledLeftIcon, itemDisabledLeftIcon); } @Attribute(generate = false) - public String getItemRightIconDisabled() { - return (String) getStateHelper().eval(Properties.itemRightIconDisabled, PanelIcons.transparent.toString()); + public String getItemDisabledRightIcon() { + return (String) getStateHelper().eval(Properties.itemDisabledRightIcon, PanelIcons.transparent.toString()); } - public void setItemRightIconDisabled(String itemRightIconDisabled) { - getStateHelper().put(Properties.itemRightIconDisabled, itemRightIconDisabled); + public void setItemDisabledRightIcon(String itemDisabledRightIcon) { + getStateHelper().put(Properties.itemDisabledRightIcon, itemDisabledRightIcon); } @Attribute @@ -300,21 +313,21 @@ } @Attribute(generate = false) - public String getTopItemLeftIconDisabled() { - return (String) getStateHelper().eval(Properties.topItemLeftIconDisabled, PanelIcons.transparent.toString()); + public String getTopItemDisabledLeftIcon() { + return (String) getStateHelper().eval(Properties.topItemDisabledLeftIcon, PanelIcons.transparent.toString()); } - public void setTopItemLeftIconDisabled(String topItemLeftIconDisabled) { - getStateHelper().put(Properties.topItemLeftIconDisabled, topItemLeftIconDisabled); + public void setTopItemDisabledLeftIcon(String topItemDisabledLeftIcon) { + getStateHelper().put(Properties.topItemDisabledLeftIcon, topItemDisabledLeftIcon); } @Attribute(generate = false) - public String getTopItemRightIconDisabled() { - return (String) getStateHelper().eval(Properties.topItemRightIconDisabled, PanelIcons.transparent.toString()); + public String getTopItemDisabledRightIcon() { + return (String) getStateHelper().eval(Properties.topItemDisabledRightIcon, PanelIcons.transparent.toString()); } - public void setTopItemRightIconDisabled(String topItemRightIconDisabled) { - getStateHelper().put(Properties.topItemRightIconDisabled, topItemRightIconDisabled); + public void setTopItemDisabledRightIcon(String topItemDisabledRightIcon) { + getStateHelper().put(Properties.topItemDisabledRightIcon, topItemDisabledRightIcon); } @Attribute @@ -324,57 +337,57 @@ public abstract String getGroupDisabledClass(); @Attribute(generate = false) - public String getGroupLeftIconExpanded() { - return (String) getStateHelper().eval(Properties.groupLeftIconExpanded, PanelIcons.transparent.toString()); + public String getGroupExpandedLeftIcon() { + return (String) getStateHelper().eval(Properties.groupExpandedLeftIcon, PanelIcons.transparent.toString()); } - public void setGroupLeftIconExpanded(String groupLeftIconExpanded) { - getStateHelper().put(Properties.groupLeftIconExpanded, groupLeftIconExpanded); + public void setGroupExpandedLeftIcon(String groupExpandedLeftIcon) { + getStateHelper().put(Properties.groupExpandedLeftIcon, groupExpandedLeftIcon); } @Attribute(generate = false) - public String getGroupRightIconExpanded() { - return (String) getStateHelper().eval(Properties.groupRightIconExpanded, PanelIcons.transparent.toString()); + public String getGroupExpandedRightIcon() { + return (String) getStateHelper().eval(Properties.groupExpandedRightIcon, PanelIcons.transparent.toString()); } - public void setGroupRightIconExpanded(String groupRightIconExpanded) { - getStateHelper().put(Properties.groupRightIconExpanded, groupRightIconExpanded); + public void setGroupExpandedRightIcon(String groupExpandedRightIcon) { + getStateHelper().put(Properties.groupExpandedRightIcon, groupExpandedRightIcon); } @Attribute(generate = false) - public String getGroupLeftIconCollapsed() { - return (String) getStateHelper().eval(Properties.groupLeftIconCollapsed, PanelIcons.transparent.toString()); + public String getGroupCollapsedLeftIcon() { + return (String) getStateHelper().eval(Properties.groupCollapsedLeftIcon, PanelIcons.transparent.toString()); } - public void setGroupLeftIconCollapsed(String groupLeftIconCollapsed) { - getStateHelper().put(Properties.groupLeftIconCollapsed, groupLeftIconCollapsed); + public void setGroupCollapsedLeftIcon(String groupCollapsedLeftIcon) { + getStateHelper().put(Properties.groupCollapsedLeftIcon, groupCollapsedLeftIcon); } @Attribute(generate = false) - public String getGroupRightIconCollapsed() { - return (String) getStateHelper().eval(Properties.groupRightIconCollapsed, PanelIcons.transparent.toString()); + public String getGroupCollapsedRightIcon() { + return (String) getStateHelper().eval(Properties.groupCollapsedRightIcon, PanelIcons.transparent.toString()); } - public void setGroupRightIconCollapsed(String groupRightIconCollapsed) { - getStateHelper().put(Properties.groupRightIconCollapsed, groupRightIconCollapsed); + public void setGroupCollapsedRightIcon(String groupCollapsedRightIcon) { + getStateHelper().put(Properties.groupCollapsedRightIcon, groupCollapsedRightIcon); } @Attribute(generate = false) - public String getGroupLeftIconDisabled() { - return (String) getStateHelper().eval(Properties.groupLeftIconDisabled, PanelIcons.transparent.toString()); + public String getGroupDisabledLeftIcon() { + return (String) getStateHelper().eval(Properties.groupDisabledLeftIcon, PanelIcons.transparent.toString()); } - public void setGroupLeftIconDisabled(String groupLeftIconDisabled) { - getStateHelper().put(Properties.groupLeftIconDisabled, groupLeftIconDisabled); + public void setGroupDisabledLeftIcon(String groupDisabledLeftIcon) { + getStateHelper().put(Properties.groupDisabledLeftIcon, groupDisabledLeftIcon); } @Attribute(generate = false) - public String getGroupRightIconDisabled() { - return (String) getStateHelper().eval(Properties.groupRightIconDisabled, PanelIcons.transparent.toString()); + public String getGroupDisabledRightIcon() { + return (String) getStateHelper().eval(Properties.groupDisabledRightIcon, PanelIcons.transparent.toString()); } - public void setGroupRightIconDisabled(String groupRightIconDisabled) { - getStateHelper().put(Properties.groupRightIconDisabled, groupRightIconDisabled); + public void setGroupDisabledRightIcon(String groupDisabledRightIcon) { + getStateHelper().put(Properties.groupDisabledRightIcon, groupDisabledRightIcon); } @Attribute @@ -384,57 +397,57 @@ public abstract String getTopGroupDisabledClass(); @Attribute(generate = false) - public String getTopGroupLeftIconExpanded() { - return (String) getStateHelper().eval(Properties.topGroupLeftIconExpanded, PanelIcons.transparent.toString()); + public String getTopGroupExpandedLeftIcon() { + return (String) getStateHelper().eval(Properties.topGroupExpandedLeftIcon, PanelIcons.transparent.toString()); } - public void setTopGroupLeftIconExpanded(String topGroupLeftIconExpanded) { - getStateHelper().put(Properties.topGroupLeftIconExpanded, topGroupLeftIconExpanded); + public void setTopGroupExpandedLeftIcon(String topGroupExpandedLeftIcon) { + getStateHelper().put(Properties.topGroupExpandedLeftIcon, topGroupExpandedLeftIcon); } @Attribute(generate = false) - public String getTopGroupRightIconExpanded() { - return (String) getStateHelper().eval(Properties.topGroupRightIconExpanded, PanelIcons.transparent.toString()); + public String getTopGroupExpandedRightIcon() { + return (String) getStateHelper().eval(Properties.topGroupExpandedRightIcon, PanelIcons.transparent.toString()); } - public void setTopGroupRightIconExpanded(String topGroupRightIconExpanded) { - getStateHelper().put(Properties.topGroupRightIconExpanded, topGroupRightIconExpanded); + public void setTopGroupExpandedRightIcon(String topGroupExpandedRightIcon) { + getStateHelper().put(Properties.topGroupExpandedRightIcon, topGroupExpandedRightIcon); } @Attribute(generate = false) - public String getTopGroupLeftIconCollapsed() { - return (String) getStateHelper().eval(Properties.topGroupLeftIconCollapsed, PanelIcons.transparent.toString()); + public String getTopGroupCollapsedLeftIcon() { + return (String) getStateHelper().eval(Properties.topGroupCollapsedLeftIcon, PanelIcons.transparent.toString()); } - public void setTopGroupLeftIconCollapsed(String topGroupLeftIconCollapsed) { - getStateHelper().put(Properties.topGroupLeftIconCollapsed, topGroupLeftIconCollapsed); + public void setTopGroupCollapsedLeftIcon(String topGroupCollapsedLeftIcon) { + getStateHelper().put(Properties.topGroupCollapsedLeftIcon, topGroupCollapsedLeftIcon); } @Attribute(generate = false) - public String getTopGroupRightIconCollapsed() { - return (String) getStateHelper().eval(Properties.topGroupRightIconCollapsed, PanelIcons.transparent.toString()); + public String getTopGroupCollapsedRightIcon() { + return (String) getStateHelper().eval(Properties.topGroupCollapsedRightIcon, PanelIcons.transparent.toString()); } - public void setTopGroupRightIconCollapsed(String topGroupRightIconCollapsed) { - getStateHelper().put(Properties.topGroupRightIconCollapsed, topGroupRightIconCollapsed); + public void setTopGroupCollapsedRightIcon(String topGroupCollapsedRightIcon) { + getStateHelper().put(Properties.topGroupCollapsedRightIcon, topGroupCollapsedRightIcon); } @Attribute(generate = false) - public String getTopGroupLeftIconDisabled() { - return (String) getStateHelper().eval(Properties.topGroupLeftIconDisabled, PanelIcons.transparent.toString()); + public String getTopGroupDisabledLeftIcon() { + return (String) getStateHelper().eval(Properties.topGroupDisabledLeftIcon, PanelIcons.transparent.toString()); } - public void setTopGroupLeftIconDisabled(String topGroupLeftIconDisabled) { - getStateHelper().put(Properties.topGroupLeftIconDisabled, topGroupLeftIconDisabled); + public void setTopGroupDisabledLeftIcon(String topGroupDisabledLeftIcon) { + getStateHelper().put(Properties.topGroupDisabledLeftIcon, topGroupDisabledLeftIcon); } @Attribute(generate = false) - public String getTopGroupRightIconDisabled() { - return (String) getStateHelper().eval(Properties.topGroupRightIconDisabled, PanelIcons.transparent.toString()); + public String getTopGroupDisabledRightIcon() { + return (String) getStateHelper().eval(Properties.topGroupDisabledRightIcon, PanelIcons.transparent.toString()); } - public void setTopGroupRightIconDisabled(String topGroupRightIconDisabled) { - getStateHelper().put(Properties.topGroupRightIconDisabled, topGroupRightIconDisabled); + public void setTopGroupDisabledRightIcon(String topGroupDisabledRightIcon) { + getStateHelper().put(Properties.topGroupDisabledRightIcon, topGroupDisabledRightIcon); } @Attribute(events = @EventName("click")) 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-28 17:07:14 UTC (rev 21309) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -23,21 +23,17 @@ package org.richfaces.component; +import org.richfaces.PanelMenuMode; +import org.richfaces.cdk.annotations.*; +import org.richfaces.event.ItemChangeEvent; +import org.richfaces.event.PanelToggleEvent; + import javax.el.MethodExpression; import javax.el.ValueExpression; import javax.faces.context.FacesContext; import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; -import org.richfaces.PanelMenuMode; -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 org.richfaces.event.ItemChangeEvent; -import org.richfaces.event.PanelToggleEvent; - /** * @author akolonitsky * @since 2010-10-25 @@ -180,68 +176,68 @@ // ------------------------------------------------ Html Attributes enum Properties { - leftIconDisabled, leftIconExpanded, rightIconCollapsed, rightIconDisabled, rightIconExpanded, disabledClass, styleClass, leftIconCollapsed + leftDisabledIcon, leftExpandedIcon, rightCollapsedIcon, rightDisabledIcon, rightExpandedIcon, disabledClass, styleClass, leftCollapsedIcon } @Attribute(generate = false) - public String getLeftIconCollapsed() { - return (String) getStateHelper().eval(Properties.leftIconCollapsed, - isTopItem() ? getPanelMenu().getTopGroupLeftIconCollapsed() : getPanelMenu().getGroupLeftIconCollapsed()); + public String getLeftCollapsedIcon() { + return (String) getStateHelper().eval(Properties.leftCollapsedIcon, + isTopItem() ? getPanelMenu().getTopGroupCollapsedLeftIcon() : getPanelMenu().getGroupCollapsedLeftIcon()); } - public void setLeftIconCollapsed(String leftIconCollapsed) { - getStateHelper().put(Properties.leftIconCollapsed, leftIconCollapsed); + public void setLeftCollapsedIcon(String leftCollapsedIcon) { + getStateHelper().put(Properties.leftCollapsedIcon, leftCollapsedIcon); } @Attribute(generate = false) - public String getLeftIconDisabled() { - return (String) getStateHelper().eval(Properties.leftIconDisabled, - isTopItem() ? getPanelMenu().getTopGroupLeftIconDisabled() : getPanelMenu().getGroupLeftIconDisabled()); + public String getLeftDisabledIcon() { + return (String) getStateHelper().eval(Properties.leftDisabledIcon, + isTopItem() ? getPanelMenu().getTopGroupDisabledLeftIcon() : getPanelMenu().getGroupDisabledLeftIcon()); } - public void setLeftIconDisabled(String leftIconDisabled) { - getStateHelper().put(Properties.leftIconDisabled, leftIconDisabled); + public void setLeftDisabledIcon(String leftDisabledIcon) { + getStateHelper().put(Properties.leftDisabledIcon, leftDisabledIcon); } @Attribute(generate = false) - public String getLeftIconExpanded() { - return (String) getStateHelper().eval(Properties.leftIconExpanded, - isTopItem() ? getPanelMenu().getTopGroupLeftIconExpanded() : getPanelMenu().getGroupLeftIconExpanded()); + public String getLeftExpandedIcon() { + return (String) getStateHelper().eval(Properties.leftExpandedIcon, + isTopItem() ? getPanelMenu().getTopGroupExpandedLeftIcon() : getPanelMenu().getGroupExpandedLeftIcon()); } - public void setLeftIconExpanded(String leftIconExpanded) { - getStateHelper().put(Properties.leftIconExpanded, leftIconExpanded); + public void setLeftExpandedIcon(String leftExpandedIcon) { + getStateHelper().put(Properties.leftExpandedIcon, leftExpandedIcon); } @Attribute(generate = false) - public String getRightIconCollapsed() { - return (String) getStateHelper().eval(Properties.rightIconCollapsed, - isTopItem() ? getPanelMenu().getTopGroupRightIconCollapsed() : getPanelMenu().getGroupRightIconCollapsed()); + public String getRightCollapsedIcon() { + return (String) getStateHelper().eval(Properties.rightCollapsedIcon, + isTopItem() ? getPanelMenu().getTopGroupCollapsedRightIcon() : getPanelMenu().getGroupCollapsedRightIcon()); } - public void setRightIconCollapsed(String rightIconCollapsed) { - getStateHelper().put(Properties.rightIconCollapsed, rightIconCollapsed); + public void setRightCollapsedIcon(String rightCollapsedIcon) { + getStateHelper().put(Properties.rightCollapsedIcon, rightCollapsedIcon); } @Attribute(generate = false) - public String getRightIconDisabled() { - return (String) getStateHelper().eval(Properties.rightIconDisabled, - isTopItem() ? getPanelMenu().getTopGroupRightIconDisabled() : getPanelMenu().getGroupRightIconDisabled()); + public String getRightDisabledIcon() { + return (String) getStateHelper().eval(Properties.rightDisabledIcon, + isTopItem() ? getPanelMenu().getTopGroupDisabledRightIcon() : getPanelMenu().getGroupDisabledRightIcon()); } - public void setRightIconDisabled(String rightIconDisabled) { - getStateHelper().put(Properties.rightIconDisabled, rightIconDisabled); + public void setRightDisabledIcon(String rightDisabledIcon) { + getStateHelper().put(Properties.rightDisabledIcon, rightDisabledIcon); } @Attribute(generate = false) - public String getRightIconExpanded() { - return (String) getStateHelper().eval(Properties.rightIconExpanded, - isTopItem() ? getPanelMenu().getTopGroupRightIconExpanded() : getPanelMenu().getGroupRightIconExpanded()); + public String getRightExpandedIcon() { + return (String) getStateHelper().eval(Properties.rightExpandedIcon, + isTopItem() ? getPanelMenu().getTopGroupExpandedRightIcon() : getPanelMenu().getGroupExpandedRightIcon()); } - public void setRightIconExpanded(String rightIconExpanded) { - getStateHelper().put(Properties.rightIconExpanded, rightIconExpanded); + public void setRightExpandedIcon(String rightExpandedIcon) { + getStateHelper().put(Properties.rightExpandedIcon, rightExpandedIcon); } @Attribute(events = @EventName("collapse")) 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-28 17:07:14 UTC (rev 21309) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -23,15 +23,11 @@ package org.richfaces.component; -import javax.faces.component.UIComponent; - import org.richfaces.PanelMenuMode; -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 org.richfaces.cdk.annotations.*; +import javax.faces.component.UIComponent; + /** * @author akolonitsky * @since 2010-10-25 @@ -128,7 +124,7 @@ // ------------------------------------------------ Html Attributes enum Properties { - leftIcon, leftIconDisabled, iconRight, rightIconDisabled, styleClass, disabledClass, name + leftIcon, leftDisabledIcon, iconRight, rightDisabledIcon, styleClass, disabledClass, name } @@ -159,13 +155,13 @@ public abstract String getLeftIconClass(); @Attribute(generate = false) - public String getLeftIconDisabled() { - return (String) getStateHelper().eval(Properties.leftIconDisabled, - isTopItem() ? getPanelMenu().getTopItemLeftIconDisabled() : getPanelMenu().getItemLeftIconDisabled()); + public String getLeftDisabledIcon() { + return (String) getStateHelper().eval(Properties.leftDisabledIcon, + isTopItem() ? getPanelMenu().getTopItemDisabledLeftIcon() : getPanelMenu().getItemDisabledLeftIcon()); } - public void setLeftIconDisabled(String leftIconDisabled) { - getStateHelper().put(Properties.leftIconDisabled, leftIconDisabled); + public void setLeftDisabledIcon(String leftDisabledIcon) { + getStateHelper().put(Properties.leftDisabledIcon, leftDisabledIcon); } @Attribute(generate = false) @@ -182,13 +178,13 @@ public abstract String getRightIconClass(); @Attribute(generate = false) - public String getRightIconDisabled() { - return (String) getStateHelper().eval(Properties.rightIconDisabled, - isTopItem() ? getPanelMenu().getTopItemRightIconDisabled() : getPanelMenu().getItemRightIconDisabled()); + public String getRightDisabledIcon() { + return (String) getStateHelper().eval(Properties.rightDisabledIcon, + isTopItem() ? getPanelMenu().getTopItemDisabledRightIcon() : getPanelMenu().getItemDisabledRightIcon()); } - public void setRightIconDisabled(String rightIconDisabled) { - getStateHelper().put(Properties.rightIconDisabled, rightIconDisabled); + public void setRightDisabledIcon(String rightDisabledIcon) { + getStateHelper().put(Properties.rightDisabledIcon, rightDisabledIcon); } @Attribute Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -47,51 +47,51 @@ // ------------------------------------------------ Html Attributes enum Properties { - headerClassDisabled, headerClassInactive, headerClass, contentClass, headerClassActive + headerDisabledClass, headerInactiveClass, headerClass, contentClass, headerActiveClass } @Attribute(generate = false) - public String getHeaderClassActive() { - String value = (String) getStateHelper().eval(Properties.headerClassActive); + public String getHeaderActiveClass() { + String value = (String) getStateHelper().eval(Properties.headerActiveClass); if (value != null) { return value; } - return getTabPanel().getTabHeaderClassActive(); + return getTabPanel().getTabActiveHeaderClass(); } - public void setHeaderClassActive(String headerClassActive) { - getStateHelper().put(Properties.headerClassActive, headerClassActive); + public void setHeaderActiveClass(String headerActiveClass) { + getStateHelper().put(Properties.headerActiveClass, headerActiveClass); } @Attribute(generate = false) - public String getHeaderClassDisabled() { - String value = (String) getStateHelper().eval(Properties.headerClassDisabled); + public String getHeaderDisabledClass() { + String value = (String) getStateHelper().eval(Properties.headerDisabledClass); if (value != null) { return value; } - return getTabPanel().getTabHeaderClassDisabled(); + return getTabPanel().getTabDisabledHeaderClass(); } - public void setHeaderClassDisabled(String headerClassDisabled) { - getStateHelper().put(Properties.headerClassDisabled, headerClassDisabled); + public void setHeaderDisabledClass(String headerDisabledClass) { + getStateHelper().put(Properties.headerDisabledClass, headerDisabledClass); } @Attribute(generate = false) - public String getHeaderClassInactive() { - String value = (String) getStateHelper().eval(Properties.headerClassInactive); + public String getHeaderInactiveClass() { + String value = (String) getStateHelper().eval(Properties.headerInactiveClass); if (value != null) { return value; } - return getTabPanel().getTabHeaderClassInactive(); + return getTabPanel().getTabInactiveHeaderClass(); } - public void setHeaderClassInactive(String headerClassInactive) { - getStateHelper().put(Properties.headerClassInactive, headerClassInactive); + public void setHeaderInactiveClass(String headerInactiveClass) { + getStateHelper().put(Properties.headerInactiveClass, headerInactiveClass); } @Attribute(generate = false) Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -67,13 +67,13 @@ public abstract HeaderAlignment getHeaderAlignment(); @Attribute - public abstract String getTabHeaderClassActive(); + public abstract String getTabActiveHeaderClass(); @Attribute - public abstract String getTabHeaderClassDisabled(); + public abstract String getTabDisabledHeaderClass(); @Attribute - public abstract String getTabHeaderClassInactive(); + public abstract String getTabInactiveHeaderClass(); @Attribute public abstract String getTabContentClass(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -22,14 +22,14 @@ package org.richfaces.component; -import static org.richfaces.renderkit.html.DivPanelRenderer.capitalize; - -import javax.faces.component.UIComponent; - import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.EventName; import org.richfaces.renderkit.html.DivPanelRenderer; +import javax.faces.component.UIComponent; + +import static org.richfaces.renderkit.html.DivPanelRenderer.capitalize; + /** * @author akolonitsky * @since 2010-08-05 @@ -100,13 +100,13 @@ // ------------------------------------------------ Html Attributes @Attribute - public abstract String getHeaderClassActive(); + public abstract String getHeaderActiveClass(); @Attribute - public abstract String getHeaderClassDisabled(); + public abstract String getHeaderDisabledClass(); @Attribute - public abstract String getHeaderClassInactive(); + public abstract String getHeaderInactiveClass(); @Attribute public abstract String getHeaderClass(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -1,21 +1,18 @@ package org.richfaces.renderkit.html; -import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; -import static org.richfaces.renderkit.HtmlConstants.DIV_ELEM; -import static org.richfaces.renderkit.HtmlConstants.TD_ELEM; -import static org.richfaces.renderkit.html.DivPanelRenderer.attributeAsString; - -import java.io.IOException; - -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - import org.richfaces.component.AbstractAccordionItem; import org.richfaces.component.AbstractTogglePanelTitledItem; import org.richfaces.component.util.HtmlUtil; import org.richfaces.renderkit.util.PanelIcons; import org.richfaces.renderkit.util.PanelIcons.State; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import java.io.IOException; + +import static org.richfaces.renderkit.HtmlConstants.*; +import static org.richfaces.renderkit.html.DivPanelRenderer.attributeAsString; + class AccordionItemHeaderRenderer extends TableIconsRendererHelper<AbstractAccordionItem> { public AccordionItemHeaderRenderer() { @@ -23,15 +20,15 @@ } protected void encodeHeaderLeftIcon(ResponseWriter writer, FacesContext context, AbstractAccordionItem panel) throws IOException { - String iconInactive = panel.isDisabled() ? panel.getLeftIconDisabled() : panel.getLeftIconInactive(); - String iconActive = panel.isDisabled() ? panel.getLeftIconDisabled() : panel.getLeftIconActive(); + String iconInactive = panel.isDisabled() ? panel.getLeftDisabledIcon() : panel.getLeftInactiveIcon(); + String iconActive = panel.isDisabled() ? panel.getLeftDisabledIcon() : panel.getLeftActiveIcon(); encodeTdIcon(writer, context, cssClassPrefix + "-ico", iconInactive, iconActive, panel.isDisabled() ? State.commonDisabled : State.common); } protected void encodeHeaderRightIcon(ResponseWriter writer, FacesContext context, AbstractAccordionItem panel) throws IOException { - String iconInactive = panel.isDisabled() ? panel.getRightIconDisabled() : panel.getRightIconInactive(); - String iconActive = panel.isDisabled() ? panel.getRightIconDisabled() : panel.getRightIconActive(); + String iconInactive = panel.isDisabled() ? panel.getRightDisabledIcon() : panel.getRightInactiveIcon(); + String iconActive = panel.isDisabled() ? panel.getRightDisabledIcon() : panel.getRightActiveIcon(); //TODO nick - should this be "-ico-exp"? also why expanded icon state is connected with right icon alignment? encodeTdIcon(writer, context, cssClassPrefix + "-exp-ico", iconInactive, iconActive, panel.isDisabled() ? State.headerDisabled : State.header); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -22,26 +22,22 @@ package org.richfaces.renderkit.html; -import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; -import static org.richfaces.renderkit.HtmlConstants.DIV_ELEM; -import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE; -import static org.richfaces.renderkit.HtmlConstants.STYLE_ATTRIBUTE; +import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.component.AbstractCollapsiblePanel; +import org.richfaces.component.AbstractTogglePanel; +import org.richfaces.renderkit.util.PanelIcons; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; -import org.ajax4jsf.javascript.JSObject; -import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.component.AbstractCollapsiblePanel; -import org.richfaces.component.AbstractTogglePanel; -import org.richfaces.renderkit.util.PanelIcons; +import static org.richfaces.renderkit.HtmlConstants.*; /** * @author akolonitsky @@ -68,23 +64,23 @@ private final TableIconsRendererHelper<AbstractCollapsiblePanel> headerRenderer = new TableIconsRendererHelper<AbstractCollapsiblePanel>("header", "rf-cp") { protected void encodeHeaderLeftIcon(ResponseWriter writer, FacesContext context, AbstractCollapsiblePanel panel) throws IOException { - String leftIconCollapsed = panel.getLeftIconCollapsed(); - if (leftIconCollapsed == null || leftIconCollapsed.trim().length() == 0) { - leftIconCollapsed = PanelIcons.chevronUp.toString(); + String leftCollapsedIcon = panel.getLeftCollapsedIcon(); + if (leftCollapsedIcon == null || leftCollapsedIcon.trim().length() == 0) { + leftCollapsedIcon = PanelIcons.chevronUp.toString(); } - String leftIconExpanded = panel.getLeftIconExpanded(); - if (leftIconExpanded == null || leftIconExpanded.trim().length() == 0) { - leftIconExpanded = PanelIcons.chevronDown.toString(); + String leftExpandedIcon = panel.getLeftExpandedIcon(); + if (leftExpandedIcon == null || leftExpandedIcon.trim().length() == 0) { + leftExpandedIcon = PanelIcons.chevronDown.toString(); } encodeTdIcon(writer, context, cssClassPrefix + "-ico", - leftIconCollapsed, leftIconExpanded, PanelIcons.State.header); + leftCollapsedIcon, leftExpandedIcon, PanelIcons.State.header); } protected void encodeHeaderRightIcon(ResponseWriter writer, FacesContext context, AbstractCollapsiblePanel panel) throws IOException { //TODO nick - should this be "-ico-exp"? also why expanded icon state is connected with right icon alignment? encodeTdIcon(writer, context, cssClassPrefix + "-exp-ico", - panel.getRightIconCollapsed(), panel.getRightIconExpanded(), PanelIcons.State.header); + panel.getRightCollapsedIcon(), panel.getRightExpandedIcon(), PanelIcons.State.header); } @Override Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -1,14 +1,13 @@ package org.richfaces.renderkit.html; -import java.io.IOException; - -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - import org.richfaces.component.AbstractPanelMenuGroup; import org.richfaces.renderkit.util.PanelIcons; import org.richfaces.renderkit.util.PanelIcons.State; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import java.io.IOException; + class PanelMenuGroupHeaderRenderer extends TableIconsRendererHelper<AbstractPanelMenuGroup> { PanelMenuGroupHeaderRenderer(String cssClassPrefix) { @@ -24,8 +23,8 @@ } protected void encodeHeaderLeftIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup group) throws IOException { - String iconCollapsed = group.isDisabled() ? group.getLeftIconDisabled() : group.getLeftIconCollapsed(); - String iconExpanded = group.isDisabled() ? group.getLeftIconDisabled() : group.getLeftIconExpanded(); + String iconCollapsed = group.isDisabled() ? group.getLeftDisabledIcon() : group.getLeftCollapsedIcon(); + String iconExpanded = group.isDisabled() ? group.getLeftDisabledIcon() : group.getLeftExpandedIcon(); if (iconCollapsed == null || iconCollapsed.trim().length() == 0) { iconCollapsed = PanelIcons.transparent.toString(); @@ -39,8 +38,8 @@ } protected void encodeHeaderRightIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup group) throws IOException { - String iconCollapsed = group.isDisabled() ? group.getRightIconDisabled() : group.getRightIconCollapsed(); - String iconExpanded = group.isDisabled() ? group.getRightIconDisabled() : group.getRightIconExpanded(); + String iconCollapsed = group.isDisabled() ? group.getRightDisabledIcon() : group.getRightCollapsedIcon(); + String iconExpanded = group.isDisabled() ? group.getRightDisabledIcon() : group.getRightExpandedIcon(); if (iconCollapsed == null || iconCollapsed.trim().length() == 0) { iconCollapsed = PanelIcons.transparent.toString(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -100,7 +100,7 @@ } private void encodeHeaderGroupRightIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuItem menuItem, String classPrefix) throws IOException { - String icon = menuItem.isDisabled() ? menuItem.getRightIconDisabled() : menuItem.getRightIcon(); + String icon = menuItem.isDisabled() ? menuItem.getRightDisabledIcon() : menuItem.getRightIcon(); String cssClasses = concatClasses(classPrefix + "-exp-ico", menuItem.getLeftIconClass()); if (icon == null || icon.trim().length() == 0) { @@ -110,7 +110,7 @@ } private void encodeHeaderGroupLeftIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuItem menuItem, String classPrefix) throws IOException { - String icon = menuItem.isDisabled() ? menuItem.getLeftIconDisabled() : menuItem.getLeftIcon(); + String icon = menuItem.isDisabled() ? menuItem.getLeftDisabledIcon() : menuItem.getLeftIcon(); String cssClasses = concatClasses(classPrefix + "-ico", menuItem.getLeftIconClass()); if (icon == null || icon.trim().length() == 0) { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2011-01-28 17:07:14 UTC (rev 21309) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2011-01-28 17:08:21 UTC (rev 21310) @@ -22,27 +22,6 @@ package org.richfaces.renderkit.html; -import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.active; -import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.disabled; -import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.inactive; -import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; -import static org.richfaces.renderkit.HtmlConstants.DIV_ELEM; -import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE; -import static org.richfaces.renderkit.HtmlConstants.STYLE_ATTRIBUTE; -import static org.richfaces.renderkit.HtmlConstants.TBODY_ELEMENT; -import static org.richfaces.renderkit.HtmlConstants.TD_ELEM; -import static org.richfaces.renderkit.HtmlConstants.TR_ELEMENT; -import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; - -import java.io.IOException; -import java.util.Map; - -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - import org.ajax4jsf.javascript.JSObject; import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.AbstractTabPanel; @@ -53,6 +32,18 @@ import org.richfaces.renderkit.HtmlConstants; import org.richfaces.renderkit.RenderKitUtils; +import javax.faces.application.ResourceDependencies; +import javax.faces.application.ResourceDependency; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import java.io.IOException; +import java.util.Map; + +import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.*; +import static org.richfaces.renderkit.HtmlConstants.*; +import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; + /** * @author akolonitsky * @since 2010-08-24 @@ -195,10 +186,10 @@ writeTopTabSpacer(w, comp, "padding-right: 5px; width: 100%;", "rf-tb-hdr-spcr"); } - private void writeTopTabSpacer(ResponseWriter w, UIComponent comp, String style, String classStyle) throws IOException { + private void writeTopTabSpacer(ResponseWriter w, UIComponent comp, String style, String styleClass) throws IOException { w.startElement(TD_ELEM, comp); w.writeAttribute(STYLE, style, null); - w.writeAttribute(CLASS, classStyle, null); + w.writeAttribute(CLASS, styleClass, null); w.write("<br />"); w.endElement(TD_ELEM); } 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-28 17:07:14 UTC (rev 21309) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml 2011-01-28 17:08:21 UTC (rev 21310) @@ -42,36 +42,36 @@ itemLeftIcon="triangleDown" itemClass="itemClass" - itemRightIconDisabled="chevronUp" - itemLeftIconDisabled="chevronDown" + itemDisabledRightIcon="chevronUp" + itemDisabledLeftIcon="chevronDown" itemDisabledClass="itemDisabledClass" topItemRightIcon="triangle" topItemLeftIcon="triangle" topItemClass="topItemClass" - topItemRightIconDisabled="chevron" - topItemLeftIconDisabled="chevron" + topItemDisabledRightIcon="chevron" + topItemDisabledLeftIcon="chevron" topItemDisabledClass="topItemDisabledClass" - groupRightIconCollapsed="triangleUp" - groupRightIconExpanded="disc" - groupLeftIconCollapsed="triangleDown" - groupLeftIconExpanded="disc" + groupCollapsedRightIcon="triangleUp" + groupExpandedRightIcon="disc" + groupCollapsedLeftIcon="triangleDown" + groupExpandedLeftIcon="disc" groupClass="groupClass" - groupRightIconDisabled="chevronUp" - groupLeftIconDisabled="chevronDown" + groupDisabledRightIcon="chevronUp" + groupDisabledLeftIcon="chevronDown" groupDisabledClass="groupDisabledClass" - topGroupRightIconCollapsed="triangle" - topGroupRightIconExpanded="disc" - topGroupLeftIconCollapsed="triangle" - topGroupLeftIconExpanded="disc" + topGroupCollapsedRightIcon="triangle" + topGroupExpandedRightIcon="disc" + topGroupCollapsedLeftIcon="triangle" + topGroupExpandedLeftIcon="disc" topGroupClass="topGroupClass" - topGroupRightIconDisabled="chevron" - topGroupLeftIconDisabled="chevron" + topGroupDisabledRightIcon="chevron" + topGroupDisabledLeftIcon="chevron" topGroupDisabledClass="topGroupDisabledClass"