Author: lfryc(a)redhat.com
Date: 2011-01-08 17:46:38 -0500 (Sat, 08 Jan 2011)
New Revision: 20918
Added:
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/dataScroller.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml
Log:
updated rich:list samples to allow test it (RFPL-671)
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java
===================================================================
---
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java 2011-01-08
22:45:44 UTC (rev 20917)
+++
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java 2011-01-08
22:46:38 UTC (rev 20918)
@@ -54,14 +54,15 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getComponentAttributesFromClass(UIList.class,
getClass());
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UIList.class,
getClass());
attributes.setAttribute("type", "ordered");
attributes.setAttribute("rendered", true);
attributes.setAttribute("rows", 20);
// TODO has to be tested in other way
- attributes.remove("componentState");
+ attributes.remove("keepSaved");
+ attributes.remove("iterationStatusVar");
attributes.remove("rowKeyVar");
attributes.remove("stateVar");
attributes.remove("value");
Copied:
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/dataScroller.xhtml
(from rev 20917,
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml)
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/dataScroller.xhtml
(rev 0)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/dataScroller.xhtml 2011-01-08
22:46:38 UTC (rev 20918)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:metamer="http://java.sun.com/jsf/composite/metamer"
+
xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+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.
+ -->
+
+ <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="richList.css"
/>
+
+ </ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ </ui:define>
+
+ <ui:define name="component">
+ <rich:list id="richList"
+ dir="#{richListBean.attributes['dir'].value}"
+
first="#{richListBean.attributes['first'].value}"
+
iterationState="#{richListBean.attributes['iterationState'].value}"
+ iterationStatusVar="iterationStatus"
+
keepSaved="#{richListBean.attributes['keepSaved'].value}"
+ lang="#{richListBean.attributes['lang'].value}"
+
onclick="#{richListBean.attributes['onclick'].value}"
+
ondblclick="#{richListBean.attributes['ondblclick'].value}"
+
onkeydown="#{richListBean.attributes['onkeydown'].value}"
+
onkeypress="#{richListBean.attributes['onkeypress'].value}"
+
onkeyup="#{richListBean.attributes['onkeyup'].value}"
+
onmousedown="#{richListBean.attributes['onmousedown'].value}"
+
onmousemove="#{richListBean.attributes['onmousemove'].value}"
+
onmouseout="#{richListBean.attributes['onmouseout'].value}"
+
onmouseover="#{richListBean.attributes['onmouseover'].value}"
+
onmouseup="#{richListBean.attributes['onmouseup'].value}"
+
onrowclick="#{richListBean.attributes['onrowclick'].value}"
+
onrowdblclick="#{richListBean.attributes['onrowdblclick'].value}"
+
onrowkeydown="#{richListBean.attributes['onrowkeydown'].value}"
+
onrowkeypress="#{richListBean.attributes['onrowkeypress'].value}"
+
onrowkeyup="#{richListBean.attributes['onrowkeyup'].value}"
+
onrowmousedown="#{richListBean.attributes['onrowmousedown'].value}"
+
onrowmousemove="#{richListBean.attributes['onrowmousemove'].value}"
+
onrowmouseout="#{richListBean.attributes['onrowmouseout'].value}"
+
onrowmouseover="#{richListBean.attributes['onrowmouseover'].value}"
+
onrowmouseup="#{richListBean.attributes['onrowmouseup'].value}"
+
relativeRowIndex="#{richListBean.attributes['relativeRowIndex'].value}"
+
rendered="#{richListBean.attributes['rendered'].value}"
+
rowAvailable="#{richListBean.attributes['rowAvailable'].value}"
+
rowClass="#{richListBean.attributes['rowClass'].value}"
+
rowClasses="#{richListBean.attributes['rowClasses'].value}"
+
rowCount="#{richListBean.attributes['rowCount'].value}"
+
rowData="#{richListBean.attributes['rowData'].value}"
+
rowIndex="#{richListBean.attributes['rowIndex'].value}"
+
rowKey="#{richListBean.attributes['rowKey'].value}"
+
rowKeyConverter="#{richListBean.attributes['rowKeyConverter'].value}"
+ rows="#{richListBean.attributes['rows'].value}"
+
style="#{richListBean.attributes['style'].value}"
+
styleClass="#{richListBean.attributes['styleClass'].value}"
+ value="#{model.employees}"
+ var="item"
+ term="#{richListBean.attributes['term'].value}"
+
title="#{richListBean.attributes['title'].value}"
+
type="#{richListBean.attributes['type'].value}">
+ <f:facet name="term">
+ <h:outputText id="term" value="#{item.title}"
style="font-weight: bold"/>
+ </f:facet>
+
+ #{item.name}
+ </rich:list>
+
+ <rich:dataScroller id="dataScroller" for="richList"
/>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ <metamer:attributes value="#{richListBean.attributes}"
id="attributes" />
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml 2011-01-08
22:45:44 UTC (rev 20917)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml 2011-01-08
22:46:38 UTC (rev 20918)
@@ -32,9 +32,12 @@
<ui:define name="links">
<metamer:testPageLink id="simple" outcome="simple"
value="Simple">
- Simple page that contains <b>rich:list</b> (with model
containing capitals) and
- input boxes for all its attributes.
+ Simple page that contains <b>rich:list</b> (with model
containing capitals) and "term" facet which influences list in definitions mode
</metamer:testPageLink>
+
+ <metamer:testPageLink id="dataScroller"
outcome="dataScroller" value="Data Scroller">
+ Simple page that contains <b>rich:list</b> (with model
containing capitals) with bound dataScroller
+ </metamer:testPageLink>
</ui:define>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml 2011-01-08
22:45:44 UTC (rev 20917)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml 2011-01-08
22:46:38 UTC (rev 20918)
@@ -46,7 +46,7 @@
dir="#{richListBean.attributes['dir'].value}"
first="#{richListBean.attributes['first'].value}"
iterationState="#{richListBean.attributes['iterationState'].value}"
-
iterationStatusVar="#{richListBean.attributes['iterationStatusVar'].value}"
+ iterationStatusVar="iterationStatus"
keepSaved="#{richListBean.attributes['keepSaved'].value}"
lang="#{richListBean.attributes['lang'].value}"
onclick="#{richListBean.attributes['onclick'].value}"
@@ -93,8 +93,6 @@
#{item.name}
</rich:list>
-
- <rich:dataScroller id="dataScroller" for="richList"
/>
</ui:define>
<ui:define name="outOfTemplateAfter">