Author: jpapouse Date: 2011-08-16 08:55:42 -0400 (Tue, 16 Aug 2011) New Revision: 22634 Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richOrderingList/withColumn.xhtml Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichOrderingListBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/converter/CapitalConverter.java modules/tests/metamer/trunk/application/src/main/webapp/components/richOrderingList/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richOrderingList/simple.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingList.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListMoving.java Log: RFPL-1547: improved metamer sample containg ordering list Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichOrderingListBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichOrderingListBean.java 2011-08-16 12:24:43 UTC (rev 22633) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichOrderingListBean.java 2011-08-16 12:55:42 UTC (rev 22634) @@ -22,6 +22,8 @@ package org.richfaces.tests.metamer.bean.rich; import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; import javax.annotation.PostConstruct; @@ -51,6 +53,7 @@ //FIXME: @ManagedProperty(value="#{model.capitals}") private List<Capital> capitals; private Attributes attributes; + private Collection<String> hiddenAttributes = new ArrayList<String>(); @ManagedProperty(value="#{capitalConverter}") private Converter converter; @@ -72,41 +75,52 @@ attributes.setAttribute("upText", "Up"); attributes.setAttribute("upTopText", "First"); - attributes.remove("value"); - // TODO has to be tested in another way - attributes.remove("converter"); - attributes.remove("converterMessage"); - attributes.remove("validator"); - attributes.remove("validatorMessage"); - attributes.remove("valueChangeListener"); + String[] attrsToHide = new String[] { + "itemLabel", "itemValue", "value", "var", + // TODO has to be tested in another way + "converter", "converterMessage", "validator", "validatorMessage", "valueChangeListener" + }; + for (String attribute : attrsToHide) { + hiddenAttributes.add(attribute); + attributes.remove(attribute); + } + // FIXME capitals = Model.unmarshallCapitals(); } + public Attributes getAttributes() { + return attributes; + } + public List<Capital> getCapitals() { logger.info("size of returned capitals is <" + capitals.size() + ">"); return capitals; + } + + public Converter getConverter() { + return converter; } - - public Attributes getAttributes() { - return attributes; + + public Collection<String> getHiddenAttributes() { + return hiddenAttributes; } - + + public void setAttributes(Attributes attributes) { + this.attributes = attributes; + } + public void setCapitals(List<Capital> capitals) { logger.info("size of set capitals is <" + capitals.size() + ">"); this.capitals = capitals; } - public void setAttributes(Attributes attributes) { - this.attributes = attributes; - } - - public Converter getConverter() { - return converter; - } - public void setConverter(Converter converter) { this.converter = converter; } + public void setHiddenAttributes(Collection<String> hiddenAttributes) { + this.hiddenAttributes = hiddenAttributes; + } + } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/converter/CapitalConverter.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/converter/CapitalConverter.java 2011-08-16 12:24:43 UTC (rev 22633) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/converter/CapitalConverter.java 2011-08-16 12:55:42 UTC (rev 22634) @@ -47,7 +47,7 @@ @Override public Object getAsObject(FacesContext context, UIComponent component, String value) { - LOGGER.info(value); + LOGGER.info("capital as object: " + value); for(Capital capital : capitals) { if (capitalAsString(capital).equals(value)) { Capital toReturn = new Capital(); @@ -77,6 +77,7 @@ } private String capitalAsString(Capital capital) { + LOGGER.info("capital as string: " + capital.getName()); return capital.getName(); } Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richOrderingList/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richOrderingList/list.xhtml 2011-08-16 12:24:43 UTC (rev 22633) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richOrderingList/list.xhtml 2011-08-16 12:55:42 UTC (rev 22634) @@ -33,9 +33,12 @@ <metamer:testPageLink id="simple" outcome="simple" value="Simple"> Simple page that contains <b>rich:panel</b> and input boxes for all its attributes. </metamer:testPageLink> - + + <metamer:testPageLink id="withColumn" outcome="withColumn" value="With Column"> + Simple page that contains <b>rich:panel</b> with <b>rich:column</b> and input boxes for all its attributes. + </metamer:testPageLink> </ui:define> - + </ui:composition> </html> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richOrderingList/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richOrderingList/simple.xhtml 2011-08-16 12:24:43 UTC (rev 22633) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richOrderingList/simple.xhtml 2011-08-16 12:55:42 UTC (rev 22634) @@ -37,8 +37,6 @@ <br /> <rich:orderingList columnClasses="#{richOrderingListBean.attributes['columnClasses'].value}" columnVar="#{richOrderingListBean.attributes['columnVar'].value}" - converter="#{richOrderingListBean.attributes['converter'].value}" - converterMessage="#{richOrderingListBean.attributes['converterMessage'].value}" defaultLabel="#{richOrderingListBean.attributes['defaultLabel'].value}" disabled="#{richOrderingListBean.attributes['disabled'].value}" disabledClass="#{richOrderingListBean.attributes['disabledClass'].value}" @@ -48,9 +46,8 @@ id="orderingList" immediate="#{richOrderingListBean.attributes['immediate'].value}" itemClass="#{richOrderingListBean.attributes['itemClass'].value}" - itemLabel="#{richOrderingListBean.attributes['itemlabel'].value}" + itemLabel="#{capital.name}" itemValue="#{capital}" - itemValues="#{richOrderingListBean.attributes['itemValues'].value}" listHeight="#{richOrderingListBean.attributes['listHeight'].value}" listWidth="#{richOrderingListBean.attributes['listWidth'].value}" maxListHeight="#{richOrderingListBean.attributes['maxListHeight'].value}" @@ -88,26 +85,15 @@ style="#{richOrderingListBean.attributes['style'].value}" styleClass="#{richOrderingListBean.attributes['styleClass'].value}" upText="#{richOrderingListBean.attributes['upText'].value}" - upTopText="#{richOrderingListBean.attributes['upTopText'].value}" - validator="#{richOrderingListBean.attributes['validator'].value}" - validatorMessage="#{richOrderingListBean.attributes['validatorMessage'].value}" + upTopText="#{richOrderingListBean.attributes['upTopText'].value}" value="#{richOrderingListBean.capitals}" - valueChangeListener="#{richOrderingListBean.attributes['valueChangeListener'].value}" - var="#{richOrderingListBean.attributes['var'].value}" + var="capital" <f:converter converterId="capitalConverter" /> - <rich:column> - <f:facet name="header">State</f:facet> - #{capital.state} - </rich:column> - <rich:column> - <f:facet name="header">Name</f:facet> - #{capital.name} - </rich:column> </rich:orderingList> <br /> <rich:list id="output" value="#{richOrderingListBean.capitals}" var="capital"> - <h:outputText value="#{capital.state}, #{capital.name}" /> + <h:outputText value="#{capital.name}" /> </rich:list> </h:form> @@ -115,6 +101,13 @@ <ui:define name="outOfTemplateAfter"> <metamer:attributes value="#{richOrderingListBean.attributes}" id="attributes" /> + <hr /> + <p> + Following attributes are hidden: + </p> + <rich:list id="hiddenAttributes" value="#{richOrderingListBean.hiddenAttributes}" var="attribute"> + <h:outputText value="#{attribute}" /> + </rich:list> </ui:define> </ui:composition> Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richOrderingList/withColumn.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richOrderingList/withColumn.xhtml (rev 0) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richOrderingList/withColumn.xhtml 2011-08-16 12:55:42 UTC (rev 22634) @@ -0,0 +1,129 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" + xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j" + xmlns:it="http://richfaces.org/iteration"> + +<!-- +JBoss, Home of Professional Open Source +Copyright 2010-2011, Red Hat, Inc. and individual contributors +by the @authors tag. See the copyright.txt in the distribution for a +full listing of individual contributors. + +This is free software; you can redistribute it and/or modify it +under the terms of the GNU Lesser General Public License as +published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + +This software is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this software; if not, write to the Free +Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<ui:composition template="/templates/template.xhtml"> + + <ui:define name="component"> + <h:form> + <h:commandButton value="submit"> + <f:ajax execute="@form" render="orderingList output" /> + </h:commandButton> + <hr /> + <rich:orderingList columnClasses="#{richOrderingListBean.attributes['columnClasses'].value}" + columnVar="#{richOrderingListBean.attributes['columnVar'].value}" + defaultLabel="#{richOrderingListBean.attributes['defaultLabel'].value}" + disabled="#{richOrderingListBean.attributes['disabled'].value}" + disabledClass="#{richOrderingListBean.attributes['disabledClass'].value}" + downBottomText="#{richOrderingListBean.attributes['downBottomText'].value}" + downText="#{richOrderingListBean.attributes['downText'].value}" + headerClass="#{richOrderingListBean.attributes['headerClass'].value}" + id="orderingList" + immediate="#{richOrderingListBean.attributes['immediate'].value}" + itemClass="#{richOrderingListBean.attributes['itemClass'].value}" + itemLabel="#{richOrderingListBean.attributes['itemlabel'].value}" + listHeight="#{richOrderingListBean.attributes['listHeight'].value}" + listWidth="#{richOrderingListBean.attributes['listWidth'].value}" + maxListHeight="#{richOrderingListBean.attributes['maxListHeight'].value}" + minListHeight="#{richOrderingListBean.attributes['minListHeight'].value}" + onadditem="#{richOrderingListBean.attributes['onadditem'].value}" + onblur="#{richOrderingListBean.attributes['onblur'].value}" + onchange="#{richOrderingListBean.attributes['onchange'].value}" + onclick="#{richOrderingListBean.attributes['onclick'].value}" + ondblclick="#{richOrderingListBean.attributes['ondbclick'].value}" + onfocus="#{richOrderingListBean.attributes['onfocus'].value}" + onkeydown="#{richOrderingListBean.attributes['onkeydown'].value}" + onkeypress="#{richOrderingListBean.attributes['onkeypress'].value}" + onkeyup="#{richOrderingListBean.attributes['onkeyup'].value}" + onlistclick="#{richOrderingListBean.attributes['onlistclick'].value}" + onlistdblclick="#{richOrderingListBean.attributes['onlistdblclick'].value}" + onlistkeydown="#{richOrderingListBean.attributes['onlistkeydown'].value}" + onlistkeypress="#{richOrderingListBean.attributes['onlistkeypress'].value}" + onlistkeyup="#{richOrderingListBean.attributes['onlistkeyup'].value}" + onlistmousedown="#{richOrderingListBean.attributes['onlistmousedown'].value}" + onlistmousemove="#{richOrderingListBean.attributes['onlistmousemove'].value}" + onlistmouseout="#{richOrderingListBean.attributes['onlistmouseout'].value}" + onlistmouseover="#{richOrderingListBean.attributes['onlistmouseover'].value}" + onlistmouseup="#{richOrderingListBean.attributes['onlistmouseup'].value}" + onmousedown="#{richOrderingListBean.attributes['onmousedown'].value}" + onmousemove="#{richOrderingListBean.attributes['onmousemove'].value}" + onmouseout="#{richOrderingListBean.attributes['onmouseout'].value}" + onmouseover="#{richOrderingListBean.attributes['onmouseover'].value}" + onmouseup="#{richOrderingListBean.attributes['onmouseup'].value}" + onremoveitem="#{richOrderingListBean.attributes['onremoveitem'].value}" + rendered="#{richOrderingListBean.attributes['rendered'].value}" + required="#{richOrderingListBean.attributes['required'].value}" + requiredMessage="#{richOrderingListBean.attributes['requiredMessage'].value}" + selectItemClass="#{richOrderingListBean.attributes['selectItemClass'].value}" + showButton="#{richOrderingListBean.attributes['showButton'].value}" + style="#{richOrderingListBean.attributes['style'].value}" + styleClass="#{richOrderingListBean.attributes['styleClass'].value}" + upText="#{richOrderingListBean.attributes['upText'].value}" + upTopText="#{richOrderingListBean.attributes['upTopText'].value}" + value="#{richOrderingListBean.capitals}" + > + <f:converter converterId="capitalConverter" /> + <rich:column> + <f:facet name="header">State</f:facet> + #{capital.state} + </rich:column> + <rich:column> + <f:facet name="header">Name</f:facet> + #{capital.name} + </rich:column> + </rich:orderingList> + <hr /> + <rich:list id="output" value="#{richOrderingListBean.capitals}" var="capital"> + <h:outputText value="#{capital.state}, #{capital.name}" /> + </rich:list> + <hr /> + <p> + Following attributes are <strong>not used</strong>: + </p> + <ul> + <li>itemValue</li> + <li>itemValues</li> + <li>var</li> + </ul> + </h:form> + + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <metamer:attributes value="#{richOrderingListBean.attributes}" id="attributes" /> + <hr /> + <p> + Following attributes are hidden: + </p> + <rich:list id="hiddenAttributes" value="#{richOrderingListBean.hiddenAttributes}" var="attribute"> + <h:outputText value="#{attribute}" /> + </rich:list> + </ui:define> + +</ui:composition> +</html> \ No newline at end of file Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingList.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingList.java 2011-08-16 12:24:43 UTC (rev 22633) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingList.java 2011-08-16 12:55:42 UTC (rev 22634) @@ -30,7 +30,7 @@ import static org.testng.Assert.assertTrue; /** - * Selenium tests for page faces/components/richOrderingList/simple.xhtml. + * Selenium tests for page faces/components/richOrderingList/withColumn.xhtml. * * It checks whether the moving is OK. * @@ -42,7 +42,7 @@ @Override public URL getTestUrl() { - return URLUtils.buildUrl(contextPath, "faces/components/richOrderingList/simple.xhtml"); + return URLUtils.buildUrl(contextPath, "faces/components/richOrderingList/withColumn.xhtml"); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListAttributes.java 2011-08-16 12:24:43 UTC (rev 22633) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListAttributes.java 2011-08-16 12:55:42 UTC (rev 22634) @@ -37,7 +37,7 @@ import static org.testng.Assert.fail; /** - * Selenium tests for page faces/components/richOrderingList/simple.xhtml. + * Selenium tests for page faces/components/richOrderingList/withColumn.xhtml. * * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a> */ @@ -45,7 +45,7 @@ @Override public URL getTestUrl() { - return URLUtils.buildUrl(contextPath, "faces/components/richOrderingList/simple.xhtml"); + return URLUtils.buildUrl(contextPath, "faces/components/richOrderingList/withColumn.xhtml"); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListMoving.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListMoving.java 2011-08-16 12:24:43 UTC (rev 22633) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListMoving.java 2011-08-16 12:55:42 UTC (rev 22634) @@ -27,7 +27,7 @@ import org.testng.annotations.Test; /** - * Selenium tests for page faces/components/richOrderingList/simple.xhtml. + * Selenium tests for page faces/components/richOrderingList/withColumn.xhtml. * * It checks whether the moving is OK. * @@ -37,7 +37,7 @@ @Override public URL getTestUrl() { - return URLUtils.buildUrl(contextPath, "faces/components/richOrderingList/simple.xhtml"); + return URLUtils.buildUrl(contextPath, "faces/components/richOrderingList/withColumn.xhtml"); } @Test