Author: abelevich Date: 2011-02-11 09:41:46 -0500 (Fri, 11 Feb 2011) New Revision: 21629 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java Log: RF-9470 Collapsible panel: doesn't work with Myfaces 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-11 13:57:04 UTC (rev 21628) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-02-11 14:41:46 UTC (rev 21629) @@ -86,7 +86,8 @@ localValueSet, required, valid, - immediate + immediate, + switchType } protected AbstractTogglePanel() { @@ -612,9 +613,20 @@ } } - @Attribute(defaultValue = "SwitchType.DEFAULT") - public abstract SwitchType getSwitchType(); + + @Attribute + public SwitchType getSwitchType() { + SwitchType switchType = (SwitchType) getStateHelper().eval(PropertyKeys.switchType, SwitchType.DEFAULT); + if (switchType == null) { + switchType = SwitchType.DEFAULT; + } + return switchType; + } + public void setSwitchType(SwitchType switchType) { + getStateHelper().put(PropertyKeys.switchType, switchType); + } + @Attribute public abstract boolean isBypassUpdates(); 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-02-11 13:57:04 UTC (rev 21628) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java 2011-02-11 14:41:46 UTC (rev 21629) @@ -22,22 +22,26 @@ package org.richfaces.renderkit.html; -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.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 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 static org.richfaces.renderkit.HtmlConstants.*; +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; /** * @author akolonitsky