Author: ppitonak(a)redhat.com
Date: 2011-03-10 12:31:21 -0500 (Thu, 10 Mar 2011)
New Revision: 22147
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/fAjax.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/fAjax.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml
Log:
samples modified so that it's possible to test attributes required and
requiredMessage
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java
===================================================================
---
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java 2011-03-10
17:30:27 UTC (rev 22146)
+++
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java 2011-03-10
17:31:21 UTC (rev 22147)
@@ -76,6 +76,7 @@
capitalsOptions.add(new SelectItem(capital.getState(), capital.getState()));
validationOptions.add(new SelectItem(capital.getState(),
capital.getState()));
}
+ capitalsOptions.add(new SelectItem("", ""));
validationOptions.add(new SelectItem("@@", "@@"));
validationOptions.add(new SelectItem("", ""));
validationOptions.add(new SelectItem("RichFaces",
"RichFaces"));
@@ -89,14 +90,13 @@
attributes.setAttribute("listWidth", "200px");
attributes.setAttribute("openOnEdit", true);
attributes.setAttribute("rendered", true);
+ attributes.setAttribute("requiredMessage", "value is
required");
attributes.setAttribute("saveOnBlur", true);
attributes.setAttribute("saveOnSelect", true);
// TODO has to be tested in another way
attributes.remove("converter");
attributes.remove("converterMessage");
- attributes.remove("required");
- attributes.remove("requiredMessage");
attributes.remove("validator");
attributes.remove("validatorMessage");
attributes.remove("valueChangeListener");
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java
===================================================================
---
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java 2011-03-10
17:30:27 UTC (rev 22146)
+++
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java 2011-03-10
17:31:21 UTC (rev 22147)
@@ -67,6 +67,7 @@
attributes.setAttribute("maxValue", 10);
attributes.setAttribute("minValue", -10);
attributes.setAttribute("rendered", true);
+ attributes.setAttribute("requiredMessage", "value is
required");
attributes.setAttribute("showBoundaryValues", true);
attributes.setAttribute("showInput", true);
attributes.setAttribute("step", 1);
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java
===================================================================
---
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java 2011-03-10
17:30:27 UTC (rev 22146)
+++
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java 2011-03-10
17:31:21 UTC (rev 22147)
@@ -65,6 +65,7 @@
attributes.setAttribute("maxValue", 10);
attributes.setAttribute("minValue", -10);
attributes.setAttribute("rendered", true);
+ attributes.setAttribute("requiredMessage", "value is
required");
attributes.setAttribute("step", 1);
attributes.setAttribute("value", 2);
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/fAjax.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/fAjax.xhtml 2011-03-10
17:30:27 UTC (rev 22146)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/fAjax.xhtml 2011-03-10
17:31:21 UTC (rev 22147)
@@ -166,7 +166,7 @@
<f:ajax event="change"
render="output :phasesPanel" />
</rich:calendar>
- <rich:message id="calendarMsg"
for="calendar"/>
+ <rich:message id="msg" for="calendar"/>
</div>
<br/><br/>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml 2011-03-10
17:30:27 UTC (rev 22146)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml 2011-03-10
17:31:21 UTC (rev 22147)
@@ -166,7 +166,7 @@
<a4j:ajax event="change"
render="output, phasesPanel" />
</rich:calendar>
- <rich:message id="calendarMsg"
for="calendar"/>
+ <rich:message id="msg" for="calendar"/>
</div>
<br/><br/>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/fAjax.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/fAjax.xhtml 2011-03-10
17:30:27 UTC (rev 22146)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/fAjax.xhtml 2011-03-10
17:31:21 UTC (rev 22147)
@@ -90,7 +90,7 @@
<f:ajax event="change" render="output
:phasesPanel"/>
</rich:inplaceInput>
- <rich:message id="calendarMsg"
for="inplaceInput"/>
+ <rich:message id="msg" for="inplaceInput"/>
<br/><br/>
<h:commandButton id="hButton" value="h:commandButton"
style="margin-right: 10px;"/>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml 2011-03-10
17:30:27 UTC (rev 22146)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml 2011-03-10
17:31:21 UTC (rev 22147)
@@ -92,7 +92,7 @@
<a4j:ajax event="change" render="output"/>
</rich:inplaceInput>
- <rich:message id="calendarMsg"
for="inplaceInput"/>
+ <rich:message id="msg" for="inplaceInput"/>
<br/><br/>
<h:commandButton id="hButton" value="h:commandButton"
style="margin-right: 10px;"/>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml 2011-03-10
17:30:27 UTC (rev 22146)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml 2011-03-10
17:31:21 UTC (rev 22147)
@@ -2,7 +2,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:metamer="http://java.sun.com/jsf/composite/metamer"
-
xmlns:rich="http://richfaces.org/rich" >
+
xmlns:rich="http://richfaces.org/rich"
xmlns:a4j="http://richfaces.org/a4j">
<!--
JBoss, Home of Professional Open Source
@@ -107,8 +107,12 @@
<f:ajax event="change" render="output
:phasesPanel"/>
</rich:inplaceSelect>
+ <rich:message id="msg" for="inplaceSelect"/>
<br/><br/>
+ <h:commandButton id="hButton" value="h:commandButton"
style="margin-right: 10px;"/>
+ <a4j:commandButton id="a4jButton"
value="a4j:commandButton"/>
+ <br/><br/>
output: <h:outputText id="output"
value="#{richInplaceSelectBean.attributes['value'].value}"/>
</ui:define>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2011-03-10
17:30:27 UTC (rev 22146)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2011-03-10
17:31:21 UTC (rev 22147)
@@ -109,8 +109,12 @@
<a4j:ajax event="change" render="output"/>
</rich:inplaceSelect>
+ <rich:message id="msg" for="inplaceSelect"/>
<br/><br/>
+ <h:commandButton id="hButton" value="h:commandButton"
style="margin-right: 10px;"/>
+ <a4j:commandButton id="a4jButton"
value="a4j:commandButton"/>
+ <br/><br/>
output: <h:outputText id="output"
value="#{richInplaceSelectBean.attributes['value'].value}"/>
</ui:define>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml 2011-03-10
17:30:27 UTC (rev 22146)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml 2011-03-10
17:31:21 UTC (rev 22147)
@@ -2,7 +2,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:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:metamer="http://java.sun.com/jsf/composite/metamer"
xmlns:rich="http://richfaces.org/rich"
-
xmlns:h="http://java.sun.com/jsf/html">
+
xmlns:a4j="http://richfaces.org/a4j"
xmlns:h="http://java.sun.com/jsf/html">
<!--
JBoss, Home of Professional Open Source
@@ -39,7 +39,7 @@
<ui:define name="component">
<rich:inputNumberSlider id="slider"
valueChangeListener="#{richBean.valueChangeListener}"
-
+
accesskey="#{richInputNumberSliderBean.attributes['accesskey'].value}"
decreaseClass="#{richInputNumberSliderBean.attributes['decreaseClass'].value}"
decreaseSelectedClass="#{richInputNumberSliderBean.attributes['decreaseSelectedClass'].value}"
@@ -95,8 +95,12 @@
<f:ajax event="change" render="output
:phasesPanel"/>
</rich:inputNumberSlider>
+ <rich:message id="msg" for="slider"/>
<br/><br/>
+ <h:commandButton id="hButton" value="h:commandButton"
style="margin-right: 10px;"/>
+ <a4j:commandButton id="a4jButton"
value="a4j:commandButton"/>
+ <br/><br/>
output: <h:outputText id="output"
value="#{richInputNumberSliderBean.attributes['value'].value}"/>
</ui:define>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2011-03-10
17:30:27 UTC (rev 22146)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2011-03-10
17:31:21 UTC (rev 22147)
@@ -39,7 +39,7 @@
<ui:define name="component">
<rich:inputNumberSlider id="slider"
valueChangeListener="#{richBean.valueChangeListener}"
-
+
accesskey="#{richInputNumberSliderBean.attributes['accesskey'].value}"
decreaseClass="#{richInputNumberSliderBean.attributes['decreaseClass'].value}"
decreaseSelectedClass="#{richInputNumberSliderBean.attributes['decreaseSelectedClass'].value}"
@@ -95,8 +95,12 @@
<a4j:ajax event="change" render="output"/>
</rich:inputNumberSlider>
+ <rich:message id="msg" for="slider"/>
<br/><br/>
+ <h:commandButton id="hButton" value="h:commandButton"
style="margin-right: 10px;"/>
+ <a4j:commandButton id="a4jButton"
value="a4j:commandButton"/>
+ <br/><br/>
output: <h:outputText id="output"
value="#{richInputNumberSliderBean.attributes['value'].value}"/>
</ui:define>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml 2011-03-10
17:30:27 UTC (rev 22146)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml 2011-03-10
17:31:21 UTC (rev 22147)
@@ -44,7 +44,7 @@
<ui:define name="component">
<rich:inputNumberSpinner id="spinner"
valueChangeListener="#{richBean.valueChangeListener}"
-
+
accesskey="#{richInputNumberSpinnerBean.attributes['accesskey'].value}"
cycled="#{richInputNumberSpinnerBean.attributes['cycled'].value}"
dir="#{richInputNumberSpinnerBean.attributes['dir'].value}"
@@ -93,8 +93,12 @@
<f:ajax event="change" render="output
:phasesPanel" />
</rich:inputNumberSpinner>
+ <rich:message id="msg" for="spinner"/>
<br/><br/>
+ <h:commandButton id="hButton" value="h:commandButton"
style="margin-right: 10px;"/>
+ <a4j:commandButton id="a4jButton"
value="a4j:commandButton"/>
+ <br/><br/>
output: <h:outputText id="output"
value="#{richInputNumberSpinnerBean.attributes['value'].value}"/>
</ui:define>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml 2011-03-10
17:30:27 UTC (rev 22146)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml 2011-03-10
17:31:21 UTC (rev 22147)
@@ -45,7 +45,7 @@
<ui:define name="component">
<rich:inputNumberSpinner id="spinner"
valueChangeListener="#{richBean.valueChangeListener}"
-
+
accesskey="#{richInputNumberSpinnerBean.attributes['accesskey'].value}"
cycled="#{richInputNumberSpinnerBean.attributes['cycled'].value}"
dir="#{richInputNumberSpinnerBean.attributes['dir'].value}"
@@ -94,8 +94,12 @@
<a4j:ajax event="change" render="output" />
</rich:inputNumberSpinner>
+ <rich:message id="msg" for="spinner"/>
<br/><br/>
+ <h:commandButton id="hButton" value="h:commandButton"
style="margin-right: 10px;"/>
+ <a4j:commandButton id="a4jButton"
value="a4j:commandButton"/>
+ <br/><br/>
output: <h:outputText id="output"
value="#{richInputNumberSpinnerBean.attributes['value'].value}"/>
</ui:define>