Author: abelevich Date: 2011-02-17 15:36:13 -0500 (Thu, 17 Feb 2011) New Revision: 21748 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItemInterface.java Log: RF-10488 Accordion: cannot switch with Myfaces when switchType is not defined 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-02-17 20:22:58 UTC (rev 21747) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java 2011-02-17 20:36:13 UTC (rev 21748) @@ -22,11 +22,15 @@ package org.richfaces.component; -import org.richfaces.cdk.annotations.*; - import javax.faces.component.UIComponent; import javax.faces.component.behavior.ClientBehaviorHolder; +import org.richfaces.cdk.annotations.Attribute; +import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.cdk.annotations.Tag; +import org.richfaces.cdk.annotations.TagType; + /** * @author akolonitsky * @since 2010-08-13 @@ -40,7 +44,7 @@ enum Properties { header, - + contentClass, leftActiveIcon, leftInactiveIcon, @@ -51,7 +55,8 @@ headerActiveClass, headerDisabledClass, headerInactiveClass, - headerClass + headerClass, + switchType } public AbstractAccordionItem() { @@ -181,5 +186,21 @@ public void setContentClass(String contentClass) { getStateHelper().put(Properties.contentClass, contentClass); } + + @Attribute(generate = false) + public SwitchType getSwitchType() { + SwitchType switchType = (SwitchType) getStateHelper().eval(Properties.switchType, SwitchType.DEFAULT); + if (switchType == null) { + switchType = getParentPanel().getSwitchType(); + } + if (switchType == null) { + switchType = SwitchType.DEFAULT; + } + return switchType; + } + + public void setSwitchType(SwitchType switchType) { + getStateHelper().put(Properties.switchType, switchType); + } } 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-02-17 20:22:58 UTC (rev 21747) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java 2011-02-17 20:36:13 UTC (rev 21748) @@ -30,6 +30,7 @@ import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.cdk.annotations.Tag; import org.richfaces.cdk.annotations.TagType; +import org.richfaces.component.AbstractAccordionItem.Properties; import org.richfaces.renderkit.html.DivPanelRenderer; /** @@ -49,7 +50,14 @@ // ------------------------------------------------ Html Attributes enum Properties { - headerDisabledClass, headerInactiveClass, headerClass, contentClass, execute, headerActiveClass, header + headerDisabledClass, + headerInactiveClass, + headerClass, + contentClass, + execute, + headerActiveClass, + header, + switchType } @Attribute(generate = false) @@ -196,5 +204,21 @@ public String toString() { return "TogglePanelItem {name: " + getName() + ", switchType: " + getSwitchType() + '}'; } + + @Attribute(generate = false) + public SwitchType getSwitchType() { + SwitchType switchType = (SwitchType) getStateHelper().eval(Properties.switchType, SwitchType.DEFAULT); + if (switchType == null) { + switchType = getParentPanel().getSwitchType(); + } + if (switchType == null) { + switchType = SwitchType.DEFAULT; + } + return switchType; + } + + public void setSwitchType(SwitchType switchType) { + getStateHelper().put(Properties.switchType, switchType); + } } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-02-17 20:22:58 UTC (rev 21747) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-02-17 20:36:13 UTC (rev 21748) @@ -614,7 +614,7 @@ } - @Attribute + @Attribute(generate = false) public SwitchType getSwitchType() { SwitchType switchType = (SwitchType) getStateHelper().eval(PropertyKeys.switchType, SwitchType.DEFAULT); if (switchType == null) { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItem.java 2011-02-17 20:22:58 UTC (rev 21747) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItem.java 2011-02-17 20:36:13 UTC (rev 21748) @@ -27,6 +27,7 @@ import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.cdk.annotations.Tag; import org.richfaces.cdk.annotations.TagType; +import org.richfaces.component.AbstractAccordionItem.Properties; import javax.faces.component.UIOutput; @@ -44,6 +45,10 @@ public static final String COMPONENT_FAMILY = "org.richfaces.TogglePanelItem"; protected static final String NAME = "name"; + enum Properties { + switchType + } + protected AbstractTogglePanelItem() { setRendererType("org.richfaces.TogglePanelItemRenderer"); } @@ -79,4 +84,20 @@ public String toString() { return "TogglePanelItem {name: " + getName() + ", switchType: " + getSwitchType() + '}'; } + + @Attribute(generate = false) + public SwitchType getSwitchType() { + SwitchType switchType = (SwitchType) getStateHelper().eval(Properties.switchType, SwitchType.DEFAULT); + if (switchType == null) { + switchType = getParentPanel().getSwitchType(); + } + if (switchType == null) { + switchType = SwitchType.DEFAULT; + } + return switchType; + } + + public void setSwitchType(SwitchType switchType) { + getStateHelper().put(Properties.switchType, switchType); + } } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItemInterface.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItemInterface.java 2011-02-17 20:22:58 UTC (rev 21747) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItemInterface.java 2011-02-17 20:36:13 UTC (rev 21748) @@ -15,7 +15,6 @@ String getName(); - @Attribute(defaultValue = "getParentPanel().getSwitchType()") SwitchType getSwitchType(); // ------------------------------------------------ Html Attributes