Author: nbelaevski Date: 2010-10-04 17:42:02 -0400 (Mon, 04 Oct 2010) New Revision: 19438 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanelTitledItem.java trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml Log: https://jira.jboss.org/browse/RF-9406 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java 2010-10-04 19:43:13 UTC (rev 19437) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java 2010-10-04 21:42:02 UTC (rev 19438) @@ -22,22 +22,22 @@ package org.richfaces.component.html; -import org.richfaces.component.UITogglePanelTitledItem; -import org.richfaces.component.behavior.ToggleControl; - -import javax.faces.component.behavior.ClientBehaviorHolder; - import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import javax.faces.component.behavior.ClientBehaviorHolder; + +import org.richfaces.component.UITogglePanelTitledItem; +import org.richfaces.component.behavior.ToggleControl; + /** * @author akolonitsky * @since 2010-08-13 */ public class HtmlAccordionItem extends UITogglePanelTitledItem implements ClientBehaviorHolder { - public static final String COMPONENT_TYPE = "org.richfaces.TogglePanelTitledItem"; + public static final String COMPONENT_TYPE = "org.richfaces.AccordionItem"; public static final String COMPONENT_FAMILY = "org.richfaces.TogglePanelTitledItem"; Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java 2010-10-04 19:43:13 UTC (rev 19437) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java 2010-10-04 21:42:02 UTC (rev 19438) @@ -22,20 +22,21 @@ package org.richfaces.component.html; -import org.richfaces.component.UITogglePanelTitledItem; - -import javax.faces.component.behavior.ClientBehaviorHolder; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import javax.faces.component.behavior.ClientBehaviorHolder; + +import org.richfaces.component.UITogglePanelTitledItem; + /** * @author akolonitsky * @since 2010-08-27 */ public class HtmlTab extends UITogglePanelTitledItem implements ClientBehaviorHolder { - public static final String COMPONENT_TYPE = "org.richfaces.TogglePanelTitledItem"; + public static final String COMPONENT_TYPE = "org.richfaces.TabPanelItem"; public static final String COMPONENT_FAMILY = "org.richfaces.TogglePanelTitledItem"; Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanelTitledItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanelTitledItem.java 2010-10-04 19:43:13 UTC (rev 19437) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanelTitledItem.java 2010-10-04 21:42:02 UTC (rev 19438) @@ -22,17 +22,19 @@ package org.richfaces.component.html; -import org.richfaces.component.UITogglePanelTitledItem; -import javax.faces.component.behavior.ClientBehaviorHolder; - import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import javax.faces.component.behavior.ClientBehaviorHolder; + +import org.richfaces.component.UITogglePanelTitledItem; + /** * @author akolonitsky * @since 2010-08-13 */ +//TODO alex - what's the purpose of this class? public class HtmlTogglePanelTitledItem extends UITogglePanelTitledItem implements ClientBehaviorHolder { public static final String COMPONENT_TYPE = "org.richfaces.TogglePanelTitledItem"; Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-10-04 19:43:13 UTC (rev 19437) +++ trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-10-04 21:42:02 UTC (rev 19438) @@ -491,7 +491,7 @@ </component> <component> - <component-type>org.richfaces.TogglePanelTitledItem</component-type> + <component-type>org.richfaces.AccordionItem</component-type> <component-class>org.richfaces.component.html.HtmlAccordionItem</component-class> <property> <description></description> @@ -659,7 +659,7 @@ <component-class>org.richfaces.component.html.HtmlTabPanel</component-class> </component> <component> - <component-type>org.richfaces.TogglePanelTitledItem</component-type> + <component-type>org.richfaces.TabPanelItem</component-type> <component-class>org.richfaces.component.html.HtmlTab</component-class> </component> Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-10-04 19:43:13 UTC (rev 19437) +++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-10-04 21:42:02 UTC (rev 19438) @@ -45,7 +45,7 @@ <tag> <tag-name>tab</tag-name> <component> - <component-type>org.richfaces.TogglePanelTitledItem</component-type> + <component-type>org.richfaces.TabPanelItem</component-type> <renderer-type>org.richfaces.Tab</renderer-type> </component> </tag> @@ -741,9 +741,8 @@ <tag> <tag-name>accordionItem</tag-name> <component> - <component-type>org.richfaces.TogglePanelTitledItem</component-type> + <component-type>org.richfaces.AccordionItem</component-type> <renderer-type>org.richfaces.AccordionItem</renderer-type> - </component> <attribute> <description></description>