July 2010 - richfaces-svn-commits

JBoss Rich Faces SVN: r17848 - in root/tests/metamer/trunk/src/main: java/org/richfaces/testapp/bean and 3 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-10 15:28:48 -0400 (Sat, 10 Jul 2010) New Revision: 17848 Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichPhaseListener.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandButtonBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandLinkBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/PhasesBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichBean.java root/tests/metamer/trunk/src/main/webapp/components/a4jCommandButton/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml Log: RFPL-466 * phase listener refactored * added log for action and action listener that will show up on page * added attribute limitRender to pages with a4j link and button Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichPhaseListener.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichPhaseListener.java 2010-07-10 19:28:04 UTC (rev 17847) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichPhaseListener.java 2010-07-10 19:28:48 UTC (rev 17848) @@ -59,8 +59,8 @@ FacesContext ctx = event.getFacesContext(); ExpressionFactory factory = ctx.getApplication().getExpressionFactory(); ValueExpression exp = factory.createValueExpression(ctx.getELContext(), "#{phasesBean.phases}", List.class); - List<PhaseEvent> phases = (List<PhaseEvent>) exp.getValue(ctx.getELContext()); - phases.add(event); + List<String> phases = (List<String>) exp.getValue(ctx.getELContext()); + phases.add(event.getPhaseId().toString()); } /** Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandButtonBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandButtonBean.java 2010-07-10 19:28:04 UTC (rev 17847) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandButtonBean.java 2010-07-10 19:28:48 UTC (rev 17848) @@ -134,7 +134,8 @@ * @return null since no navigation should be performed */ public String first6CharsAction() { - logger.info("action invoked"); + RichBean.logToPage("action invoked"); + if (input == null) { return ""; } else { @@ -150,6 +151,8 @@ * @return null since no navigation should be performed */ public String doubleStringAction() { + RichBean.logToPage("action invoked"); + if (input == null) { input2 = ""; } else { @@ -165,6 +168,8 @@ * @return null since no navigation should be performed */ public String toUpperCaseAction() { + RichBean.logToPage("action invoked"); + if (input == null) { return ""; } else { @@ -180,6 +185,8 @@ * an event representing the activation of a user interface component (not used) */ public void first6CharsActionListener(ActionEvent event) { + RichBean.logToPage("action listener invoked"); + if (input == null) { input3 = ""; } else { @@ -195,6 +202,8 @@ * an event representing the activation of a user interface component (not used) */ public void doubleStringActionListener(ActionEvent event) { + RichBean.logToPage("action listener invoked"); + if (input == null) { input3 = ""; } else { @@ -209,11 +218,12 @@ * an event representing the activation of a user interface component (not used) */ public void toUpperCaseActionListener(ActionEvent event) { + RichBean.logToPage("action listener invoked"); + if (input == null) { input3 = ""; } else { input3 = input.toUpperCase(); } } - } Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandLinkBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandLinkBean.java 2010-07-10 19:28:04 UTC (rev 17847) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandLinkBean.java 2010-07-10 19:28:48 UTC (rev 17848) @@ -134,6 +134,8 @@ * @return null since no navigation should be performed */ public String first6CharsAction() { + RichBean.logToPage("action invoked"); + if (input == null) { return ""; } else { @@ -149,6 +151,8 @@ * @return null since no navigation should be performed */ public String doubleStringAction() { + RichBean.logToPage("action invoked"); + if (input == null) { input2 = ""; } else { @@ -164,6 +168,8 @@ * @return null since no navigation should be performed */ public String toUpperCaseAction() { + RichBean.logToPage("action invoked"); + if (input == null) { return ""; } else { @@ -179,6 +185,8 @@ * an event representing the activation of a user interface component (not used) */ public void first6CharsActionListener(ActionEvent event) { + RichBean.logToPage("action listener invoked"); + if (input == null) { input3 = ""; } else { @@ -194,6 +202,8 @@ * an event representing the activation of a user interface component (not used) */ public void doubleStringActionListener(ActionEvent event) { + RichBean.logToPage("action listener invoked"); + if (input == null) { input3 = ""; } else { @@ -208,6 +218,8 @@ * an event representing the activation of a user interface component (not used) */ public void toUpperCaseActionListener(ActionEvent event) { + RichBean.logToPage("action listener invoked"); + if (input == null) { input3 = ""; } else { Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/PhasesBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/PhasesBean.java 2010-07-10 19:28:04 UTC (rev 17847) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/PhasesBean.java 2010-07-10 19:28:48 UTC (rev 17848) @@ -29,7 +29,6 @@ import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.RequestScoped; -import javax.faces.event.PhaseEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +44,7 @@ public class PhasesBean { private static Logger logger; - private List<PhaseEvent> phases; + private List<String> phases; /** * Initializes the managed bean. @@ -54,14 +53,14 @@ public void init() { logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - phases = new ArrayList<PhaseEvent>(); + phases = new ArrayList<String>(); } - public List<PhaseEvent> getPhases() { + public List<String> getPhases() { return phases; } - public void setPhases(List<PhaseEvent> phases) { + public void setPhases(List<String> phases) { this.phases = phases; } Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichBean.java 2010-07-10 19:28:04 UTC (rev 17847) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichBean.java 2010-07-10 19:28:48 UTC (rev 17848) @@ -30,6 +30,8 @@ import java.util.TreeMap; import javax.annotation.PostConstruct; +import javax.el.ExpressionFactory; +import javax.el.ValueExpression; import javax.faces.bean.ManagedBean; import javax.faces.bean.SessionScoped; import javax.faces.context.FacesContext; @@ -259,4 +261,12 @@ throw new IllegalStateException(); } + + public static void logToPage(String msg) { + FacesContext ctx = FacesContext.getCurrentInstance(); + ExpressionFactory factory = ctx.getApplication().getExpressionFactory(); + ValueExpression exp = factory.createValueExpression(ctx.getELContext(), "#{phasesBean.phases}", List.class); + List<String> phases = (List<String>) exp.getValue(ctx.getELContext()); + phases.add(msg); + } } Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jCommandButton/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jCommandButton/simple.xhtml 2010-07-10 19:28:04 UTC (rev 17847) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jCommandButton/simple.xhtml 2010-07-10 19:28:48 UTC (rev 17848) @@ -29,6 +29,7 @@ bypassUpdates="#{a4jButtonBean.attributes['bypassUpdates']}" disabled="#{a4jButtonBean.attributes['disabled']}" immediate="#{a4jButtonBean.attributes['immediate']}" + limitRender="#{a4jButtonBean.attributes['limitRender']}" onclick="#{a4jButtonBean.attributes['onclick']}" ondblclick="#{a4jButtonBean.attributes['ondblclick']}" onkeydown="#{a4jButtonBean.attributes['onkeydown']}" Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml 2010-07-10 19:28:04 UTC (rev 17847) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml 2010-07-10 19:28:48 UTC (rev 17848) @@ -29,6 +29,7 @@ bypassUpdates="#{a4jLinkBean.attributes['bypassUpdates']}" disabled="#{a4jLinkBean.attributes['disabled']}" immediate="#{a4jLinkBean.attributes['immediate']}" + limitRender="#{a4jLinkBean.attributes['limitRender']}" onclick="#{a4jLinkBean.attributes['onclick']}" ondblclick="#{a4jLinkBean.attributes['ondblclick']}" onkeydown="#{a4jLinkBean.attributes['onkeydown']}" Modified: root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml 2010-07-10 19:28:04 UTC (rev 17847) +++ root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml 2010-07-10 19:28:48 UTC (rev 17848) @@ -65,13 +65,13 @@ </h:panelGrid> <h:panelGrid columns="1"> - <a4j:outputPanel layout="block" ajaxRendered="true"> + <a4j:outputPanel id="phasesPanel" layout="block" ajaxRendered="true"> <h:outputText id="requestTime" value="#{phasesBean.date}"> <f:convertDateTime pattern="HH:mm:ss.SSS"/> </h:outputText> <ul> <a4j:repeat value="#{phasesBean.phases}" var="phase"> - <li>#{phase.phaseId}</li> + <li>#{phase}</li> </a4j:repeat> </ul> </a4j:outputPanel>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17847 - in root/tests/metamer/trunk/src/main: java/org/richfaces/testapp/bean and 4 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-10 15:28:04 -0400 (Sat, 10 Jul 2010) New Revision: 17847 Added: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/PhasesBean.java Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichPhaseListener.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesList.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/TemplateBean.java root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jCommandButton/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml Log: RFPL-466 * listener changed so that JSF lifecycle phases can be tracked on the page * added attribute bypassUpdates to a4j:commandButton and a4j:commandLink's page * page for selectManyCheckbox fixed * header modified to display JSF lifecycle phases * class TemplatesList reimplemented in order to make it much simpler Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichPhaseListener.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichPhaseListener.java 2010-07-10 19:27:02 UTC (rev 17846) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichPhaseListener.java 2010-07-10 19:28:04 UTC (rev 17847) @@ -19,9 +19,12 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *******************************************************************************/ - package org.richfaces.testapp; +import java.util.List; +import javax.el.ExpressionFactory; +import javax.el.ValueExpression; +import javax.faces.context.FacesContext; import javax.faces.event.PhaseEvent; import javax.faces.event.PhaseId; @@ -52,6 +55,12 @@ */ public void beforePhase(PhaseEvent event) { logger.debug("BEFORE - " + event.getPhaseId()); + + FacesContext ctx = event.getFacesContext(); + ExpressionFactory factory = ctx.getApplication().getExpressionFactory(); + ValueExpression exp = factory.createValueExpression(ctx.getELContext(), "#{phasesBean.phases}", List.class); + List<PhaseEvent> phases = (List<PhaseEvent>) exp.getValue(ctx.getELContext()); + phases.add(event); } /** @@ -60,4 +69,4 @@ public PhaseId getPhaseId() { return PhaseId.ANY_PHASE; } -} \ No newline at end of file +} Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesList.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesList.java 2010-07-10 19:27:02 UTC (rev 17846) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesList.java 2010-07-10 19:28:04 UTC (rev 17847) @@ -22,155 +22,76 @@ package org.richfaces.testapp; import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** + * An implementation of list for storing templates. This list ensures that the last item + * in list is always template "plain". * - * * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ -public class TemplatesList implements List<Template> { +public class TemplatesList extends ArrayList<Template> { - private List<Template> templates; private Logger logger; public TemplatesList() { logger = LoggerFactory.getLogger(TemplatesList.class); - templates = new ArrayList<Template>(); - templates.add(Template.PLAIN); + super.add(Template.PLAIN); } + @Override public boolean add(Template e) { if (e == Template.PLAIN) { return false; } - templates.add(templates.size() - 1, e); + super.add(super.size() - 1, e); return true; } + @Override public void add(int index, Template element) { - templates.add(index, element); + super.add(index, element); // remove the rest of list if plain is set if (element == Template.PLAIN) { - while (templates.size() > index + 1) { - templates.remove(index + 1); + while (super.size() > index + 1) { + super.remove(index + 1); } } } - public boolean addAll(Collection<? extends Template> c) { - return templates.addAll(c); - } - - public boolean addAll(int index, Collection<? extends Template> c) { - return templates.addAll(index, c); - } - - public void clear() { - templates.clear(); - } - - public boolean contains(Object o) { - return templates.contains(o); - } - - public boolean containsAll(Collection<?> c) { - return templates.containsAll(c); - } - - public Template get(int index) { - return templates.get(index); - } - - public int indexOf(Object o) { - return templates.indexOf(o); - } - - public boolean isEmpty() { - return templates.isEmpty(); - } - - public Iterator<Template> iterator() { - return templates.iterator(); - } - - public int lastIndexOf(Object o) { - return templates.lastIndexOf(o); - } - - public ListIterator<Template> listIterator() { - return templates.listIterator(); - } - - public ListIterator<Template> listIterator(int index) { - return templates.listIterator(index); - } - - public boolean remove(Object o) { - return templates.remove(o); - } - - public Template remove(int index) { - return templates.remove(index); - } - - public boolean removeAll(Collection<?> c) { - return templates.removeAll(c); - } - - public boolean retainAll(Collection<?> c) { - return templates.retainAll(c); - } - + @Override public Template set(int index, Template element) { - Template old = templates.set(index, element); + Template old = super.set(index, element); // remove the rest of list if plain is set if (element == Template.PLAIN) { - while (templates.size() > index + 1) { - templates.remove(index + 1); + while (super.size() > index + 1) { + super.remove(index + 1); } } else { - if (index == templates.size() - 1) { - templates.add(Template.PLAIN); + if (index == super.size() - 1) { + super.add(Template.PLAIN); } } return old; } - public int size() { - return templates.size(); - } - - public List<Template> subList(int fromIndex, int toIndex) { - return templates.subList(fromIndex, toIndex); - } - - public Object[] toArray() { - return templates.toArray(); - } - - public <T> T[] toArray(T[] a) { - return templates.toArray(a); - } - + @Override public String toString() { StringBuilder sb = new StringBuilder(); - for (Template t : templates) { - sb.append(t.toString()); + + for (int i = 0; i < size(); i++) { + sb.append(get(i).toString()); sb.append(","); } + return sb.toString(); } -} \ No newline at end of file +} Copied: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/PhasesBean.java (from rev 17846, root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichPhaseListener.java) =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/PhasesBean.java (rev 0) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/PhasesBean.java 2010-07-10 19:28:04 UTC (rev 17847) @@ -0,0 +1,71 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010, 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. + *******************************************************************************/ + +package org.richfaces.testapp.bean; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.annotation.PostConstruct; +import javax.faces.bean.ManagedBean; +import javax.faces.bean.RequestScoped; +import javax.faces.event.PhaseEvent; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Managed bean for storing information about invoked phases of JSF lifecycle. + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +@ManagedBean(name = "phasesBean") +@RequestScoped +public class PhasesBean { + + private static Logger logger; + private List<PhaseEvent> phases; + + /** + * Initializes the managed bean. + */ + @PostConstruct + public void init() { + logger = LoggerFactory.getLogger(getClass()); + logger.debug("initializing bean " + getClass().getName()); + phases = new ArrayList<PhaseEvent>(); + } + + public List<PhaseEvent> getPhases() { + return phases; + } + + public void setPhases(List<PhaseEvent> phases) { + this.phases = phases; + } + + public Date getDate() { + return new Date(); + } +} Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/TemplateBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/TemplateBean.java 2010-07-10 19:27:02 UTC (rev 17846) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/TemplateBean.java 2010-07-10 19:28:04 UTC (rev 17847) @@ -59,12 +59,20 @@ /** * @return the templates */ - public TemplatesList getTemplates() { + public ArrayList<Template> getTemplates() { return templates; } - public void setTemplates(TemplatesList templates) { - this.templates = templates; + public void setTemplates(ArrayList<Template> templates) { + if (templates instanceof TemplatesList) { + this.templates = (TemplatesList) templates; + return; + } + + this.templates = new TemplatesList(); + for (Template t : templates) { + this.templates.add(t); + } } public List<SelectItem> getAvailableTemplates() { Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml 2010-07-10 19:27:02 UTC (rev 17846) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml 2010-07-10 19:28:04 UTC (rev 17847) @@ -24,14 +24,24 @@ <f:selectItem itemValue="Ferrari" itemLabel="Ferrari"/> <f:selectItem itemValue="Lexus" itemLabel="Lexus"/> <f:selectItem itemValue="BMW" itemLabel="BMW"/> - - - <a4j:ajax id="a4jAjaxxx" + + <a4j:ajax id="a4jAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates']}" + data="#{a4jAjaxBean.attributes['data']}" + disabled="#{a4jAjaxBean.attributes['disabled']}" event="change" - execute="@form" - render="output" - + execute="#{a4jAjaxBean.attributes['execute']}" + immediate="#{a4jAjaxBean.attributes['immediate']}" + limitRender="#{a4jAjaxBean.attributes['limitRender']}" + onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate']}" + onbegin="#{a4jAjaxBean.attributes['onbegin']}" + oncomplete="#{a4jAjaxBean.attributes['oncomplete']}" + onerror="#{a4jAjaxBean.attributes['onerror']}" + onevent="#{a4jAjaxBean.attributes['onevent']}" + queueId="#{a4jAjaxBean.attributes['queueId']}" + render="#{a4jAjaxBean.attributes['render']}" + status="#{a4jAjaxBean.attributes['status']}" /> + </h:selectManyCheckbox> <br/> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jCommandButton/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jCommandButton/simple.xhtml 2010-07-10 19:27:02 UTC (rev 17846) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jCommandButton/simple.xhtml 2010-07-10 19:28:04 UTC (rev 17847) @@ -26,6 +26,7 @@ <a4j:commandButton id="a4jCommandButton" action="#{a4jButtonBean.attributes.action}" actionListener="#{a4jButtonBean.attributes.actionListener}" + bypassUpdates="#{a4jButtonBean.attributes['bypassUpdates']}" disabled="#{a4jButtonBean.attributes['disabled']}" immediate="#{a4jButtonBean.attributes['immediate']}" onclick="#{a4jButtonBean.attributes['onclick']}" Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml 2010-07-10 19:27:02 UTC (rev 17846) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml 2010-07-10 19:28:04 UTC (rev 17847) @@ -26,6 +26,7 @@ <a4j:commandLink id="a4jCommandLink" action="#{a4jLinkBean.attributes.action}" actionListener="#{a4jLinkBean.attributes.actionListener}" + bypassUpdates="#{a4jLinkBean.attributes['bypassUpdates']}" disabled="#{a4jLinkBean.attributes['disabled']}" immediate="#{a4jLinkBean.attributes['immediate']}" onclick="#{a4jLinkBean.attributes['onclick']}" Modified: root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml 2010-07-10 19:27:02 UTC (rev 17846) +++ root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml 2010-07-10 19:28:04 UTC (rev 17847) @@ -2,13 +2,13 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core"> - <h:panelGrid id="headerTable" columns="6" border="1" styleClass="external-table" columnClasses="header-column, header-column, header-column, header-column, header-column, header-column"> + <h:panelGrid id="headerTable" columns="7" border="1" styleClass="external-table" columnClasses="header-column, header-column, header-column, header-column, header-column, header-column, header-column"> <h:panelGrid columns="3"> - <h:link outcome="/index"><h:graphicImage library="images" name="home.png" title="Go Home" style="width: 36px;"/></h:link> - <h:link outcome="list"><h:graphicImage library="images" name="back.png" title="Go to List of Pages" style="width: 36px;"/></h:link> - <h:graphicImage library="images" name="refresh.png" title="Rerender All" style="width: 36px;"> - <a4j:ajax event="click" render="commonGrid"/> + <h:link id="goHomeLink" outcome="/index"><h:graphicImage id="goHomeImage" library="images" name="home.png" title="Go Home" style="width: 36px;"/></h:link> + <h:link id="goToListLink" outcome="list"><h:graphicImage id="goToListImage" library="images" name="back.png" title="Go to List of Pages" style="width: 36px;"/></h:link> + <h:graphicImage id="reRenderAllImage" library="images" name="refresh.png" title="Rerender All" style="width: 36px;"> + <a4j:ajax id="reRenderAllAjax" event="click" render="commonGrid"/> </h:graphicImage> </h:panelGrid> @@ -50,7 +50,7 @@ <h:panelGrid id="templatesSelector" columns="1"> <h:outputText id="templateSelectMenuLabel" value="Template:" /> - <ui:repeat var="var" value="#{templateBean.templates}" varStatus="status"> + <ui:repeat id="templates" var="var" value="#{templateBean.templates}" varStatus="status"> <h:selectOneMenu value="#{templateBean.templates[status.index]}" id="templateSelect" style="width: 150px;"> <f:selectItems value="#{templateBean.availableTemplates}" /> @@ -65,8 +65,23 @@ </h:panelGrid> <h:panelGrid columns="1"> - <h:commandButton action="#{richBean.invalidateSession}" value="Invalidate Session" image="#{resource['images:cancel.png']}" style="width: 36px;"/> + <a4j:outputPanel layout="block" ajaxRendered="true"> + <h:outputText id="requestTime" value="#{phasesBean.date}"> + <f:convertDateTime pattern="HH:mm:ss.SSS"/> + </h:outputText> + <ul> + <a4j:repeat value="#{phasesBean.phases}" var="phase"> + <li>#{phase.phaseId}</li> + </a4j:repeat> + </ul> + </a4j:outputPanel> </h:panelGrid> + + <h:panelGrid columns="1"> + <h:commandButton id="invalidateSessionButton" action="#{richBean.invalidateSession}" value="Invalidate Session" image="#{resource['images:cancel.png']}" title="Invalidate Session" style="width: 36px;"/> + </h:panelGrid> + + </h:panelGrid> </ui:composition> \ No newline at end of file

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17846 - root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-10 15:27:02 -0400 (Sat, 10 Jul 2010) New Revision: 17846 Modified: root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JOutputPanelBean.properties Log: RFPL-466 * added options for attribute dir of a4j:outputPanel Modified: root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JOutputPanelBean.properties =================================================================== --- root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JOutputPanelBean.properties 2010-07-10 19:26:34 UTC (rev 17845) +++ root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JOutputPanelBean.properties 2010-07-10 19:27:02 UTC (rev 17846) @@ -1,3 +1,7 @@ +attr.dir.ltr=ltr +attr.dir.rtl=rtl +attr.dir.none= + attr.layout.block=block attr.layout.inline=inline attr.layout.none=none

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17845 - in root/tests/metamer/trunk/src/main: webapp/components/richExtendedDataTable and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-10 15:26:34 -0400 (Sat, 10 Jul 2010) New Revision: 17845 Added: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/filtering.xhtml root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/sorting.xhtml Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichExtendedDataTableBean.java root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/list.xhtml Log: RFPL-466 * added sorting and filtering to extended data table Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichExtendedDataTableBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichExtendedDataTableBean.java 2010-07-10 19:25:55 UTC (rev 17844) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichExtendedDataTableBean.java 2010-07-10 19:26:34 UTC (rev 17845) @@ -29,11 +29,14 @@ import javax.faces.bean.ManagedBean; import javax.faces.bean.SessionScoped; +import javax.swing.SortOrder; import org.ajax4jsf.model.DataComponentState; import org.richfaces.component.UIExtendedDataTable; import org.richfaces.event.SortingEvent; +import org.richfaces.model.Filter; import org.richfaces.testapp.Attributes; +import org.richfaces.testapp.model.Employee; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +56,17 @@ private DataComponentState dataTableState; private Map<Object, Integer> stateMap = new HashMap<Object, Integer>(); private int page = 1; + // true = model, false = empty table private boolean state = true; + + // sorting + private SortOrder capitalsOrder = SortOrder.UNSORTED; + private SortOrder statesOrder = SortOrder.UNSORTED; + + // filtering + private String sexFilter; + private String nameFilter; + private String titleFilter; /** * Initializes the managed bean. @@ -140,6 +153,77 @@ this.state = state; } + public SortOrder getCapitalsOrder() { + return capitalsOrder; + } + + public void setCapitalsOrder(SortOrder capitalsOrder) { + this.capitalsOrder = capitalsOrder; + } + + public SortOrder getStatesOrder() { + return statesOrder; + } + + public void setStatesOrder(SortOrder statesOrder) { + this.statesOrder = statesOrder; + } + + public String getSexFilter() { + return sexFilter; + } + + public void setSexFilter(String sexFilter) { + this.sexFilter = sexFilter; + } + + public String getNameFilter() { + return nameFilter; + } + + public void setNameFilter(String nameFilter) { + this.nameFilter = nameFilter; + } + + public String getTitleFilter() { + return titleFilter; + } + + public void setTitleFilter(String titleFilter) { + this.titleFilter = titleFilter; + } + + public void sortByCapitals() { + statesOrder = SortOrder.UNSORTED; + if (capitalsOrder.equals(SortOrder.ASCENDING)) { + setCapitalsOrder(SortOrder.DESCENDING); + } else { + setCapitalsOrder(SortOrder.ASCENDING); + } + } + + public void sortByStates() { + capitalsOrder = SortOrder.UNSORTED; + if (statesOrder.equals(SortOrder.ASCENDING)) { + setStatesOrder(SortOrder.DESCENDING); + } else { + setStatesOrder(SortOrder.ASCENDING); + } + } + + public Filter<?> getFilterSexImpl() { + return new Filter<Employee>() { + + public boolean accept(Employee e) { + String sex = getSexFilter(); + if (sex == null || sex.length() == 0 || sex.equalsIgnoreCase("all") || sex.equalsIgnoreCase(e.getSex().toString())) { + return true; + } + return false; + } + }; + } + public void sortingListener(SortingEvent event) { System.out.println(event.getSortOrder()); } Added: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/filtering.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/filtering.xhtml (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2010-07-10 19:26:34 UTC (rev 17845) @@ -0,0 +1,178 @@ + + +<!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:a4j="http://richfaces.org/a4j" + xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:rich="http://richfaces.org/rich" + xmlns:fn="http://java.sun.com/jsp/jstl/functions"> + + <ui:composition template="/templates/template.xhtml"> + + <ui:define name="head"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + <h:outputStylesheet library="css" name="richDataTable.css"/> + </ui:define> + + <ui:define name="outOfTemplateBefore"> + <br/> + <h:outputText value="Show data in table: " /> + <h:selectBooleanCheckbox value="#{richExtendedDataTableBean.state}"> + <a4j:ajax render="richDataTable scroller1"/> + </h:selectBooleanCheckbox> + <br/><br/> + <rich:dataScroller id="scroller1" for="richDataTable" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richDataTable"/> + </ui:define> + + <ui:define name="component"> + <rich:extendedDataTable id="richDataTable" + filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" + filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" + first="#{richExtendedDataTableBean.attributes['first']}" + iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" + iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" + noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" + relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" + rendered="#{richExtendedDataTableBean.attributes['rendered']}" + rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" + rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" + rowData="#{richExtendedDataTableBean.attributes['rowData']}" + rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" + rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" + rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" + rows="#{richExtendedDataTableBean.attributes['rows']}" + sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" + sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" + sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" + value="#{richExtendedDataTableBean.state ? model.employees : null}" + var="record" + > + + <f:facet name="noData"> + <h:outputText value="There is no data." style="color: red;"/> + </f:facet> + + <rich:column id="columnSex" filter="#{richExtendedDataTableBean.filterSexImpl}"> + <f:facet name="header"> + <h:panelGroup> + <h:outputText id="columnHeaderSex" value="Sex" /> + <br/> + <h:outputText id="columnHeaderSexType" value="(filter)" /> + <br/> + <h:selectOneMenu id="columnHeaderSexInput" value="#{richExtendedDataTableBean.sexFilter}" > + <f:selectItem itemValue="ALL" itemLabel="all"/> + <f:selectItem itemValue="FEMALE" itemLabel="female"/> + <f:selectItem itemValue="MALE" itemLabel="male"/> + <a4j:ajax id="columnHeaderSexAjax" render="commonGrid" execute="@this" event="change"/> + </h:selectOneMenu> + </h:panelGroup> + </f:facet> + + <h:graphicImage library="images" name="#{record.sex == 'MALE' ? 'male.png' : 'female.png'}" /> + + <f:facet name="footer"> + <h:outputText id="columnFooterSex" value="Sex" /> + </f:facet> + </rich:column> + + + <rich:column id="columnName" filterValue="#{richExtendedDataTableBean.nameFilter}" filterExpression="#{fn:containsIgnoreCase(record.name, richDataTableBean.nameFilter)}"> + <f:facet name="header"> + <h:outputText id="columnHeaderName" value="Name" /> + <br/> + <h:outputText id="columnHeaderNameType" value="(expression contains ignore case)" /> + <br/> + <h:inputText id="columnHeaderNameInput" value="#{richExtendedDataTableBean.nameFilter}"> + <a4j:ajax id="columnHeaderNameAjax" render="commonGrid" execute="@this" event="change"/> + </h:inputText> + </f:facet> + + <h:outputText value="#{record.name}" /> + <f:facet name="footer"> + <h:outputText id="columnFooterState" value="Name" /> + </f:facet> + </rich:column> + + <rich:column id="columnTitle" filterValue="#{richExtendedDataTableBean.titleFilter}" filterExpression="#{richExtendedDataTableBean.titleFilter == null || richDataTableBean.titleFilter == '' || record.title == richDataTableBean.titleFilter}"> + <f:facet name="header"> + <h:outputText id="columnHeaderTitle" value="Title" /> + <br/> + <h:outputText id="columnHeaderTitleType" value="(expression equals)" /> + <br/> + <h:inputText id="columnHeaderTitleInput" value="#{richExtendedDataTableBean.titleFilter}"> + <a4j:ajax id="columnHeaderTitleAjax" render="commonGrid" execute="@this" event="change"/> + </h:inputText> + </f:facet> + + <h:outputText value="#{record.title}" /> + <f:facet name="footer"> + <h:outputText id="columnFooterTitle" value="Title" /> + </f:facet> + </rich:column> + + <rich:column id="columnNumberOfKids"> + <f:facet name="header"> + <h:outputText id="columnHeaderNumberOfKids" value="Number of Kids" /> + <br/> + <h:outputText id="columnHeaderNumberOfKidsType" value="(expression >=)" /> + <br/> + <h:inputText id="columnHeaderNumberOfKidsInput" value="TODO inputNumberSpinner"/> + </f:facet> + + <h:outputText value="#{record.numberOfKids}" /> + <f:facet name="footer"> + <h:outputText id="columnFooterNumberOfKids" value="Number of Kids" /> + </f:facet> + </rich:column> + + <rich:column id="columnNumberOfKids2"> + <f:facet name="header"> + <h:outputText id="columnHeaderNumberOfKids2" value="Number of Kids" /> + <br/> + <h:outputText id="columnHeaderNumberOfKids2Type" value="(expression <)" /> + <br/> + <h:inputText id="columnHeaderNumberOfKids2Input" value="TODO inputNumberSlider"/> + </f:facet> + + <h:outputText value="#{record.numberOfKids}" /> + <f:facet name="footer"> + <h:outputText id="columnFooterNumberOfKids2" value="Number of Kids" /> + </f:facet> + </rich:column> + + <f:facet name="footer"> + <rich:dataScroller id="scroller2" for="richDataTable" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richDataTable" /> + </f:facet> + </rich:extendedDataTable> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <ta:attributes value="#{richExtendedDataTableBean.attributes}" id="attributes" /> + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/list.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/list.xhtml 2010-07-10 19:25:55 UTC (rev 17844) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/list.xhtml 2010-07-10 19:26:34 UTC (rev 17845) @@ -46,5 +46,10 @@ <div class="description">Page that contains <b>rich:extendedDataTable</b> (with model containing employees) and input boxes for all its attributes. <span style="color: red">TODO will be used with various types of input and command components as soon as available</span></div> + <h:link outcome="sorting" value="Table Sorting" styleClass="link"/> + <div class="description">Page that contains sortable <b>rich:extendedDataTable</b> (with model containing capitals) and input boxes for all its attributes.</div> + + <h:link outcome="filtering" value="Table filtering" styleClass="link"/> + <div class="description">Page that contains filterable <b>rich:extendedDataTable</b> (with model containing capitals) and input boxes for all its attributes.</div> </h:body> </html> \ No newline at end of file Added: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/sorting.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/sorting.xhtml (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/sorting.xhtml 2010-07-10 19:26:34 UTC (rev 17845) @@ -0,0 +1,125 @@ + + +<!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:a4j="http://richfaces.org/a4j" + xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:rich="http://richfaces.org/rich"> + + <ui:composition template="/templates/template.xhtml"> + + <ui:define name="head"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + <h:outputStylesheet library="css" name="richDataTable.css"/> + </ui:define> + + <ui:define name="outOfTemplateBefore"> + <br/> + <h:outputText value="Show data in table: " /> + <h:selectBooleanCheckbox value="#{richExtendedDataTableBean.state}"> + <a4j:ajax render="richDataTable scroller1"/> + </h:selectBooleanCheckbox> + <br/><br/> + <rich:dataScroller id="scroller1" for="table" page="#{richExtendedDataTableBean.page}" maxPages="7" render="table"/> + </ui:define> + + <ui:define name="component"> + + <rich:extendedDataTable id="table" + filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" + filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" + first="#{richExtendedDataTableBean.attributes['first']}" + iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" + iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" + noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" + relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" + rendered="#{richExtendedDataTableBean.attributes['rendered']}" + rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" + rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" + rowData="#{richExtendedDataTableBean.attributes['rowData']}" + rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" + rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" + rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" + rows="#{richExtendedDataTableBean.attributes['rows']}" + sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" + sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" + sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" + value="#{richExtendedDataTableBean.state ? model.capitals : null}" + var="record" + > + + <f:facet name="noData"> + <h:outputText value="There is no data." style="color: red;"/> + </f:facet> + + <rich:column id="columnState" sortBy="#{record.state}" sortOrder="#{richExtendedDataTableBean.statesOrder}"> + <f:facet name="header"> + <a4j:commandLink id="columnHeaderState" value="State" render="table" action="#{richExtendedDataTableBean.sortByStates}"/> + </f:facet> + + <h:outputText value="#{record.state}" /> + <f:facet name="footer"> + <h:outputText id="columnFooterState" value="State" /> + </f:facet> + </rich:column> + + <rich:column id="columnCapital" sortBy="#{record.name}" sortOrder="#{richExtendedDataTableBean.capitalsOrder}" sortingListeners="#{richExtendedDataTableBean.sortingListener}"> + <f:facet name="header"> + <a4j:commandLink id="columnHeaderCapital" value="Capital" render="table" action="#{richExtendedDataTableBean.sortByCapitals}"/> + </f:facet> + + <h:outputText value="#{record.name}" /> + <f:facet name="footer"> + <h:outputText id="columnFooterCapital" value="Capital" /> + </f:facet> + </rich:column> + + <f:facet name="footer"> + <rich:dataScroller id="scroller2" for="table" page="#{richExtendedDataTableBean.page}" maxPages="7" render="table" /> + </f:facet> + + </rich:extendedDataTable> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <h:commandButton value="sort state"> + <rich:componentControl event="click" target="table" operation="sort"/> + </h:commandButton> + + <h:commandButton value="sort capital"> + <rich:componentControl event="click" target="table" operation="sort"> + <f:param value="columnCapital" /> + </rich:componentControl> + </h:commandButton> + + <br/><br/> + + <ta:attributes value="#{richExtendedDataTableBean.attributes}" id="attributes" /> + </ui:define> + + </ui:composition> +</html> \ No newline at end of file

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17844 - in root/tests/metamer/trunk/src/main: webapp/components/richDataTable and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-10 15:25:55 -0400 (Sat, 10 Jul 2010) New Revision: 17844 Added: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/filtering.xhtml root/tests/metamer/trunk/src/main/webapp/components/richDataTable/sorting.xhtml Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichDataTableBean.java root/tests/metamer/trunk/src/main/webapp/components/richDataTable/list.xhtml root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml Log: RFPL-466 * added sorting and filtering features to rich:dataTable * fixed header (button for rerendering) Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichDataTableBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichDataTableBean.java 2010-07-10 19:22:56 UTC (rev 17843) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichDataTableBean.java 2010-07-10 19:25:55 UTC (rev 17844) @@ -19,7 +19,6 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *******************************************************************************/ - package org.richfaces.testapp.bean; import java.io.Serializable; @@ -30,11 +29,14 @@ import javax.faces.bean.ManagedBean; import javax.faces.bean.SessionScoped; +import javax.swing.SortOrder; import org.ajax4jsf.model.DataComponentState; import org.richfaces.component.UIDataTable; import org.richfaces.event.SortingEvent; +import org.richfaces.model.Filter; import org.richfaces.testapp.Attributes; +import org.richfaces.testapp.model.Employee; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,8 +56,18 @@ private DataComponentState dataTableState; private Map<Object, Integer> stateMap = new HashMap<Object, Integer>(); private int page = 1; + // true = model, false = empty table private boolean state = true; + // sorting + private SortOrder capitalsOrder = SortOrder.UNSORTED; + private SortOrder statesOrder = SortOrder.UNSORTED; + + // filtering + private String sexFilter; + private String nameFilter; + private String titleFilter; + /** * Initializes the managed bean. */ @@ -67,7 +79,7 @@ attributes = Attributes.getUIComponentAttributes(UIDataTable.class, getClass()); attributes.put("rendered", true); attributes.put("rows", 10); - + // TODO these must be tested in other way attributes.remove("componentState"); attributes.remove("rowKeyVar"); @@ -122,11 +134,82 @@ this.state = state; } + public Date getDate() { + return new Date(); + } + + public SortOrder getCapitalsOrder() { + return capitalsOrder; + } + + public void setCapitalsOrder(SortOrder capitalsOrder) { + this.capitalsOrder = capitalsOrder; + } + + public SortOrder getStatesOrder() { + return statesOrder; + } + + public void setStatesOrder(SortOrder statesOrder) { + this.statesOrder = statesOrder; + } + + public String getSexFilter() { + return sexFilter; + } + + public void setSexFilter(String sexFilter) { + this.sexFilter = sexFilter; + } + + public String getNameFilter() { + return nameFilter; + } + + public void setNameFilter(String nameFilter) { + this.nameFilter = nameFilter; + } + + public String getTitleFilter() { + return titleFilter; + } + + public void setTitleFilter(String titleFilter) { + this.titleFilter = titleFilter; + } + + public void sortByCapitals() { + statesOrder = SortOrder.UNSORTED; + if (capitalsOrder.equals(SortOrder.ASCENDING)) { + setCapitalsOrder(SortOrder.DESCENDING); + } else { + setCapitalsOrder(SortOrder.ASCENDING); + } + } + + public void sortByStates() { + capitalsOrder = SortOrder.UNSORTED; + if (statesOrder.equals(SortOrder.ASCENDING)) { + setStatesOrder(SortOrder.DESCENDING); + } else { + setStatesOrder(SortOrder.ASCENDING); + } + } + + public Filter<?> getFilterSexImpl() { + return new Filter<Employee>() { + + public boolean accept(Employee e) { + String sex = getSexFilter(); + if (sex == null || sex.length() == 0 || sex.equalsIgnoreCase("all") || sex.equalsIgnoreCase(e.getSex().toString())) { + return true; + } + return false; + } + }; + } + public void sortingListener(SortingEvent event) { System.out.println(event.getSortOrder()); } - - public Date getDate() { - return new Date(); - } } Added: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/filtering.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/filtering.xhtml (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/filtering.xhtml 2010-07-10 19:25:55 UTC (rev 17844) @@ -0,0 +1,178 @@ + + +<!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:a4j="http://richfaces.org/a4j" + xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:rich="http://richfaces.org/rich" + xmlns:fn="http://java.sun.com/jsp/jstl/functions"> + + <ui:composition template="/templates/template.xhtml"> + + <ui:define name="head"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + <h:outputStylesheet library="css" name="richDataTable.css"/> + </ui:define> + + <ui:define name="outOfTemplateBefore"> + <br/> + <h:outputText value="Show data in table: " /> + <h:selectBooleanCheckbox value="#{richDataTableBean.state}"> + <a4j:ajax render="richDataTable scroller1"/> + </h:selectBooleanCheckbox> + <br/><br/> + <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable"/> + </ui:define> + + <ui:define name="component"> + <rich:dataTable id="richDataTable" + filterVar="#{richDataTableBean.attributes['filterVar']}" + filteringListeners="#{richDataTableBean.attributes['filteringListeners']}" + first="#{richDataTableBean.attributes['first']}" + iterationState="#{richDataTableBean.attributes['iterationState']}" + iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar']}" + keepSaved="#{richDataTableBean.attributes['keepSaved']}" + noDataLabel="#{richDataTableBean.attributes['noDataLabel']}" + relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex']}" + rendered="#{richDataTableBean.attributes['rendered']}" + rowAvailable="#{richDataTableBean.attributes['rowAvailable']}" + rowCount="#{richDataTableBean.attributes['rowCount']}" + rowData="#{richDataTableBean.attributes['rowData']}" + rowIndex="#{richDataTableBean.attributes['rowIndex']}" + rowKey="#{richDataTableBean.attributes['rowKey']}" + rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter']}" + rows="#{richDataTableBean.attributes['rows']}" + sortMode="#{richDataTableBean.attributes['sortMode']}" + sortPriority="#{richDataTableBean.attributes['sortPriority']}" + sortingListeners="#{richDataTableBean.attributes['sortingListeners']}" + value="#{richDataTableBean.state ? model.employees : null}" + var="record" + > + + <f:facet name="noData"> + <h:outputText value="There is no data." style="color: red;"/> + </f:facet> + + <rich:column id="columnSex" filter="#{richDataTableBean.filterSexImpl}"> + <f:facet name="header"> + <h:panelGroup> + <h:outputText id="columnHeaderSex" value="Sex" /> + <br/> + <h:outputText id="columnHeaderSexType" value="(filter)" /> + <br/> + <h:selectOneMenu id="columnHeaderSexInput" value="#{richDataTableBean.sexFilter}" > + <f:selectItem itemValue="ALL" itemLabel="all"/> + <f:selectItem itemValue="FEMALE" itemLabel="female"/> + <f:selectItem itemValue="MALE" itemLabel="male"/> + <a4j:ajax id="columnHeaderSexAjax" render="commonGrid" execute="@this" event="change"/> + </h:selectOneMenu> + </h:panelGroup> + </f:facet> + + <h:graphicImage library="images" name="#{record.sex == 'MALE' ? 'male.png' : 'female.png'}" /> + + <f:facet name="footer"> + <h:outputText id="columnFooterSex" value="Sex" /> + </f:facet> + </rich:column> + + + <rich:column id="columnName" filterValue="#{richDataTableBean.nameFilter}" filterExpression="#{fn:containsIgnoreCase(record.name, richDataTableBean.nameFilter)}"> + <f:facet name="header"> + <h:outputText id="columnHeaderName" value="Name" /> + <br/> + <h:outputText id="columnHeaderNameType" value="(expression contains ignore case)" /> + <br/> + <h:inputText id="columnHeaderNameInput" value="#{richDataTableBean.nameFilter}"> + <a4j:ajax id="columnHeaderNameAjax" render="commonGrid" execute="@this" event="change"/> + </h:inputText> + </f:facet> + + <h:outputText value="#{record.name}" /> + <f:facet name="footer"> + <h:outputText id="columnFooterState" value="Name" /> + </f:facet> + </rich:column> + + <rich:column id="columnTitle" filterValue="#{richDataTableBean.titleFilter}" filterExpression="#{richDataTableBean.titleFilter == null || richDataTableBean.titleFilter == '' || record.title == richDataTableBean.titleFilter}"> + <f:facet name="header"> + <h:outputText id="columnHeaderTitle" value="Title" /> + <br/> + <h:outputText id="columnHeaderTitleType" value="(expression equals)" /> + <br/> + <h:inputText id="columnHeaderTitleInput" value="#{richDataTableBean.titleFilter}"> + <a4j:ajax id="columnHeaderTitleAjax" render="commonGrid" execute="@this" event="change"/> + </h:inputText> + </f:facet> + + <h:outputText value="#{record.title}" /> + <f:facet name="footer"> + <h:outputText id="columnFooterTitle" value="Title" /> + </f:facet> + </rich:column> + + <rich:column id="columnNumberOfKids"> + <f:facet name="header"> + <h:outputText id="columnHeaderNumberOfKids" value="Number of Kids" /> + <br/> + <h:outputText id="columnHeaderNumberOfKidsType" value="(expression >=)" /> + <br/> + <h:inputText id="columnHeaderNumberOfKidsInput" value="TODO inputNumberSpinner"/> + </f:facet> + + <h:outputText value="#{record.numberOfKids}" /> + <f:facet name="footer"> + <h:outputText id="columnFooterNumberOfKids" value="Number of Kids" /> + </f:facet> + </rich:column> + + <rich:column id="columnNumberOfKids2"> + <f:facet name="header"> + <h:outputText id="columnHeaderNumberOfKids2" value="Number of Kids" /> + <br/> + <h:outputText id="columnHeaderNumberOfKids2Type" value="(expression <)" /> + <br/> + <h:inputText id="columnHeaderNumberOfKids2Input" value="TODO inputNumberSlider"/> + </f:facet> + + <h:outputText value="#{record.numberOfKids}" /> + <f:facet name="footer"> + <h:outputText id="columnFooterNumberOfKids2" value="Number of Kids" /> + </f:facet> + </rich:column> + + <f:facet name="footer"> + <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable" /> + </f:facet> + </rich:dataTable> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <ta:attributes value="#{richDataTableBean.attributes}" id="attributes" /> + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/list.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/list.xhtml 2010-07-10 19:22:56 UTC (rev 17843) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/list.xhtml 2010-07-10 19:25:55 UTC (rev 17844) @@ -46,5 +46,10 @@ <div class="description">Page that contains <b>rich:dataTable</b> (with model containing employees) and input boxes for all its attributes. <span style="color: red">TODO will be used with various types of input and command components as soon as available</span></div> + <h:link outcome="sorting" value="Table Sorting" styleClass="link"/> + <div class="description">Page that contains sortable <b>rich:dataTable</b> (with model containing capitals) and input boxes for all its attributes.</div> + + <h:link outcome="filtering" value="Table filtering" styleClass="link"/> + <div class="description">Page that contains filterable <b>rich:dataTable</b> (with model containing capitals) and input boxes for all its attributes.</div> </h:body> </html> \ No newline at end of file Added: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/sorting.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/sorting.xhtml (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/sorting.xhtml 2010-07-10 19:25:55 UTC (rev 17844) @@ -0,0 +1,125 @@ + + +<!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:a4j="http://richfaces.org/a4j" + xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:rich="http://richfaces.org/rich"> + + <ui:composition template="/templates/template.xhtml"> + + <ui:define name="head"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + <h:outputStylesheet library="css" name="richDataTable.css"/> + </ui:define> + + <ui:define name="outOfTemplateBefore"> + <br/> + <h:outputText value="Show data in table: " /> + <h:selectBooleanCheckbox value="#{richDataTableBean.state}"> + <a4j:ajax render="richDataTable scroller1"/> + </h:selectBooleanCheckbox> + <br/><br/> + <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable"/> + </ui:define> + + <ui:define name="component"> + + <rich:dataTable id="richDataTable" + filterVar="#{richDataTableBean.attributes['filterVar']}" + filteringListeners="#{richDataTableBean.attributes['filteringListeners']}" + first="#{richDataTableBean.attributes['first']}" + iterationState="#{richDataTableBean.attributes['iterationState']}" + iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar']}" + keepSaved="#{richDataTableBean.attributes['keepSaved']}" + noDataLabel="#{richDataTableBean.attributes['noDataLabel']}" + relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex']}" + rendered="#{richDataTableBean.attributes['rendered']}" + rowAvailable="#{richDataTableBean.attributes['rowAvailable']}" + rowCount="#{richDataTableBean.attributes['rowCount']}" + rowData="#{richDataTableBean.attributes['rowData']}" + rowIndex="#{richDataTableBean.attributes['rowIndex']}" + rowKey="#{richDataTableBean.attributes['rowKey']}" + rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter']}" + rows="#{richDataTableBean.attributes['rows']}" + sortMode="#{richDataTableBean.attributes['sortMode']}" + sortPriority="#{richDataTableBean.attributes['sortPriority']}" + sortingListeners="#{richDataTableBean.attributes['sortingListeners']}" + value="#{richDataTableBean.state ? model.capitals : null}" + var="record" + > + + <f:facet name="noData"> + <h:outputText value="There is no data." style="color: red;"/> + </f:facet> + + <rich:column id="columnState" sortBy="#{record.state}" sortOrder="#{richDataTableBean.statesOrder}"> + <f:facet name="header"> + <a4j:commandLink id="columnHeaderState" value="State" render="richDataTable" action="#{richDataTableBean.sortByStates}"/> + </f:facet> + + <h:outputText value="#{record.state}" /> + <f:facet name="footer"> + <h:outputText id="columnFooterState" value="State" /> + </f:facet> + </rich:column> + + <rich:column id="columnCapital" sortBy="#{record.name}" sortOrder="#{richDataTableBean.capitalsOrder}" sortingListeners="#{richDataTableBean.sortingListener}"> + <f:facet name="header"> + <a4j:commandLink id="columnHeaderCapital" value="Capital" render="richDataTable" action="#{richDataTableBean.sortByCapitals}"/> + </f:facet> + + <h:outputText value="#{record.name}" /> + <f:facet name="footer"> + <h:outputText id="columnFooterCapital" value="Capital" /> + </f:facet> + </rich:column> + + <f:facet name="footer"> + <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable" /> + </f:facet> + + </rich:dataTable> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <h:commandButton value="sort state"> + <rich:componentControl event="click" target="richDataTable" operation="sort"/> + </h:commandButton> + + <h:commandButton value="sort capital"> + <rich:componentControl event="click" target="richDataTable" operation="sort"> + <f:param value="columnCapital" /> + </rich:componentControl> + </h:commandButton> + + <br/><br/> + + <ta:attributes value="#{richDataTableBean.attributes}" id="attributes" /> + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml 2010-07-10 19:22:56 UTC (rev 17843) +++ root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml 2010-07-10 19:25:55 UTC (rev 17844) @@ -8,7 +8,7 @@ <h:link outcome="/index"><h:graphicImage library="images" name="home.png" title="Go Home" style="width: 36px;"/></h:link> <h:link outcome="list"><h:graphicImage library="images" name="back.png" title="Go to List of Pages" style="width: 36px;"/></h:link> <h:graphicImage library="images" name="refresh.png" title="Rerender All" style="width: 36px;"> - <a4j:ajax event="click" render="commondGrid"/> + <a4j:ajax event="click" render="commonGrid"/> </h:graphicImage> </h:panelGrid>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17843 - in root/tests/metamer/trunk: src/main/webapp/components/richDataScroller and 3 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-10 15:22:56 -0400 (Sat, 10 Jul 2010) New Revision: 17843 Modified: root/tests/metamer/trunk/pom.xml root/tests/metamer/trunk/src/main/webapp/components/richDataScroller/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml Log: RFPL-466 * all pages with iteration components (DT, EDT, Data Scroller) refactored because of changed components' namespace * pom.xml cleaned up Modified: root/tests/metamer/trunk/pom.xml =================================================================== --- root/tests/metamer/trunk/pom.xml 2010-07-10 19:22:14 UTC (rev 17842) +++ root/tests/metamer/trunk/pom.xml 2010-07-10 19:22:56 UTC (rev 17843) @@ -62,20 +62,6 @@ <type>pom</type> </dependency> <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>richfaces-ui-iteration-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>richfaces-ui-misc-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> <version>${project.version}</version> @@ -94,11 +80,7 @@ <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> </dependency> - <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>richfaces-ui-iteration-ui</artifactId> - </dependency> - +  <dependency> <groupId>${jsf2.api.groupid}</groupId> @@ -114,7 +96,7 @@ <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> -  + </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataScroller/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataScroller/simple.xhtml 2010-07-10 19:22:14 UTC (rev 17842) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataScroller/simple.xhtml 2010-07-10 19:22:56 UTC (rev 17843) @@ -23,8 +23,7 @@ <!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:a4j="http://richfaces.org/a4j" - xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> @@ -45,7 +44,7 @@ <a4j:ajax render="richDataTable scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <it:dataScroller id="scroller1" + <rich:dataScroller id="scroller1" boundaryControls="#{richDataScrollerBean.attributes['boundaryControls']}" dataTable="#{richDataScrollerBean.attributes['dataTable']}" fastControls="#{richDataScrollerBean.attributes['fastControls']}" @@ -70,7 +69,7 @@ <ui:define name="component"> - <it:dataTable id="richDataTable" + <rich:dataTable id="richDataTable" rows="9" value="#{richDataScrollerBean.state ? model.capitals : null}" var="record" @@ -80,7 +79,7 @@ <h:outputText value="There is no data." style="color: red;"/> </f:facet> - <it:column id="columnState" sortBy="#{record.state}"> + <rich:column id="columnState" sortBy="#{record.state}"> <f:facet name="header"> <h:outputText id="columnHeaderState" value="State" /> </f:facet> @@ -89,9 +88,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterState" value="State" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnCapital" sortBy="#{record.name}"> + <rich:column id="columnCapital" sortBy="#{record.name}"> <f:facet name="header"> <h:outputText id="columnHeaderCapital" value="Capital" /> </f:facet> @@ -100,10 +99,10 @@ <f:facet name="footer"> <h:outputText id="columnFooterCapital" value="Capital" /> </f:facet> - </it:column> + </rich:column> <f:facet name="footer"> - <it:dataScroller id="scroller2" + <rich:dataScroller id="scroller2" boundaryControls="#{richDataScrollerBean.attributes['boundaryControls']}" dataTable="#{richDataScrollerBean.attributes['dataTable']}" fastControls="#{richDataScrollerBean.attributes['fastControls']}" @@ -126,7 +125,7 @@ /> </f:facet> - </it:dataTable> + </rich:dataTable> </ui:define> <ui:define name="outOfTemplateAfter"> Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml 2010-07-10 19:22:14 UTC (rev 17842) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml 2010-07-10 19:22:56 UTC (rev 17843) @@ -23,8 +23,7 @@ <!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:a4j="http://richfaces.org/a4j" - xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> @@ -44,12 +43,12 @@ <a4j:ajax render="richDataTable scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <it:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable"/> + <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable"/> </ui:define> <ui:define name="component"> - <it:dataTable id="richDataTable" + <rich:dataTable id="richDataTable" filterVar="#{richDataTableBean.attributes['filterVar']}" filteringListeners="#{richDataTableBean.attributes['filteringListeners']}" first="#{richDataTableBean.attributes['first']}" @@ -85,7 +84,7 @@ <h:outputText value="Header Facet" /> </f:facet> - <it:column id="columnSex" sortBy="#{record.sex}"> + <rich:column id="columnSex" sortBy="#{record.sex}"> <f:facet name="header"> <h:outputText id="columnHeaderSex" value="Sex" /> <br/> @@ -97,9 +96,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterSex" value="Sex" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnName" sortBy="#{record.name}"> + <rich:column id="columnName" sortBy="#{record.name}"> <f:facet name="header"> <h:outputText id="columnHeaderName" value="Name" /> <br/> @@ -110,9 +109,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterState" value="Name" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnTitle" sortBy="#{record.title}"> + <rich:column id="columnTitle" sortBy="#{record.title}"> <f:facet name="header"> <h:outputText id="columnHeaderTitle" value="Title" /> <br/> @@ -123,9 +122,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterTitle" value="Title" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnSmoker" sortBy="#{record.smoker}"> + <rich:column id="columnSmoker" sortBy="#{record.smoker}"> <f:facet name="header"> <h:outputText id="columnHeaderSmoker" value="Smoker" /> <br/> @@ -137,9 +136,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterSmoker" value="Smoker" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnFavoriteColor" sortBy="#{record.favoriteColor}"> + <rich:column id="columnFavoriteColor" sortBy="#{record.favoriteColor}"> <f:facet name="header"> <h:outputText id="columnHeaderFavoriteColor" value="Favorite Color" /> <br/> @@ -150,9 +149,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterFavoriteColor" value="Favorite Color" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnNumberOfKids" sortBy="#{record.numberOfKids}"> + <rich:column id="columnNumberOfKids" sortBy="#{record.numberOfKids}"> <f:facet name="header"> <h:outputText id="columnHeaderNumberOfKids" value="Number of Kids" /> <br/> @@ -163,13 +162,13 @@ <f:facet name="footer"> <h:outputText id="columnFooterNumberOfKids" value="Number of Kids" /> </f:facet> - </it:column> + </rich:column> <f:facet name="footer"> - <it:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable" /> + <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable" /> </f:facet> - </it:dataTable> + </rich:dataTable> </ui:define> <ui:define name="outOfTemplateAfter"> Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml 2010-07-10 19:22:14 UTC (rev 17842) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml 2010-07-10 19:22:56 UTC (rev 17843) @@ -23,8 +23,7 @@ <!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:a4j="http://richfaces.org/a4j" - xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> @@ -44,12 +43,12 @@ <a4j:ajax render="richDataTable scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <it:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable"/> + <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable"/> </ui:define> <ui:define name="component"> - <it:dataTable id="richDataTable" + <rich:dataTable id="richDataTable" filterVar="#{richDataTableBean.attributes['filterVar']}" filteringListeners="#{richDataTableBean.attributes['filteringListeners']}" first="#{richDataTableBean.attributes['first']}" @@ -85,7 +84,7 @@ <h:outputText value="Header Facet" /> </f:facet> - <it:column id="columnSex" sortBy="#{record.sex}"> + <rich:column id="columnSex" sortBy="#{record.sex}"> <f:facet name="header"> <h:outputText id="columnHeaderSex" value="Sex" /> <br/> @@ -96,9 +95,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterSex" value="Sex" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnName" sortBy="#{record.name}"> + <rich:column id="columnName" sortBy="#{record.name}"> <f:facet name="header"> <h:outputText id="columnHeaderName" value="Name" /> <br/> @@ -109,9 +108,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterState" value="Name" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnTitle" sortBy="#{record.title}"> + <rich:column id="columnTitle" sortBy="#{record.title}"> <f:facet name="header"> <h:outputText id="columnHeaderTitle" value="Title" /> <br/> @@ -122,9 +121,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterTitle" value="Title" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnBirthdate" sortBy="#{record.birthdate}"> + <rich:column id="columnBirthdate" sortBy="#{record.birthdate}"> <f:facet name="header"> <h:outputText id="columnHeaderBirthdate" value="Birthdate" /> <br/> @@ -135,9 +134,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterBirthdate" value="Birthdate" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnCompanies" sortBy="#{record.companies}"> + <rich:column id="columnCompanies" sortBy="#{record.companies}"> <f:facet name="header"> <h:outputText id="columnHeaderCompanies" value="Companies" /> <br/> @@ -154,9 +153,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterSmoker" value="Smoker" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnNumberOfKids" sortBy="#{record.numberOfKids}"> + <rich:column id="columnNumberOfKids" sortBy="#{record.numberOfKids}"> <f:facet name="header"> <h:outputText id="columnHeaderNumberOfKids" value="Number of Kids" /> <br/> @@ -167,13 +166,13 @@ <f:facet name="footer"> <h:outputText id="columnFooterNumberOfKids" value="Number of Kids" /> </f:facet> - </it:column> + </rich:column> <f:facet name="footer"> - <it:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable" /> + <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable" /> </f:facet> - </it:dataTable> + </rich:dataTable> </ui:define> <ui:define name="outOfTemplateAfter"> Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml 2010-07-10 19:22:14 UTC (rev 17842) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml 2010-07-10 19:22:56 UTC (rev 17843) @@ -23,8 +23,7 @@ <!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:a4j="http://richfaces.org/a4j" - xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> @@ -44,34 +43,34 @@ <a4j:ajax render="richDataTable scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <it:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable"/> + <rich:dataScroller id="scroller1" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable"/> </ui:define> <ui:define name="component"> - <it:dataTable id="richDataTable" - filterVar="#{richDataTableBean.attributes['filterVar']}" - filteringListeners="#{richDataTableBean.attributes['filteringListeners']}" - first="#{richDataTableBean.attributes['first']}" - iterationState="#{richDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richDataTableBean.attributes['rendered']}" - rowAvailable="#{richDataTableBean.attributes['rowAvailable']}" - rowCount="#{richDataTableBean.attributes['rowCount']}" - rowData="#{richDataTableBean.attributes['rowData']}" - rowIndex="#{richDataTableBean.attributes['rowIndex']}" - rowKey="#{richDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter']}" - rows="#{richDataTableBean.attributes['rows']}" - sortMode="#{richDataTableBean.attributes['sortMode']}" - sortPriority="#{richDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richDataTableBean.attributes['sortingListeners']}" - value="#{richDataTableBean.state ? model.capitals : null}" - var="record" - > + <rich:dataTable id="richDataTable" + filterVar="#{richDataTableBean.attributes['filterVar']}" + filteringListeners="#{richDataTableBean.attributes['filteringListeners']}" + first="#{richDataTableBean.attributes['first']}" + iterationState="#{richDataTableBean.attributes['iterationState']}" + iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar']}" + keepSaved="#{richDataTableBean.attributes['keepSaved']}" + noDataLabel="#{richDataTableBean.attributes['noDataLabel']}" + relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex']}" + rendered="#{richDataTableBean.attributes['rendered']}" + rowAvailable="#{richDataTableBean.attributes['rowAvailable']}" + rowCount="#{richDataTableBean.attributes['rowCount']}" + rowData="#{richDataTableBean.attributes['rowData']}" + rowIndex="#{richDataTableBean.attributes['rowIndex']}" + rowKey="#{richDataTableBean.attributes['rowKey']}" + rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter']}" + rows="#{richDataTableBean.attributes['rows']}" + sortMode="#{richDataTableBean.attributes['sortMode']}" + sortPriority="#{richDataTableBean.attributes['sortPriority']}" + sortingListeners="#{richDataTableBean.attributes['sortingListeners']}" + value="#{richDataTableBean.state ? model.capitals : null}" + var="record" + > <f:facet name="noData"> <h:outputText value="There is no data." style="color: red;"/> @@ -85,7 +84,7 @@ <h:outputText value="Header Facet" /> </f:facet> - <it:column id="columnState" sortBy="#{record.state}"> + <rich:column id="columnState" sortBy="#{record.state}"> <f:facet name="header"> <h:outputText id="columnHeaderState" value="State" /> </f:facet> @@ -94,9 +93,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterState" value="State" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnCapital" sortBy="#{record.name}"> + <rich:column id="columnCapital" sortBy="#{record.name}"> <f:facet name="header"> <h:outputText id="columnHeaderCapital" value="Capital" /> </f:facet> @@ -105,13 +104,13 @@ <f:facet name="footer"> <h:outputText id="columnFooterCapital" value="Capital" /> </f:facet> - </it:column> + </rich:column> <f:facet name="footer"> - <it:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable" /> + <rich:dataScroller id="scroller2" for="richDataTable" page="#{richDataTableBean.page}" maxPages="7" render="richDataTable" /> </f:facet> - </it:dataTable> + </rich:dataTable> </ui:define> <ui:define name="outOfTemplateAfter"> @@ -125,51 +124,56 @@ </rich:componentControl> </h:commandButton> - <br/> + <br/><br/> - scroller1: - <h:commandButton value="<< first"> - <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> - <f:param value="first" /> - </rich:componentControl> - </h:commandButton> + <fieldset> + <legend>scroller1</legend> - <h:commandButton value="< previous"> - <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="previous" /> - </h:commandButton> + <h:commandButton value="<< first"> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> + <f:param value="first" /> + </rich:componentControl> + </h:commandButton> - <h:commandButton value="next >"> - <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="next" /> - </h:commandButton> + <h:commandButton value="< previous"> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="previous" /> + </h:commandButton> - <h:commandButton value="last >>"> - <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> - <f:param value="last" /> - </rich:componentControl> - </h:commandButton> + <h:commandButton value="next >"> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="next" /> + </h:commandButton> + <h:commandButton value="last >>"> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> + <f:param value="last" /> + </rich:componentControl> + </h:commandButton> + </fieldset> + <br/> - scroller2: - <h:commandButton value="<< first"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> - <f:param value="first" /> - </rich:componentControl> - </h:commandButton> + <fieldset> + <legend>scroller2</legend> + <h:commandButton value="<< first"> + <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> + <f:param value="first" /> + </rich:componentControl> + </h:commandButton> - <h:commandButton value="< previous"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="previous" /> - </h:commandButton> + <h:commandButton value="< previous"> + <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="previous" /> + </h:commandButton> - <h:commandButton value="next >"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="next" /> - </h:commandButton> + <h:commandButton value="next >"> + <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="next" /> + </h:commandButton> - <h:commandButton value="last >>"> - <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> - <f:param value="last" /> - </rich:componentControl> - </h:commandButton> + <h:commandButton value="last >>"> + <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> + <f:param value="last" /> + </rich:componentControl> + </h:commandButton> + </fieldset> <br/><br/> Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml 2010-07-10 19:22:14 UTC (rev 17842) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml 2010-07-10 19:22:56 UTC (rev 17843) @@ -23,8 +23,7 @@ <!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:a4j="http://richfaces.org/a4j" - xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> @@ -48,7 +47,7 @@ <ui:define name="component"> - <it:dataTable id="richDataTable" + <rich:dataTable id="richDataTable" filterVar="#{richDataTableBean.attributes['filterVar']}" filteringListeners="#{richDataTableBean.attributes['filteringListeners']}" first="#{richDataTableBean.attributes['first']}" @@ -84,7 +83,7 @@ <h:outputText value="Header Facet" /> </f:facet> - <it:column id="columnState" sortBy="#{record.state}"> + <rich:column id="columnState" sortBy="#{record.state}"> <f:facet name="header"> <h:outputText id="columnHeaderState" value="State Header" /> </f:facet> @@ -93,9 +92,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterState" value="State Footer" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnCapital" sortBy="#{record.name}"> + <rich:column id="columnCapital" sortBy="#{record.name}"> <f:facet name="header"> <h:outputText id="columnHeaderCapital" value="Capital Header" /> </f:facet> @@ -104,9 +103,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterCapital" value="Capital Footer" /> </f:facet> - </it:column> + </rich:column> - </it:dataTable> + </rich:dataTable> </ui:define> <ui:define name="outOfTemplateAfter"> Modified: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2010-07-10 19:22:14 UTC (rev 17842) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2010-07-10 19:22:56 UTC (rev 17843) @@ -23,8 +23,7 @@ <!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:a4j="http://richfaces.org/a4j" - xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> @@ -44,34 +43,34 @@ <a4j:ajax render="richEDT scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <it:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT"/> + <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT"/> </ui:define> <ui:define name="component"> - <it:dataTable id="richEDT" - filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" - filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" - first="#{richExtendedDataTableBean.attributes['first']}" - iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richExtendedDataTableBean.attributes['rendered']}" - rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" - rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" - rowData="#{richExtendedDataTableBean.attributes['rowData']}" - rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" - rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" - rows="#{richExtendedDataTableBean.attributes['rows']}" - sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" - sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" - value="#{richExtendedDataTableBean.state ? model.employees : null}" - var="record" - > + <rich:extendedDataTable id="richEDT" + filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" + filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" + first="#{richExtendedDataTableBean.attributes['first']}" + iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" + iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" + noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" + relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" + rendered="#{richExtendedDataTableBean.attributes['rendered']}" + rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" + rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" + rowData="#{richExtendedDataTableBean.attributes['rowData']}" + rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" + rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" + rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" + rows="#{richExtendedDataTableBean.attributes['rows']}" + sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" + sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" + sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" + value="#{richExtendedDataTableBean.state ? model.employees : null}" + var="record" + > <f:facet name="noData"> <h:outputText value="There is no data." style="color: red;"/> @@ -85,7 +84,7 @@ <h:outputText value="Header Facet" /> </f:facet> - <it:column id="columnSex" sortBy="#{record.sex}"> + <rich:column id="columnSex" sortBy="#{record.sex}"> <f:facet name="header"> <h:outputText id="columnHeaderSex" value="Sex" /> <br/> @@ -97,9 +96,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterSex" value="Sex" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnName" sortBy="#{record.name}"> + <rich:column id="columnName" sortBy="#{record.name}"> <f:facet name="header"> <h:outputText id="columnHeaderName" value="Name" /> <br/> @@ -110,9 +109,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterState" value="Name" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnTitle" sortBy="#{record.title}"> + <rich:column id="columnTitle" sortBy="#{record.title}"> <f:facet name="header"> <h:outputText id="columnHeaderTitle" value="Title" /> <br/> @@ -123,9 +122,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterTitle" value="Title" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnSmoker" sortBy="#{record.smoker}"> + <rich:column id="columnSmoker" sortBy="#{record.smoker}"> <f:facet name="header"> <h:outputText id="columnHeaderSmoker" value="Smoker" /> <br/> @@ -137,9 +136,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterSmoker" value="Smoker" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnFavoriteColor" sortBy="#{record.favoriteColor}"> + <rich:column id="columnFavoriteColor" sortBy="#{record.favoriteColor}"> <f:facet name="header"> <h:outputText id="columnHeaderFavoriteColor" value="Favorite Color" /> <br/> @@ -150,9 +149,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterFavoriteColor" value="Favorite Color" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnNumberOfKids" sortBy="#{record.numberOfKids}"> + <rich:column id="columnNumberOfKids" sortBy="#{record.numberOfKids}"> <f:facet name="header"> <h:outputText id="columnHeaderNumberOfKids" value="Number of Kids" /> <br/> @@ -163,13 +162,13 @@ <f:facet name="footer"> <h:outputText id="columnFooterNumberOfKids" value="Number of Kids" /> </f:facet> - </it:column> + </rich:column> <f:facet name="footer"> - <it:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT" /> + <rich:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT" /> </f:facet> - </it:dataTable> + </rich:extendedDataTable> </ui:define> <ui:define name="outOfTemplateAfter"> Modified: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-07-10 19:22:14 UTC (rev 17842) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-07-10 19:22:56 UTC (rev 17843) @@ -23,8 +23,7 @@ <!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:a4j="http://richfaces.org/a4j" - xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> @@ -44,34 +43,34 @@ <a4j:ajax render="richEDT scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <it:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT"/> + <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT"/> </ui:define> <ui:define name="component"> - <it:dataTable id="richEDT" - filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" - filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" - first="#{richExtendedDataTableBean.attributes['first']}" - iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richExtendedDataTableBean.attributes['rendered']}" - rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" - rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" - rowData="#{richExtendedDataTableBean.attributes['rowData']}" - rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" - rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" - rows="#{richExtendedDataTableBean.attributes['rows']}" - sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" - sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" - value="#{richExtendedDataTableBean.state ? model.employees : null}" - var="record" - > + <rich:extendedDataTable id="richEDT" + filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" + filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" + first="#{richExtendedDataTableBean.attributes['first']}" + iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" + iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" + noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" + relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" + rendered="#{richExtendedDataTableBean.attributes['rendered']}" + rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" + rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" + rowData="#{richExtendedDataTableBean.attributes['rowData']}" + rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" + rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" + rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" + rows="#{richExtendedDataTableBean.attributes['rows']}" + sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" + sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" + sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" + value="#{richExtendedDataTableBean.state ? model.employees : null}" + var="record" + > <f:facet name="noData"> <h:outputText value="There is no data." style="color: red;"/> @@ -85,7 +84,7 @@ <h:outputText value="Header Facet" /> </f:facet> - <it:column id="columnSex" sortBy="#{record.sex}"> + <rich:column id="columnSex" sortBy="#{record.sex}"> <f:facet name="header"> <h:outputText id="columnHeaderSex" value="Sex" /> <br/> @@ -96,9 +95,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterSex" value="Sex" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnName" sortBy="#{record.name}"> + <rich:column id="columnName" sortBy="#{record.name}"> <f:facet name="header"> <h:outputText id="columnHeaderName" value="Name" /> <br/> @@ -109,9 +108,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterState" value="Name" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnTitle" sortBy="#{record.title}"> + <rich:column id="columnTitle" sortBy="#{record.title}"> <f:facet name="header"> <h:outputText id="columnHeaderTitle" value="Title" /> <br/> @@ -122,9 +121,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterTitle" value="Title" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnBirthdate" sortBy="#{record.birthdate}"> + <rich:column id="columnBirthdate" sortBy="#{record.birthdate}"> <f:facet name="header"> <h:outputText id="columnHeaderBirthdate" value="Birthdate" /> <br/> @@ -135,9 +134,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterBirthdate" value="Birthdate" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnCompanies" sortBy="#{record.companies}"> + <rich:column id="columnCompanies" sortBy="#{record.companies}"> <f:facet name="header"> <h:outputText id="columnHeaderCompanies" value="Companies" /> <br/> @@ -154,9 +153,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterSmoker" value="Smoker" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnNumberOfKids" sortBy="#{record.numberOfKids}"> + <rich:column id="columnNumberOfKids" sortBy="#{record.numberOfKids}"> <f:facet name="header"> <h:outputText id="columnHeaderNumberOfKids" value="Number of Kids" /> <br/> @@ -167,13 +166,13 @@ <f:facet name="footer"> <h:outputText id="columnFooterNumberOfKids" value="Number of Kids" /> </f:facet> - </it:column> + </rich:column> <f:facet name="footer"> - <it:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT" /> + <rich:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT" /> </f:facet> - </it:dataTable> + </rich:extendedDataTable> </ui:define> <ui:define name="outOfTemplateAfter"> Modified: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2010-07-10 19:22:14 UTC (rev 17842) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2010-07-10 19:22:56 UTC (rev 17843) @@ -23,8 +23,7 @@ <!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:a4j="http://richfaces.org/a4j" - xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> @@ -44,34 +43,34 @@ <a4j:ajax render="richEDT scroller1"/> </h:selectBooleanCheckbox> <br/><br/> - <it:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT"/> + <rich:dataScroller id="scroller1" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT"/> </ui:define> <ui:define name="component"> - <it:dataTable id="richEDT" - filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" - filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" - first="#{richExtendedDataTableBean.attributes['first']}" - iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richExtendedDataTableBean.attributes['rendered']}" - rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" - rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" - rowData="#{richExtendedDataTableBean.attributes['rowData']}" - rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" - rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" - rows="#{richExtendedDataTableBean.attributes['rows']}" - sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" - sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" - value="#{richExtendedDataTableBean.state ? model.capitals : null}" - var="record" - > + <rich:extendedDataTable id="richEDT" + filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" + filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" + first="#{richExtendedDataTableBean.attributes['first']}" + iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" + iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" + noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" + relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" + rendered="#{richExtendedDataTableBean.attributes['rendered']}" + rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" + rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" + rowData="#{richExtendedDataTableBean.attributes['rowData']}" + rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" + rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" + rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" + rows="#{richExtendedDataTableBean.attributes['rows']}" + sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" + sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" + sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" + value="#{richExtendedDataTableBean.state ? model.capitals : null}" + var="record" + > <f:facet name="noData"> <h:outputText value="There is no data." style="color: red;"/> @@ -85,7 +84,7 @@ <h:outputText value="Header Facet" /> </f:facet> - <it:column id="columnState" sortBy="#{record.state}"> + <rich:column id="columnState" sortBy="#{record.state}"> <f:facet name="header"> <h:outputText id="columnHeaderState" value="State" /> </f:facet> @@ -94,9 +93,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterState" value="State" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnCapital" sortBy="#{record.name}"> + <rich:column id="columnCapital" sortBy="#{record.name}"> <f:facet name="header"> <h:outputText id="columnHeaderCapital" value="Capital" /> </f:facet> @@ -105,13 +104,13 @@ <f:facet name="footer"> <h:outputText id="columnFooterCapital" value="Capital" /> </f:facet> - </it:column> + </rich:column> <f:facet name="footer"> - <it:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT" /> + <rich:dataScroller id="scroller2" for="richEDT" page="#{richExtendedDataTableBean.page}" maxPages="7" render="richEDT" /> </f:facet> - </it:dataTable> + </rich:extendedDataTable> </ui:define> <ui:define name="outOfTemplateAfter"> Modified: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2010-07-10 19:22:14 UTC (rev 17842) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2010-07-10 19:22:56 UTC (rev 17843) @@ -23,8 +23,7 @@ <!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:a4j="http://richfaces.org/a4j" - xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> @@ -48,36 +47,34 @@ <ui:define name="component"> - <it:extendedDataTable id="richEDT" - clientFirst="#{richExtendedDataTableBean.attributes['clientFirst']}" - clientRows="#{richExtendedDataTableBean.attributes['clientRows']}" - filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" - filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" - first="#{richExtendedDataTableBean.attributes['first']}" - iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richExtendedDataTableBean.attributes['rendered']}" - rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" - rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" - rowData="#{richExtendedDataTableBean.attributes['rowData']}" - rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" - rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" - rows="#{richExtendedDataTableBean.attributes['rows']}" - sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" - sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" - style="#{richExtendedDataTableBean.attributes['style']}" - styleClass="#{richExtendedDataTableBean.attributes['styleClass']}" - value="#{richExtendedDataTableBean.state ? model.capitals : null}" - var="record" + <rich:extendedDataTable id="richEDT" + clientFirst="#{richExtendedDataTableBean.attributes['clientFirst']}" + clientRows="#{richExtendedDataTableBean.attributes['clientRows']}" + filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" + filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" + first="#{richExtendedDataTableBean.attributes['first']}" + iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" + iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" + noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" + relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" + rendered="#{richExtendedDataTableBean.attributes['rendered']}" + rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" + rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" + rowData="#{richExtendedDataTableBean.attributes['rowData']}" + rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" + rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" + rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" + rows="#{richExtendedDataTableBean.attributes['rows']}" + sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" + sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" + sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" + style="#{richExtendedDataTableBean.attributes['style']}" + styleClass="#{richExtendedDataTableBean.attributes['styleClass']}" + value="#{richExtendedDataTableBean.state ? model.capitals : null}" + var="record" + > - - > - <f:facet name="noData"> <h:outputText value="There is no data." style="color: red;"/> </f:facet> @@ -90,7 +87,7 @@ <h:outputText value="Header Facet" /> </f:facet> - <it:column id="columnState" sortBy="#{record.state}"> + <rich:column id="columnState" sortBy="#{record.state}"> <f:facet name="header"> <h:outputText id="columnHeaderState" value="State Header" /> </f:facet> @@ -99,9 +96,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterState" value="State Footer" /> </f:facet> - </it:column> + </rich:column> - <it:column id="columnCapital" sortBy="#{record.name}"> + <rich:column id="columnCapital" sortBy="#{record.name}"> <f:facet name="header"> <h:outputText id="columnHeaderCapital" value="Capital Header" /> </f:facet> @@ -110,9 +107,9 @@ <f:facet name="footer"> <h:outputText id="columnFooterCapital" value="Capital Footer" /> </f:facet> - </it:column> + </rich:column> - </it:extendedDataTable> + </rich:extendedDataTable> </ui:define> <ui:define name="outOfTemplateAfter"> Modified: root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml 2010-07-10 19:22:14 UTC (rev 17842) +++ root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml 2010-07-10 19:22:56 UTC (rev 17843) @@ -5,9 +5,9 @@ <h:panelGrid id="headerTable" columns="6" border="1" styleClass="external-table" columnClasses="header-column, header-column, header-column, header-column, header-column, header-column"> <h:panelGrid columns="3"> - <h:link outcome="/index"><h:graphicImage library="images" name="home.png" title="Go Home" style="width: 48px;"/></h:link> - <h:link outcome="list"><h:graphicImage library="images" name="back.png" title="Go to List of Pages" style="width: 48px;"/></h:link> - <h:graphicImage library="images" name="refresh.png" title="Rerender All" style="width: 48px;"> + <h:link outcome="/index"><h:graphicImage library="images" name="home.png" title="Go Home" style="width: 36px;"/></h:link> + <h:link outcome="list"><h:graphicImage library="images" name="back.png" title="Go to List of Pages" style="width: 36px;"/></h:link> + <h:graphicImage library="images" name="refresh.png" title="Rerender All" style="width: 36px;"> <a4j:ajax event="click" render="commondGrid"/> </h:graphicImage> </h:panelGrid> @@ -65,7 +65,7 @@ </h:panelGrid> <h:panelGrid columns="1"> - <h:commandButton action="#{richBean.invalidateSession}" value="Invalidate Session" image="#{resource['images:cancel.png']}" style="width: 48px;"/> + <h:commandButton action="#{richBean.invalidateSession}" value="Invalidate Session" image="#{resource['images:cancel.png']}" style="width: 36px;"/> </h:panelGrid> </h:panelGrid>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17841 - in root/tests/metamer/trunk: src/main/java/org/richfaces/testapp/bean and 4 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-10 15:20:37 -0400 (Sat, 10 Jul 2010) New Revision: 17841 Modified: root/tests/metamer/trunk/pom.xml root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPollBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPushBean.java root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JPollBean.properties root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JPushBean.properties root/tests/metamer/trunk/src/main/webapp/components/a4jPoll/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jPush/simple.xhtml root/tests/metamer/trunk/src/main/webapp/resources/testapp/attributes.xhtml Log: RFPL-466 * attributes modified to submit form on change instead of on blur * minor modifications of a4j:poll & a4j:push pages in order to make testing easier Modified: root/tests/metamer/trunk/pom.xml =================================================================== --- root/tests/metamer/trunk/pom.xml 2010-07-10 19:19:42 UTC (rev 17840) +++ root/tests/metamer/trunk/pom.xml 2010-07-10 19:20:37 UTC (rev 17841) @@ -114,7 +114,7 @@ <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> - <dependency> +  <dependency> <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPollBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPollBean.java 2010-07-10 19:19:42 UTC (rev 17840) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPollBean.java 2010-07-10 19:20:37 UTC (rev 17841) @@ -61,7 +61,7 @@ attributes.put("rendered", true); attributes.put("interval", 5000); attributes.put("action", "increaseCounterAction"); - attributes.put("actionListener", "increaseCounter3ActionListener"); + attributes.put("actionListener", "increaseCounterActionListener"); } /** @@ -105,12 +105,12 @@ return null; } - public void increaseCounter3ActionListener(ActionEvent event) { - counter += 3; + public void increaseCounterActionListener(ActionEvent event) { + counter++; } - public void decreaseCounter3ActionListener(ActionEvent event) { - counter -= 3; + public void decreaseCounterActionListener(ActionEvent event) { + counter--; } } Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPushBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPushBean.java 2010-07-10 19:19:42 UTC (rev 17840) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPushBean.java 2010-07-10 19:20:37 UTC (rev 17841) @@ -19,10 +19,10 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *******************************************************************************/ + package org.richfaces.testapp.bean; import java.io.Serializable; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.EventListener; import java.util.EventObject; @@ -53,7 +53,6 @@ private Attributes attributes; private int counter = 0; private transient volatile PushEventListener listener; - private String formattedDate = null; /** * Initializes the managed bean. @@ -66,7 +65,7 @@ attributes = Attributes.getUIComponentAttributes(UIPush.class, getClass()); attributes.put("interval", 1000); attributes.put("action", "increaseCounterAction"); - attributes.put("actionListener", "increaseCounter3ActionListener"); + attributes.put("actionListener", "increaseCounterActionListener"); attributes.put("rendered", true); attributes.put("enabled", true); @@ -115,20 +114,16 @@ return null; } - public void increaseCounter3ActionListener(ActionEvent event) { - counter += 3; + public void increaseCounterActionListener(ActionEvent event) { + counter++; } - public void decreaseCounter3ActionListener(ActionEvent event) { - counter -= 3; + public void decreaseCounterActionListener(ActionEvent event) { + counter--; } - public String getDateString() { - if (formattedDate == null) { - formattedDate = new SimpleDateFormat("HH:mm:ss SSSS").format(new Date()); - } - - return formattedDate; + public Date getDate() { + return new Date(); } } Modified: root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JPollBean.properties =================================================================== --- root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JPollBean.properties 2010-07-10 19:19:42 UTC (rev 17840) +++ root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JPollBean.properties 2010-07-10 19:20:37 UTC (rev 17841) @@ -1,5 +1,7 @@ attr.action.increaseCounterAction=increaseCounterAction attr.action.decreaseCounterAction=decreaseCounterAction +attr.action.none= -attr.actionListener.increaseCounter3ActionListener=increaseCounter3ActionListener -attr.actionListener.decreaseCounter3ActionListener=decreaseCounter3ActionListener \ No newline at end of file +attr.actionListener.increaseCounterActionListener=increaseCounterActionListener +attr.actionListener.decreaseCounterActionListener=decreaseCounterActionListener +attr.actionListener.none= \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JPushBean.properties =================================================================== --- root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JPushBean.properties 2010-07-10 19:19:42 UTC (rev 17840) +++ root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JPushBean.properties 2010-07-10 19:20:37 UTC (rev 17841) @@ -1,5 +1,7 @@ attr.action.increaseCounterAction=increaseCounterAction attr.action.decreaseCounterAction=decreaseCounterAction +attr.action.none= -attr.actionListener.increaseCounter3ActionListener=increaseCounter3ActionListener -attr.actionListener.decreaseCounter3ActionListener=decreaseCounter3ActionListener \ No newline at end of file +attr.actionListener.increaseCounterActionListener=increaseCounterActionListener +attr.actionListener.decreaseCounterActionListener=decreaseCounterActionListener +attr.actionListener.none= \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jPoll/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jPoll/simple.xhtml 2010-07-10 19:19:42 UTC (rev 17840) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jPoll/simple.xhtml 2010-07-10 19:20:37 UTC (rev 17841) @@ -38,7 +38,9 @@ </h:panelGroup> <h:panelGroup id="time"> - #{a4jPollBean.date} *** #{a4jPollBean.counter} + <h:outputText id="outputDate" value="#{a4jPollBean.date}"/> + *** + <h:outputText id="outputCounter" value="#{a4jPollBean.counter}"/> </h:panelGroup> </ui:define> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jPush/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jPush/simple.xhtml 2010-07-10 19:19:42 UTC (rev 17840) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jPush/simple.xhtml 2010-07-10 19:20:37 UTC (rev 17841) @@ -18,9 +18,11 @@ </ui:define> <ui:define name="component"> - <h:panelGrid columns="2"> - Time: <h:panelGroup id="time">#{a4jPushBean.dateString} * #{a4jPushBean.counter}</h:panelGroup> - </h:panelGrid> + + <h:outputText id="outputDate" value="#{a4jPushBean.date}"/> + *** + <h:outputText id="outputCounter" value="#{a4jPushBean.counter}"/> + <a4j:push id="push" action="#{a4jPushBean.attributes.action}" actionListener="#{a4jPushBean.attributes.actionListener}" @@ -37,11 +39,13 @@ rendered="#{a4jPushBean.attributes['rendered']}" value="#{a4jPushBean.attributes['value']}" > - <f:ajax render="#{'form:time'}" /> + <a4j:ajax render="outputDate, outputCounter" /> <f:param name="testParam" value="testValue" /> <f:param name="testParam1" value="testValue1" /> </a4j:push> + <br/> + <h:commandLink value="Generate push event" action="#{a4jPushBean.generateEvent}"> <f:ajax render="@none" /> </h:commandLink> Modified: root/tests/metamer/trunk/src/main/webapp/resources/testapp/attributes.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/resources/testapp/attributes.xhtml 2010-07-10 19:19:42 UTC (rev 17840) +++ root/tests/metamer/trunk/src/main/webapp/resources/testapp/attributes.xhtml 2010-07-10 19:20:37 UTC (rev 17841) @@ -40,7 +40,7 @@ </c:when> <c:otherwise> - <h:inputText id="#{entry.key}Input" value="#{cc.attrs.value[entry.key]}" style="width: 200px;" onblur="submit()" /> + <h:inputText id="#{entry.key}Input" value="#{cc.attrs.value[entry.key]}" style="width: 200px;" onchange="submit()" /> </c:otherwise> </c:choose>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17840 - root/tests/metamer/trunk/src/main/java/org/richfaces/testapp.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-10 15:19:42 -0400 (Sat, 10 Jul 2010) New Revision: 17840 Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplateNameConverter.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesList.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesListConverter.java Log: removed @Override from methods declared by interfaces Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplateNameConverter.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplateNameConverter.java 2010-07-10 19:14:38 UTC (rev 17839) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplateNameConverter.java 2010-07-10 19:19:42 UTC (rev 17840) @@ -30,7 +30,7 @@ /** * Converter used for view parameter "template". - * + * * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ @@ -40,7 +40,6 @@ /** * {@inheritDoc} */ - @Override public Object getAsObject(FacesContext context, UIComponent component, String value) { try { return Template.valueOf(value.toUpperCase()); @@ -52,16 +51,15 @@ /** * {@inheritDoc} */ - @Override public String getAsString(FacesContext context, UIComponent component, Object value) { if (value instanceof String) { return (String) value; } - + if (value instanceof Template) { return ((Template) value).toString(); } - + throw new FacesException("Cannot convert parameter \"" + value + "\" to the name of template."); } } Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesList.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesList.java 2010-07-10 19:14:38 UTC (rev 17839) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesList.java 2010-07-10 19:19:42 UTC (rev 17840) @@ -47,7 +47,6 @@ templates.add(Template.PLAIN); } - @Override public boolean add(Template e) { if (e == Template.PLAIN) { return false; @@ -58,7 +57,6 @@ return true; } - @Override public void add(int index, Template element) { templates.add(index, element); @@ -70,87 +68,70 @@ } } - @Override public boolean addAll(Collection<? extends Template> c) { return templates.addAll(c); } - @Override public boolean addAll(int index, Collection<? extends Template> c) { return templates.addAll(index, c); } - @Override public void clear() { templates.clear(); } - @Override public boolean contains(Object o) { return templates.contains(o); } - @Override public boolean containsAll(Collection<?> c) { return templates.containsAll(c); } - @Override public Template get(int index) { return templates.get(index); } - @Override public int indexOf(Object o) { return templates.indexOf(o); } - @Override public boolean isEmpty() { return templates.isEmpty(); } - @Override public Iterator<Template> iterator() { return templates.iterator(); } - @Override public int lastIndexOf(Object o) { return templates.lastIndexOf(o); } - @Override public ListIterator<Template> listIterator() { return templates.listIterator(); } - @Override public ListIterator<Template> listIterator(int index) { return templates.listIterator(index); } - @Override public boolean remove(Object o) { return templates.remove(o); } - @Override public Template remove(int index) { return templates.remove(index); } - @Override public boolean removeAll(Collection<?> c) { return templates.removeAll(c); } - @Override public boolean retainAll(Collection<?> c) { return templates.retainAll(c); } - @Override public Template set(int index, Template element) { Template old = templates.set(index, element); @@ -168,27 +149,22 @@ return old; } - @Override public int size() { return templates.size(); } - @Override public List<Template> subList(int fromIndex, int toIndex) { return templates.subList(fromIndex, toIndex); } - @Override public Object[] toArray() { return templates.toArray(); } - @Override public <T> T[] toArray(T[] a) { return templates.toArray(a); } - @Override public String toString() { StringBuilder sb = new StringBuilder(); for (Template t : templates) { Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesListConverter.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesListConverter.java 2010-07-10 19:14:38 UTC (rev 17839) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesListConverter.java 2010-07-10 19:19:42 UTC (rev 17840) @@ -30,7 +30,7 @@ /** * Converter used for view parameter "template". - * + * * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ @@ -40,7 +40,6 @@ /** * {@inheritDoc} */ - @Override public Object getAsObject(FacesContext context, UIComponent component, String value) { try { TemplatesList list = new TemplatesList(); @@ -48,7 +47,7 @@ for (String template : value.split(",")) { list.add(Template.valueOf(template.toUpperCase())); } - + return list; } catch (IllegalArgumentException iae) { throw new FacesException("Cannot convert parameter \"" + value + "\" to the list of templates.", iae); @@ -58,16 +57,15 @@ /** * {@inheritDoc} */ - @Override public String getAsString(FacesContext context, UIComponent component, Object value) { if (value instanceof String) { return (String) value; } - + if (value instanceof TemplatesList) { return value.toString(); } - + throw new FacesException("Cannot convert parameter \"" + value + "\" to the list of templates."); } }

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17839 - in root/tests/metamer/trunk/src/main/webapp/components: richExtendedDataTable and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-10 15:14:38 -0400 (Sat, 10 Jul 2010) New Revision: 17839 Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml Log: * all pages using componentControl fixed Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml 2010-07-10 19:13:55 UTC (rev 17838) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml 2010-07-10 19:14:38 UTC (rev 17839) @@ -24,7 +24,7 @@ <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:a4j="http://richfaces.org/a4j" xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:cc="http://richfaces.org/componentControl" xmlns:rich="http://richfaces.org/rich"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml 2010-07-10 19:13:55 UTC (rev 17838) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml 2010-07-10 19:14:38 UTC (rev 17839) @@ -24,7 +24,7 @@ <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:a4j="http://richfaces.org/a4j" xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:cc="http://richfaces.org/componentControl" xmlns:rich="http://richfaces.org/rich"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml 2010-07-10 19:13:55 UTC (rev 17838) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml 2010-07-10 19:14:38 UTC (rev 17839) @@ -24,7 +24,7 @@ <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:a4j="http://richfaces.org/a4j" xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:cc="http://richfaces.org/componentControl" xmlns:rich="http://richfaces.org/rich"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> @@ -116,59 +116,59 @@ <ui:define name="outOfTemplateAfter"> <h:commandButton value="sort state"> - <cc:componentControl event="click" target="richDataTable" operation="sort"/> + <rich:componentControl event="click" target="richDataTable" operation="sort"/> </h:commandButton> <h:commandButton value="sort capital"> - <cc:componentControl event="click" target="richDataTable" operation="sort"> + <rich:componentControl event="click" target="richDataTable" operation="sort"> <f:param value="columnCapital" /> - </cc:componentControl> + </rich:componentControl> </h:commandButton> <br/> scroller1: <h:commandButton value="<< first"> - <cc:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> <f:param value="first" /> - </cc:componentControl> + </rich:componentControl> </h:commandButton> <h:commandButton value="< previous"> - <cc:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="previous" /> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="previous" /> </h:commandButton> <h:commandButton value="next >"> - <cc:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="next" /> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="next" /> </h:commandButton> <h:commandButton value="last >>"> - <cc:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> <f:param value="last" /> - </cc:componentControl> + </rich:componentControl> </h:commandButton> <br/> scroller2: <h:commandButton value="<< first"> - <cc:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> + <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> <f:param value="first" /> - </cc:componentControl> + </rich:componentControl> </h:commandButton> <h:commandButton value="< previous"> - <cc:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="previous" /> + <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="previous" /> </h:commandButton> <h:commandButton value="next >"> - <cc:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="next" /> + <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="next" /> </h:commandButton> <h:commandButton value="last >>"> - <cc:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> + <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> <f:param value="last" /> - </cc:componentControl> + </rich:componentControl> </h:commandButton> <br/><br/> Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml 2010-07-10 19:13:55 UTC (rev 17838) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml 2010-07-10 19:14:38 UTC (rev 17839) @@ -24,7 +24,7 @@ <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:a4j="http://richfaces.org/a4j" xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:cc="http://richfaces.org/componentControl" xmlns:rich="http://richfaces.org/rich"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> @@ -111,13 +111,13 @@ <ui:define name="outOfTemplateAfter"> <h:commandButton value="sort states"> - <cc:componentControl event="click" target="richDataTable" operation="sort"/> + <rich:componentControl event="click" target="richDataTable" operation="sort"/> </h:commandButton> <h:commandButton value="sort capitals"> - <cc:componentControl event="click" target="richDataTable" operation="sort"> + <rich:componentControl event="click" target="richDataTable" operation="sort"> <f:param value="columnCapital" /> - </cc:componentControl> + </rich:componentControl> </h:commandButton> <br/><br/> Modified: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2010-07-10 19:13:55 UTC (rev 17838) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2010-07-10 19:14:38 UTC (rev 17839) @@ -24,7 +24,7 @@ <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:a4j="http://richfaces.org/a4j" xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:cc="http://richfaces.org/componentControl" xmlns:rich="http://richfaces.org/rich"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> Modified: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-07-10 19:13:55 UTC (rev 17838) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-07-10 19:14:38 UTC (rev 17839) @@ -24,7 +24,7 @@ <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:a4j="http://richfaces.org/a4j" xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:cc="http://richfaces.org/componentControl" xmlns:rich="http://richfaces.org/rich"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> Modified: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2010-07-10 19:13:55 UTC (rev 17838) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2010-07-10 19:14:38 UTC (rev 17839) @@ -24,7 +24,7 @@ <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:a4j="http://richfaces.org/a4j" xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:cc="http://richfaces.org/componentControl" xmlns:rich="http://richfaces.org/rich"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> @@ -116,59 +116,59 @@ <ui:define name="outOfTemplateAfter"> <h:commandButton value="sort state"> - <cc:componentControl event="click" target="richEDT" operation="sort"/> + <rich:componentControl event="click" target="richEDT" operation="sort"/> </h:commandButton> <h:commandButton value="sort capital"> - <cc:componentControl event="click" target="richEDT" operation="sort"> + <rich:componentControl event="click" target="richEDT" operation="sort"> <f:param value="columnCapital" /> - </cc:componentControl> + </rich:componentControl> </h:commandButton> <br/> scroller1: <h:commandButton value="<< first"> - <cc:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> <f:param value="first" /> - </cc:componentControl> + </rich:componentControl> </h:commandButton> <h:commandButton value="< previous"> - <cc:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="previous" /> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="previous" /> </h:commandButton> <h:commandButton value="next >"> - <cc:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="next" /> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="next" /> </h:commandButton> <h:commandButton value="last >>"> - <cc:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> + <rich:componentControl event="click" target="#{rich:clientId('scroller1')}" operation="switchToPage"> <f:param value="last" /> - </cc:componentControl> + </rich:componentControl> </h:commandButton> <br/> scroller2: <h:commandButton value="<< first"> - <cc:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> + <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> <f:param value="first" /> - </cc:componentControl> + </rich:componentControl> </h:commandButton> <h:commandButton value="< previous"> - <cc:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="previous" /> + <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="previous" /> </h:commandButton> <h:commandButton value="next >"> - <cc:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="next" /> + <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="next" /> </h:commandButton> <h:commandButton value="last >>"> - <cc:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> + <rich:componentControl event="click" target="#{rich:clientId('scroller2')}" operation="switchToPage"> <f:param value="last" /> - </cc:componentControl> + </rich:componentControl> </h:commandButton> <br/><br/> Modified: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2010-07-10 19:13:55 UTC (rev 17838) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2010-07-10 19:14:38 UTC (rev 17839) @@ -24,7 +24,7 @@ <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:a4j="http://richfaces.org/a4j" xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:it="http://richfaces.org/iteration" - xmlns:cc="http://richfaces.org/componentControl" xmlns:rich="http://richfaces.org/rich"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/template.xhtml"> @@ -117,13 +117,13 @@ <ui:define name="outOfTemplateAfter"> <h:commandButton value="sort states"> - <cc:componentControl event="click" target="richEDT" operation="sort"/> + <rich:componentControl event="click" target="richEDT" operation="sort"/> </h:commandButton> <h:commandButton value="sort capitals"> - <cc:componentControl event="click" target="richEDT" operation="sort"> + <rich:componentControl event="click" target="richEDT" operation="sort"> <f:param value="columnCapital" /> - </cc:componentControl> + </rich:componentControl> </h:commandButton> <br/><br/>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17838 - in root/tests/metamer/trunk/src/main: webapp/components/a4jActionListener and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-10 15:13:55 -0400 (Sat, 10 Jul 2010) New Revision: 17838 Modified: root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JCommandButtonBean.properties root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JCommandLinkBean.properties root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/CommandButtonBean.properties root/tests/metamer/trunk/src/main/webapp/components/a4jActionListener/all.xhtml root/tests/metamer/trunk/src/main/webapp/resources/css/a4jCommandButton.css root/tests/metamer/trunk/src/main/webapp/resources/css/a4jCommandLink.css root/tests/metamer/trunk/src/main/webapp/resources/css/commandButton.css Log: * changes styleClass options Modified: root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JCommandButtonBean.properties =================================================================== --- root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JCommandButtonBean.properties 2010-07-10 19:12:51 UTC (rev 17837) +++ root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JCommandButtonBean.properties 2010-07-10 19:13:55 UTC (rev 17838) @@ -4,4 +4,10 @@ attr.actionListener.first6CharsActionListener=first6CharsActionListener attr.actionListener.doubleStringActionListener=doubleStringActionListener -attr.actionListener.toUpperCaseActionListener=toUpperCaseActionListener \ No newline at end of file +attr.actionListener.toUpperCaseActionListener=toUpperCaseActionListener + +attr.styleClass.bold=bold +attr.styleClass.strike=strike +attr.styleClass.big=big +attr.styleClass.wide=wide +attr.styleClass.none= \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JCommandLinkBean.properties =================================================================== --- root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JCommandLinkBean.properties 2010-07-10 19:12:51 UTC (rev 17837) +++ root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/A4JCommandLinkBean.properties 2010-07-10 19:13:55 UTC (rev 17838) @@ -8,3 +8,7 @@ attr.actionListener.first6CharsActionListener=first6CharsActionListener attr.actionListener.doubleStringActionListener=doubleStringActionListener attr.actionListener.toUpperCaseActionListener=toUpperCaseActionListener + +attr.styleClass.bold=bold +attr.styleClass.strike=strike +attr.styleClass.none= \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/CommandButtonBean.properties =================================================================== --- root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/CommandButtonBean.properties 2010-07-10 19:12:51 UTC (rev 17837) +++ root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/bean/CommandButtonBean.properties 2010-07-10 19:13:55 UTC (rev 17838) @@ -6,8 +6,8 @@ attr.actionListener.doubleStringActionListener=doubleStringActionListener attr.actionListener.toUpperCaseActionListener=toUpperCaseActionListener -attr.styleClass.red=red -attr.styleClass.blue=blue +attr.styleClass.bold=bold +attr.styleClass.strike=strike attr.styleClass.big=big attr.styleClass.wide=wide attr.styleClass.none= \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jActionListener/all.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jActionListener/all.xhtml 2010-07-10 19:12:51 UTC (rev 17837) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jActionListener/all.xhtml 2010-07-10 19:13:55 UTC (rev 17838) @@ -22,22 +22,22 @@ <h:messages id="messages" /> <h:panelGrid columns="1"> - <h:commandButton value="Invoke listener by type"> + <h:commandButton id="invokeByTypeButton" value="Invoke listener by type"> <a4j:actionListener type="org.richfaces.testapp.bean.A4JActionListenerBean$ActionListenerImpl" /> <f:ajax render="messages" /> </h:commandButton> - <h:commandButton value="Invoke listener by binding"> + <h:commandButton id="invokeByBindingButton" value="Invoke listener by binding"> <a4j:actionListener binding="#{a4jActionListenerBean.actionListener}" /> <f:ajax render="messages" /> </h:commandButton> - <h:commandButton value="Invoke listener method"> + <h:commandButton id="invokeMethodButton" value="Invoke listener method"> <a4j:actionListener listener="#{a4jActionListenerBean.handleActionMethod}" /> <f:ajax render="messages" /> </h:commandButton> - <demo:actionComposite render="messages" value="Invoke listener method in composite component"> + <demo:actionComposite id="invokeFromCCButton" render="messages" value="Invoke listener method in composite component"> <a4j:actionListener for="button" listener="#{a4jActionListenerBean.handleActionMethodComposite}" /> </demo:actionComposite> </h:panelGrid> Modified: root/tests/metamer/trunk/src/main/webapp/resources/css/a4jCommandButton.css =================================================================== --- root/tests/metamer/trunk/src/main/webapp/resources/css/a4jCommandButton.css 2010-07-10 19:12:51 UTC (rev 17837) +++ root/tests/metamer/trunk/src/main/webapp/resources/css/a4jCommandButton.css 2010-07-10 19:13:55 UTC (rev 17838) @@ -0,0 +1,16 @@ +.big { + height: 40px; + width: 200px; +} + +.wide { + width: 200px; +} + +.bold { + font-weight: bold; +} + +.strike { + text-decoration: line-through; +} \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/webapp/resources/css/a4jCommandLink.css =================================================================== --- root/tests/metamer/trunk/src/main/webapp/resources/css/a4jCommandLink.css 2010-07-10 19:12:51 UTC (rev 17837) +++ root/tests/metamer/trunk/src/main/webapp/resources/css/a4jCommandLink.css 2010-07-10 19:13:55 UTC (rev 17838) @@ -0,0 +1,7 @@ +.bold { + font-weight: bold; +} + +.strike { + text-decoration: line-through; +} Modified: root/tests/metamer/trunk/src/main/webapp/resources/css/commandButton.css =================================================================== --- root/tests/metamer/trunk/src/main/webapp/resources/css/commandButton.css 2010-07-10 19:12:51 UTC (rev 17837) +++ root/tests/metamer/trunk/src/main/webapp/resources/css/commandButton.css 2010-07-10 19:13:55 UTC (rev 17838) @@ -1,16 +1,16 @@ -.red { - color: red; +.big { + height: 40px; + width: 200px; } -.blue { - color: blue; +.wide { + width: 200px; } -.big { - height: 40px; - width: 200px; +.bold { + font-weight: bold; } -.wide { - width: 200px; +.strike { + text-decoration: line-through; } \ No newline at end of file

14 years, 6 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits July 2010