[richfaces-svn-commits] JBoss Rich Faces SVN: r21758 - trunk/ui/output/ui/src/main/java/org/richfaces/component.

Author: artdaw Date: 2011-02-18 08:13:49 -0500 (Fri, 18 Feb 2011) New Revision: 21758 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 Log: RF-10566: @switchType is fixed for rich:accordionItem, rich:togglePanelItem, and rich:tab 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-18 13:05:10 UTC (rev 21757) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java 2011-02-18 13:13:49 UTC (rev 21758) @@ -22,15 +22,11 @@ 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 @@ -189,7 +185,7 @@ @Attribute(generate = false) public SwitchType getSwitchType() { - SwitchType switchType = (SwitchType) getStateHelper().eval(Properties.switchType, SwitchType.DEFAULT); + SwitchType switchType = (SwitchType) getStateHelper().eval(Properties.switchType); if (switchType == null) { switchType = getParentPanel().getSwitchType(); } 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-18 13:05:10 UTC (rev 21757) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java 2011-02-18 13:13:49 UTC (rev 21758) @@ -22,17 +22,12 @@ package org.richfaces.component; +import org.richfaces.cdk.annotations.*; +import org.richfaces.renderkit.html.DivPanelRenderer; + 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; -import org.richfaces.component.AbstractAccordionItem.Properties; -import org.richfaces.renderkit.html.DivPanelRenderer; - /** * @author akolonitsky * @since 2010-10-19 @@ -207,7 +202,7 @@ @Attribute(generate = false) public SwitchType getSwitchType() { - SwitchType switchType = (SwitchType) getStateHelper().eval(Properties.switchType, SwitchType.DEFAULT); + SwitchType switchType = (SwitchType) getStateHelper().eval(Properties.switchType); if (switchType == null) { switchType = getParentPanel().getSwitchType(); } 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-18 13:05:10 UTC (rev 21757) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-02-18 13:13:49 UTC (rev 21758) @@ -22,10 +22,16 @@ package org.richfaces.component; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import com.google.common.base.Strings; +import org.richfaces.application.MessageFactory; +import org.richfaces.application.ServiceTracker; +import org.richfaces.appplication.FacesMessages; +import org.richfaces.cdk.annotations.*; +import org.richfaces.component.util.MessageUtil; +import org.richfaces.event.ItemChangeEvent; +import org.richfaces.event.ItemChangeListener; +import org.richfaces.event.ItemChangeSource; +import org.richfaces.renderkit.util.RendererUtils; import javax.el.ELException; import javax.el.MethodExpression; @@ -36,31 +42,12 @@ import javax.faces.component.UIOutput; import javax.faces.component.UpdateModelException; import javax.faces.context.FacesContext; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.ExceptionQueuedEvent; -import javax.faces.event.ExceptionQueuedEventContext; -import javax.faces.event.FacesEvent; -import javax.faces.event.PhaseId; -import javax.faces.event.PostValidateEvent; -import javax.faces.event.PreValidateEvent; +import javax.faces.event.*; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; -import org.richfaces.application.MessageFactory; -import org.richfaces.application.ServiceTracker; -import org.richfaces.appplication.FacesMessages; -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.component.util.MessageUtil; -import org.richfaces.event.ItemChangeEvent; -import org.richfaces.event.ItemChangeListener; -import org.richfaces.event.ItemChangeSource; -import org.richfaces.renderkit.util.RendererUtils; - -import com.google.common.base.Strings; - /** * @author akolonitsky * @version 1.0 @@ -616,7 +603,7 @@ @Attribute(generate = false) public SwitchType getSwitchType() { - SwitchType switchType = (SwitchType) getStateHelper().eval(PropertyKeys.switchType, SwitchType.DEFAULT); + SwitchType switchType = (SwitchType) getStateHelper().eval(PropertyKeys.switchType); if (switchType == null) { switchType = SwitchType.DEFAULT; } 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-18 13:05:10 UTC (rev 21757) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItem.java 2011-02-18 13:13:49 UTC (rev 21758) @@ -22,12 +22,7 @@ package org.richfaces.component; -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; -import org.richfaces.component.AbstractAccordionItem.Properties; +import org.richfaces.cdk.annotations.*; import javax.faces.component.UIOutput; @@ -87,7 +82,7 @@ @Attribute(generate = false) public SwitchType getSwitchType() { - SwitchType switchType = (SwitchType) getStateHelper().eval(Properties.switchType, SwitchType.DEFAULT); + SwitchType switchType = (SwitchType) getStateHelper().eval(Properties.switchType); if (switchType == null) { switchType = getParentPanel().getSwitchType(); }