Author: nbelaevski Date: 2010-05-09 13:44:22 -0400 (Sun, 09 May 2010) New Revision: 16939 Modified: root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandButton.java root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandLink.java root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml Log: Changed component family for a4j:commandLink & a4j:commandButton to javax.faces.Command Modified: root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandButton.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandButton.java 2010-05-08 00:12:12 UTC (rev 16938) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandButton.java 2010-05-09 17:44:22 UTC (rev 16939) @@ -23,12 +23,13 @@ package org.richfaces.component; +import javax.faces.component.UICommand; +import javax.faces.component.UIComponentBase; + import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.EventName; import org.richfaces.cdk.annotations.JsfComponent; -import javax.faces.component.UIComponentBase; - /** * @author Nick Belaevski * @@ -38,8 +39,8 @@ public static final String COMPONENT_TYPE = "org.richfaces.CommandButton"; - public static final String COMPONENT_FAMILY = "org.richfaces.CommandButton"; - + public static final String COMPONENT_FAMILY = UICommand.COMPONENT_FAMILY; + @Attribute(events = {@EventName("click"), @EventName(value = "action", defaultEvent = true)}) public abstract String getOnclick(); Modified: root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandLink.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandLink.java 2010-05-08 00:12:12 UTC (rev 16938) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandLink.java 2010-05-09 17:44:22 UTC (rev 16939) @@ -22,12 +22,12 @@ package org.richfaces.component; +import javax.faces.component.UICommand; + import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.EventName; import org.richfaces.cdk.annotations.JsfComponent; -import javax.faces.component.UICommand; - /** * @author Nick Belaevski */ @@ -36,8 +36,8 @@ public static final String COMPONENT_TYPE = "org.richfaces.CommandLink"; - public static final String COMPONENT_FAMILY = "org.richfaces.CommandLink"; - + public static final String COMPONENT_FAMILY = UICommand.COMPONENT_FAMILY; + @Attribute(events = {@EventName("click"), @EventName(value = "action", defaultEvent = true)}) public abstract String getOnclick(); Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml 2010-05-08 00:12:12 UTC (rev 16938) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml 2010-05-09 17:44:22 UTC (rev 16939) @@ -7,8 +7,7 @@ <cc:interface> <cdk:class>org.richfaces.renderkit.html.CommandButtonRenderer</cdk:class> <cdk:superclass>org.richfaces.renderkit.html.CommandButtonRendererBase</cdk:superclass> - <!--<cdk:component-family>javax.faces.Command</cdk:component-family>--> - <cdk:component-family>org.richfaces.CommandButton</cdk:component-family> + <cdk:component-family>javax.faces.Command</cdk:component-family> <cdk:renderer-type>org.richfaces.CommandButtonRenderer</cdk:renderer-type> </cc:interface> Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml 2010-05-08 00:12:12 UTC (rev 16938) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml 2010-05-09 17:44:22 UTC (rev 16939) @@ -7,8 +7,7 @@ <cc:interface> <cdk:class>org.richfaces.renderkit.html.CommandLinkRenderer</cdk:class> <cdk:superclass>org.richfaces.renderkit.AjaxCommandRendererBase</cdk:superclass> - <cdk:component-family>org.richfaces.CommandLink</cdk:component-family> - <!--<cdk:component-family>javax.faces.Command</cdk:component-family>--> + <cdk:component-family>javax.faces.Command</cdk:component-family> <cdk:renderer-type>org.richfaces.CommandLinkRenderer</cdk:renderer-type> </cc:interface>