Author: ppitonak(a)redhat.com Date: 2010-12-15 08:03:51 -0500 (Wed, 15 Dec 2010) New Revision: 20577 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml Log: * samples for command button and command link fixed Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.java 2010-12-15 12:05:43 UTC (rev 20576) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.java 2010-12-15 13:03:51 UTC (rev 20577) @@ -27,7 +27,6 @@ import javax.faces.bean.ViewScoped; import javax.faces.event.ActionEvent; import org.richfaces.component.UICommandButton; -import org.richfaces.tests.metamer.Attribute; import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,21 +57,15 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UICommandButton.class, getClass()); + attributes = Attributes.getUIComponentAttributes(UICommandButton.class, getClass(), false); - attributes.setAttribute("value", "command button"); - attributes.setAttribute("rendered", true); attributes.setAttribute("action", "first6CharsAction"); attributes.setAttribute("actionListener", "toUpperCaseActionListener"); + attributes.setAttribute("disabled", false); + attributes.get("disabled").setType(Boolean.class); attributes.setAttribute("render", "output1 output2 output3"); - - Attribute attr = attributes.get("disabled"); - if (attr == null) { - attr = new Attribute("disabled"); - } - attr.setType(Boolean.class); - attributes.put("disabled", attr); - + attributes.setAttribute("rendered", true); + attributes.setAttribute("value", "command button"); } /** Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.java 2010-12-15 12:05:43 UTC (rev 20576) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.java 2010-12-15 13:03:51 UTC (rev 20577) @@ -57,12 +57,10 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UICommandLink.class, getClass()); + attributes = Attributes.getUIComponentAttributes(UICommandLink.class, getClass(), false); attributes.setAttribute("value", "command link"); - attributes.setAttribute("rendered", "true"); - attributes.setAttribute("disabled", false); - attributes.get("disabled").setType(Boolean.class); + attributes.setAttribute("rendered", true); attributes.setAttribute("action", "first6CharsAction"); attributes.setAttribute("actionListener", "toUpperCaseActionListener"); attributes.setAttribute("render", "output1 output2 output3"); Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml 2010-12-15 12:05:43 UTC (rev 20576) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml 2010-12-15 13:03:51 UTC (rev 20577) @@ -50,10 +50,15 @@ action="#{a4jButtonBean.attributes.action}" actionListener="#{a4jButtonBean.attributes.actionListener}" bypassUpdates="#{a4jButtonBean.attributes['bypassUpdates'].value}" + data="#{a4jButtonBean.attributes['data'].value}" disabled="#{a4jButtonBean.attributes['disabled'].value}" + execute="#{a4jButtonBean.attributes['execute'].value}" immediate="#{a4jButtonBean.attributes['immediate'].value}" limitRender="#{a4jButtonBean.attributes['limitRender'].value}" + onbeforedomupdate="#{a4jButtonBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jButtonBean.attributes['onbegin'].value}" onclick="#{a4jButtonBean.attributes['onclick'].value}" + oncomplete="#{a4jButtonBean.attributes['oncomplete'].value}" ondblclick="#{a4jButtonBean.attributes['ondblclick'].value}" onkeydown="#{a4jButtonBean.attributes['onkeydown'].value}" onkeypress="#{a4jButtonBean.attributes['onkeypress'].value}" @@ -65,10 +70,13 @@ onmouseup="#{a4jButtonBean.attributes['onmouseup'].value}" render="#{a4jButtonBean.attributes['render'].value}" rendered="#{a4jButtonBean.attributes['rendered'].value}" + status="#{a4jButtonBean.attributes['status'].value}" style="#{a4jButtonBean.attributes['style'].value}" styleClass="#{a4jButtonBean.attributes['styleClass'].value}" + title="#{a4jButtonBean.attributes['title'].value}" + type="#{a4jButtonBean.attributes['type'].value}" value="#{a4jButtonBean.attributes['value'].value}" - execute="@form" /> + /> </h:panelGrid> <h:panelGrid id="outputs" columns="2"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml 2010-12-15 12:05:43 UTC (rev 20576) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml 2010-12-15 13:03:51 UTC (rev 20577) @@ -50,10 +50,18 @@ action="#{a4jLinkBean.attributes.action}" actionListener="#{a4jLinkBean.attributes.actionListener}" bypassUpdates="#{a4jLinkBean.attributes['bypassUpdates'].value}" + charset="#{a4jLinkBean.attributes['charset'].value}" + coords="#{a4jLinkBean.attributes['coords'].value}" + data="#{a4jLinkBean.attributes['data'].value}" disabled="#{a4jLinkBean.attributes['disabled'].value}" + execute="#{a4jLinkBean.attributes['execute'].value}" + hreflang="#{a4jLinkBean.attributes['hreflang'].value}" immediate="#{a4jLinkBean.attributes['immediate'].value}" limitRender="#{a4jLinkBean.attributes['limitRender'].value}" + onbeforedomupdate="#{a4jLinkBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jLinkBean.attributes['onbegin'].value}" onclick="#{a4jLinkBean.attributes['onclick'].value}" + oncomplete="#{a4jLinkBean.attributes['oncomplete'].value}" ondblclick="#{a4jLinkBean.attributes['ondblclick'].value}" onkeydown="#{a4jLinkBean.attributes['onkeydown'].value}" onkeypress="#{a4jLinkBean.attributes['onkeypress'].value}" @@ -63,13 +71,18 @@ onmouseout="#{a4jLinkBean.attributes['onmouseout'].value}" onmouseover="#{a4jLinkBean.attributes['onmouseover'].value}" onmouseup="#{a4jLinkBean.attributes['onmouseup'].value}" + rel="#{a4jLinkBean.attributes['rel'].value}" render="#{a4jLinkBean.attributes['render'].value}" rendered="#{a4jLinkBean.attributes['rendered'].value}" + rev="#{a4jLinkBean.attributes['rev'].value}" + shape="#{a4jLinkBean.attributes['shape'].value}" + status="#{a4jLinkBean.attributes['status'].value}" style="#{a4jLinkBean.attributes['style'].value}" styleClass="#{a4jLinkBean.attributes['styleClass'].value}" + title="#{a4jLinkBean.attributes['title'].value}" + type="#{a4jLinkBean.attributes['type'].value}" value="#{a4jLinkBean.attributes['value'].value}" - execute="@form" /> - + /> </h:panelGrid> <h:panelGrid id="outputs" columns="2">