richfaces-svn-commits
July 2008
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 543 discussions
JBoss Rich Faces SVN: r9423 - in trunk: ui/core/src/main/config/component and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: cluts
Date: 2008-07-07 08:49:54 -0400 (Mon, 07 Jul 2008)
New Revision: 9423
Modified:
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_button_attributes.ent
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_img_attributes.ent
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_attributes.ent
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_table_attributes.ent
trunk/ui/core/src/main/config/component/mediaOutput.xml
trunk/ui/core/src/main/config/component/support.xml
trunk/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml
trunk/ui/effect/src/main/config/component/effect.xml
trunk/ui/gmap/src/main/config/component/gmap.xml
trunk/ui/virtualEarth/src/main/config/component/virtualEarth.xml
Log:
RF-696 - corrected descriptions for "align" (rich: mediaOutput, rich: dataTable, rich: combobox, rich: paint2D, rich: panelMenuGroup, rich: separator), "uriAttribute" (rich: mediaOutput), "fieldStyleClass" (rich: dataFilterSlider) , "frame"(rich:dataTable), "dashboardSize" (rich: virtualEarth), "mapType" (rich: gmap), "name" and "disableDefault" (rich: effect) attributes.
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_button_attributes.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_button_attributes.ent 2008-07-07 12:12:04 UTC (rev 9422)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_button_attributes.ent 2008-07-07 12:49:54 UTC (rev 9423)
@@ -3,6 +3,6 @@
<property>
<name>type</name>
<classname>java.lang.String</classname>
- <description>submit|reset|image|button This attribute specifies a type of control to create. The default value for this attribute is "submit"</description>
+ <description>This attribute specifies a type of control to create. The possible values are "submit", "reset", "image" and "button". The default value for this attribute is "submit"</description>
</property>
</properties>
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_img_attributes.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_img_attributes.ent 2008-07-07 12:12:04 UTC (rev 9422)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_img_attributes.ent 2008-07-07 12:49:54 UTC (rev 9423)
@@ -2,14 +2,9 @@
<property>
<name>align</name>
<classname>java.lang.String</classname>
- <description>bottom|middle|top|left|right
- Deprecated. This attribute specifies the position of an IMG, OBJECT, or APPLET with respect to its context.
-
- The following values for align concern the object's position with respect to surrounding text:
-
- * bottom: means that the bottom of the object should be vertically aligned with the current baseline. This is the default value.
- * middle: means that the center of the object should be vertically aligned with the current baseline.
- * top: means that the top of the object should be vertically aligned with the top of the current text line
+ <description>
+ Deprecated. This attribute specifies the position of an IMG, OBJECT, or APPLET with respect to its context.
+ The possible values are "bottom", "middle", "top", "left" and "right". The default value is "middle".
</description>
</property>
<property>
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_attributes.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_attributes.ent 2008-07-07 12:12:04 UTC (rev 9422)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_attributes.ent 2008-07-07 12:49:54 UTC (rev 9423)
@@ -5,15 +5,9 @@
<property>
<name>align</name>
<classname>java.lang.String</classname>
- <description>left|center|right|justify [CI]
- Deprecated. This attribute specifies the horizontal alignment of its element with respect to the surrounding context. Possible values:
-
- * left: text lines are rendered flush left.
- * center: text lines are centered.
- * right: text lines are rendered flush right.
- * justify: text lines are justified to both margins.
-
- The default depends on the base text direction. For left to right text, the default is align=left, while for right to left text, the default is align=right
+ <description>
+ Deprecated. This attribute specifies the horizontal alignment of its element with respect to the surrounding context. The possible values are "left", "center", "right" and "justify".
+ The default depends on the base text direction. For left to right text, the default is align="left", while for right to left text, the default is align="right".
</description>
</property>
<property>
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_table_attributes.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_table_attributes.ent 2008-07-07 12:12:04 UTC (rev 9422)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_table_attributes.ent 2008-07-07 12:49:54 UTC (rev 9423)
@@ -2,13 +2,8 @@
<property>
<name>align</name>
<classname>java.lang.String</classname>
- <description>left|center|right [CI]
- Deprecated. This attribute specifies the position of the table with respect to the document. Permitted values:
-
- * left: The table is to the left of the document.
- * center: The table is to the center of the document.
- * right: The table is to the right of the document
-
+ <description> Deprecated. This attribute specifies the position of the table with respect to the document.
+ The possible values are "left", "center" and "right".
</description>
</property>
<property>
@@ -41,19 +36,8 @@
<property>
<name>frame</name>
<classname>java.lang.String</classname>
- <description>void|above|below|hsides|lhs|rhs|vsides|box|border [CI]
- This attribute specifies which sides of the frame surrounding a table will be visible. Possible values:
-
- * void: No sides. This is the default value.
- * above: The top side only.
- * below: The bottom side only.
- * hsides: The top and bottom sides only.
- * vsides: The right and left sides only.
- * lhs: The left-hand side only.
- * rhs: The right-hand side only.
- * box: All four sides.
- * border: All four sides
-
+ <description>This attribute specifies which sides of the frame surrounding a table will be visible. Possible values: "void", "above", "below", "hsides", "lhs", "rhs", "vsides", "box" and "border".
+ The default value is "void".
</description>
</property>
<property>
Modified: trunk/ui/core/src/main/config/component/mediaOutput.xml
===================================================================
--- trunk/ui/core/src/main/config/component/mediaOutput.xml 2008-07-07 12:12:04 UTC (rev 9422)
+++ trunk/ui/core/src/main/config/component/mediaOutput.xml 2008-07-07 12:49:54 UTC (rev 9423)
@@ -107,7 +107,7 @@
<name>uriAttribute</name>
<classname>java.lang.String</classname>
<description>
- <![CDATA[Name of attribute for resource-link attribute ( 'href' for <a>, 'src' for <img> or <script>, etc ]]>
+ <![CDATA[Name of attribute for resource-link attribute ( 'href' for <a>, 'src' for <img> or <script>, etc) ]]>
</description>
</property>
@@ -156,34 +156,34 @@
java.io.OutputStream,java.lang.Object
</methodargs>
</property>
- <property>
- <name>converter</name>
- <classname>javax.faces.convert.Converter</classname>
- <description>
- ID of a converter to be used or a reference to a
- converter.
- </description>
- </property>
- <property>
- <name>cacheable</name>
- <classname>boolean</classname>
- <description>If "true", the resource is cached (on the server and the client sides).</description>
- </property>
- <property>
- <name>expires</name>
- <classname>java.util.Date</classname>
- <description>The attribute allows to manage caching and defines the period after which a resource is reloaded.</description>
- </property>
- <property>
- <name>session</name>
- <classname>boolean</classname>
- <description>If "true", a session for an object generation is restored.</description>
- </property>
- <property>
- <name>lastModified</name>
- <classname>java.util.Date</classname>
+ <property>
+ <name>converter</name>
+ <classname>javax.faces.convert.Converter</classname>
+ <description>
+ ID of a converter to be used or a reference to a
+ converter.
+ </description>
+ </property>
+ <property>
+ <name>cacheable</name>
+ <classname>boolean</classname>
+ <description>If "true", the resource is cached (on the server and the client sides).</description>
+ </property>
+ <property>
+ <name>expires</name>
+ <classname>java.util.Date</classname>
+ <description>The attribute allows to manage caching and defines the period after which a resource is reloaded.</description>
+ </property>
+ <property>
+ <name>session</name>
+ <classname>boolean</classname>
+ <description>If "true", a session for an object generation is restored.</description>
+ </property>
+ <property>
+ <name>lastModified</name>
+ <classname>java.util.Date</classname>
<description>The attribute allows to manage caching. A browser can send request with the header "If-Modified-Since" for necessity of object reloading. If time of modification is earlier, then the framework doesn't call generation and return code 304.
- </description>
+ </description>
</property>
</component>
</components>
\ No newline at end of file
Modified: trunk/ui/core/src/main/config/component/support.xml
===================================================================
--- trunk/ui/core/src/main/config/component/support.xml 2008-07-07 12:12:04 UTC (rev 9422)
+++ trunk/ui/core/src/main/config/component/support.xml 2008-07-07 12:49:54 UTC (rev 9423)
@@ -102,7 +102,7 @@
<name>disableDefault</name>
<classname>boolean</classname>
<description>
- <![CDATA[Disables default action for target event ( append "return false;" to javascript )]]>
+ <![CDATA[Disables default action for target event ( append "return false;" to JavaScript )]]>
</description>
<defaultvalue>false</defaultvalue>
</property>
Modified: trunk/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml
===================================================================
--- trunk/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml 2008-07-07 12:12:04 UTC (rev 9422)
+++ trunk/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml 2008-07-07 12:49:54 UTC (rev 9423)
@@ -86,8 +86,8 @@
<name>fieldStyleClass</name>
<classname>java.lang.String</classname>
<description>
- The styleClass for input that displays the value : 'manualInput' must
- be true
+ The styleClass for input that displays the value : manualInput must
+ be "true"
</description>
</property>
<property>
Modified: trunk/ui/effect/src/main/config/component/effect.xml
===================================================================
--- trunk/ui/effect/src/main/config/component/effect.xml 2008-07-07 12:12:04 UTC (rev 9422)
+++ trunk/ui/effect/src/main/config/component/effect.xml 2008-07-07 12:49:54 UTC (rev 9423)
@@ -31,7 +31,7 @@
<name>name</name>
<classname>java.lang.String</classname>
<description>
- Generated Javascript name.
+ Generated JavaScript name.
</description>
<defaultvalue>""</defaultvalue>
</property>
@@ -81,7 +81,7 @@
<name>disableDefault</name>
<classname>boolean</classname>
<description>
- <![CDATA[Disable default action for target event ( append "return false;" to javascript ). Default value is "false". ]]>
+ <![CDATA[Disable default action for target event ( append "return false;" to JavaScript ). Default value is "false". ]]>
</description>
<defaultvalue>false</defaultvalue>
</property>
Modified: trunk/ui/gmap/src/main/config/component/gmap.xml
===================================================================
--- trunk/ui/gmap/src/main/config/component/gmap.xml 2008-07-07 12:12:04 UTC (rev 9422)
+++ trunk/ui/gmap/src/main/config/component/gmap.xml 2008-07-07 12:49:54 UTC (rev 9423)
@@ -90,8 +90,8 @@
<name>mapType</name>
<classname>java.lang.String</classname>
<description>
- Initial map type. The possible values are G_NORMAL_MAP, G_SATELLITE_MAP,
- G_HYBRID_MAP. Default value is "G_SATELLITE_MAP".
+ Initial map type. The possible values are "G_NORMAL_MAP", "G_SATELLITE_MAP",
+ "G_HYBRID_MAP". Default value is "G_SATELLITE_MAP".
</description>
<defaultvalue>"G_SATELLITE_MAP"</defaultvalue>
</property>
Modified: trunk/ui/virtualEarth/src/main/config/component/virtualEarth.xml
===================================================================
--- trunk/ui/virtualEarth/src/main/config/component/virtualEarth.xml 2008-07-07 12:12:04 UTC (rev 9422)
+++ trunk/ui/virtualEarth/src/main/config/component/virtualEarth.xml 2008-07-07 12:49:54 UTC (rev 9423)
@@ -84,7 +84,7 @@
<name>dashboardSize</name>
<classname>java.lang.String</classname>
<description>
- Initial map type. The possible values are Normal,Small,Tiny. Default value is "Normal".
+ Initial map type. The possible values are "Normal", "Small", "Tiny". Default value is "Normal".
</description>
<defaultvalue>"Normal"</defaultvalue>
</property>
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r9422 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: filteringFeature/examples and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-07-07 08:12:04 -0400 (Mon, 07 Jul 2008)
New Revision: 9422
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/externalFiltering.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/simpleFiltering.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/externalMultipleSorting.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-3854
http://jira.jboss.com/jira/browse/RF-3831
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2008-07-07 11:56:34 UTC (rev 9421)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2008-07-07 12:12:04 UTC (rev 9422)
@@ -7,7 +7,20 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Data Table</ui:define>
<ui:define name="body">
- <ui:include src="/templates/include/tab-panel.xhtml" />
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"
+ selectedTab="#{componentNavigator.currentComponent.activeTab}">
+ <rich:tab label="Usage" name="usage">
+ <ui:include src="/richfaces/dataTable/usage.xhtml"/>
+ </rich:tab>
+ <rich:tab label="Extended Data Model" name="dataModel">
+ <ui:include src="/richfaces/dataTable/extended-data-model.xhtml"/>
+ </rich:tab>
+ <rich:tab name="info" label="Tag Information">
+ <rich:insert
+ src="/WEB-INF/#{componentNavigator.currentComponent.tagInfoLocation}"
+ errorContent="/templates/include/tagInfoNotes.xhtml" />
+ </rich:tab>
+ </rich:tabPanel>
</ui:define>
</ui:composition>
</html>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/externalFiltering.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/externalFiltering.xhtml 2008-07-07 11:56:34 UTC (rev 9421)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/externalFiltering.xhtml 2008-07-07 12:12:04 UTC (rev 9422)
@@ -6,7 +6,7 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:fn="http://java.sun.com/jsp/jstl/functions">
<h:form>
- <rich:dataTable value="#{capitalsBean.capitals}" var="cap" id="table">
+ <rich:dataTable value="#{capitalsBean.capitals}" var="cap" id="table" rows="20">
<f:facet name="header">
<rich:columnGroup>
<rich:column colspan="2">
@@ -23,7 +23,7 @@
<rich:column filterMethod="#{filteringBean.filterStates}">
<f:facet name="header">
<h:inputText value="#{filteringBean.filterValue}" id="input">
- <a4j:support event="onkeyup" reRender="table"
+ <a4j:support event="onkeyup" reRender="table , ds"
ignoreDupResponses="true" requestDelay="700" focus="input" />
</h:inputText>
</f:facet>
@@ -34,11 +34,12 @@
<f:facet name="header">
<h:selectOneMenu value="#{filteringBean.filterZone}">
<f:selectItems value="#{filteringBean.filterZones}" />
- <a4j:support event="onchange" reRender="table" />
+ <a4j:support event="onchange" reRender="table, ds" />
</h:selectOneMenu>
</f:facet>
<h:outputText value="#{cap.timeZone}" />
</rich:column>
</rich:dataTable>
+ <rich:datascroller id="ds2" for="table" renderIfSinglePage="false"></rich:datascroller>
</h:form>
</ui:composition>
\ No newline at end of file
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/simpleFiltering.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/simpleFiltering.xhtml 2008-07-07 11:56:34 UTC (rev 9421)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/examples/simpleFiltering.xhtml 2008-07-07 12:12:04 UTC (rev 9422)
@@ -5,7 +5,7 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
<h:form>
- <rich:dataTable value="#{capitalsBean.capitals}" var="cap">
+ <rich:dataTable value="#{capitalsBean.capitals}" var="cap" rows="20" reRender="ds" id="simpletable">
<f:facet name="header">
<rich:columnGroup>
<rich:column colspan="2" >
@@ -29,5 +29,6 @@
<h:outputText value="#{cap.name}"/>
</rich:column>
</rich:dataTable>
+ <rich:datascroller id="ds" for="simpletable" renderIfSinglePage="false"></rich:datascroller>
</h:form>
</ui:composition>
\ No newline at end of file
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/externalMultipleSorting.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/externalMultipleSorting.xhtml 2008-07-07 11:56:34 UTC (rev 9421)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/externalMultipleSorting.xhtml 2008-07-07 12:12:04 UTC (rev 9422)
@@ -17,7 +17,7 @@
<h:panelGrid columns="2" columnClasses="top">
<h:form>
<rich:dataTable value="#{dataTableScrollerBean.allCars}"
- var="category" rows="25" id="table"
+ var="category" rows="20" id="table" reRender="ds2"
sortPriorities="#{sortingBean.prioritList}">
<rich:column id="make" sortBy="#{category.make}"
sortOrder="#{sortingBean.makeDirection}" selfSorted="false">
@@ -59,6 +59,9 @@
</f:facet>
<h:outputText value="#{category.stock}" />
</rich:column>
+ <f:facet name="footer">
+ <rich:datascroller id="ds2"></rich:datascroller>
+ </f:facet>
</rich:dataTable>
</h:form>
<h:form>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml 2008-07-07 11:56:34 UTC (rev 9421)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml 2008-07-07 12:12:04 UTC (rev 9422)
@@ -11,7 +11,7 @@
</style>
<h:form>
<rich:dataTable value="#{capitalsBean.capitals}" var="cap" width="300px" columnClasses="center"
- rows="25">
+ rows="15" reRender="ds">
<f:facet name="header">
<h:outputText value="Sorting Example"/>
</f:facet>
@@ -33,6 +33,9 @@
</f:facet>
<h:outputText value="#{cap.timeZone}"/>
</rich:column>
+ <f:facet name="footer">
+ <rich:datascroller id="ds"></rich:datascroller>
+ </f:facet>
</rich:dataTable>
</h:form>
</ui:composition>
\ No newline at end of file
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r9421 - trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2008-07-07 07:56:34 -0400 (Mon, 07 Jul 2008)
New Revision: 9421
Added:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxHTMLCommandLinkTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxLoadBundleTest.java
Log:
Added: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxHTMLCommandLinkTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxHTMLCommandLinkTest.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxHTMLCommandLinkTest.java 2008-07-07 11:56:34 UTC (rev 9421)
@@ -0,0 +1,130 @@
+package org.richfaces.testng;
+
+import org.ajax4jsf.template.Template;
+import org.richfaces.RichSeleniumTest;
+import org.richfaces.SeleniumTestBase;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+
+public class AjaxHTMLCommandLinkTest extends SeleniumTestBase implements RichSeleniumTest {
+
+ public AjaxHTMLCommandLinkTest() {
+ super("http", "localhost", serverPort);
+ }
+
+ /**
+ * This method are invoking before selenium tests started
+ */
+ @BeforeMethod
+ @Parameters({"browser", "filterPrefix"})
+ public void startSelenium(String browser, String filterPrefix) {
+ super.startSelenium(browser, filterPrefix);
+ }
+
+
+ @BeforeMethod
+ @Parameters({"loadStyleStrategy", "loadScriptStrategy"})
+ protected void loadConfiguration(String loadStyleStrategy, String loadScriptStrategy) throws Exception {
+ super.loadConfiguration(loadStyleStrategy, loadScriptStrategy);
+ }
+
+ /**
+ * This method are invoking after selenium tests completed
+ */
+ @AfterMethod(alwaysRun=true)
+ public void stopSelenium() {
+ super.stopSelenium();
+ }
+
+ @Test
+ public void testAjaxCommandLinkComponent() throws Exception {
+ _testAjaxCommandLinkComponent(Template.SIMPLE);
+ _testAjaxCommandLinkComponent(Template.DATA_TABLE);
+ _testAjaxCommandLinkComponent(Template.MODAL_PANEL);
+ }
+
+ private void _testAjaxCommandLinkComponent(Template template) {
+ renderPage(template);
+
+ String parentId = getParentId() + "_form:";
+
+ String linkId = parentId + "l1";
+ boolean immediate = false;
+ writeStatus("Click link 1");
+ setValidation(true);
+ clickById(linkId);
+ waitForAjaxCompletion();
+ waitForOnCompleteHndler();
+ checkButton(linkId, true, immediate, true, true, true);
+
+ linkId = parentId + "l2";
+ immediate = false;
+ writeStatus("Click link 2");
+ setValidation(false);
+ clickById(linkId);
+ waitForAjaxCompletion();
+ waitForOnCompleteHndler();
+ checkButton(linkId, false, immediate, false, false, false);
+
+ linkId = parentId + "l3";
+ immediate = true;
+ writeStatus("Click link 3");
+ setValidation(true);
+ clickById(linkId);
+ waitForAjaxCompletion();
+ waitForOnCompleteHndler();
+ checkButton(linkId, true, immediate, true, true, false);
+
+ linkId = parentId + "l4";
+ immediate = true;
+ writeStatus("Click link 4");
+ setValidation(false);
+ clickById(linkId);
+ waitForAjaxCompletion();
+ waitForOnCompleteHndler();
+ checkButton(linkId, true, immediate, true, true, false);
+
+
+ }
+
+ private void setValidation(boolean success) {
+ StringBuffer buffer = new StringBuffer("setValidation(");
+ buffer.append(success);
+ buffer.append(");");
+ runScript(buffer.toString());
+ }
+
+ private void waitForOnCompleteHndler () {
+ waiteForCondition("_onCompleteHandler == true;", 3000);
+ runScript("_onCompleteHandler = false;");
+ }
+
+ private void checkButton(String id, boolean testData, boolean immediate, boolean testAction, boolean testFListener, boolean testInput) {
+ writeStatus("Checking link...");
+ StringBuffer buffer = new StringBuffer("checkLink('");
+ buffer.append(id);
+ buffer.append("',");
+ buffer.append(testData);
+ buffer.append(",");
+ buffer.append(testAction);
+ buffer.append(",");
+ buffer.append(testFListener);
+ buffer.append(",");
+ buffer.append(testInput);
+ buffer.append(");");
+ String result = runScript(buffer.toString());
+ if (result != null && result.length() > 0) {
+ Assert.fail("<a4j:htmlCommandLink> [immediate="+immediate+"] test failure caused by " + result);
+ }
+
+ }
+
+ public String getTestUrl() {
+ return "pages/ajaxHTMLCommandLink/ajaxHTMLLinkTest.xhtml";
+ }
+
+}
Property changes on: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxHTMLCommandLinkTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxLoadBundleTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxLoadBundleTest.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxLoadBundleTest.java 2008-07-07 11:56:34 UTC (rev 9421)
@@ -0,0 +1,44 @@
+package org.richfaces.testng;
+
+import junit.framework.Assert;
+
+import org.ajax4jsf.template.Template;
+import org.richfaces.SeleniumTestBase;
+import org.testng.annotations.Test;
+
+public class AjaxLoadBundleTest extends SeleniumTestBase {
+ private static final String URL = "pages/loadBundle/loadBundle.xhtml";
+ private static final String BUTTON_ID = "b1";
+ private static final String SAMPLE_MESSAGE = "Error was occured.";
+ private final static String FORM_ID = "form:";
+ private final static String FIRST_LINK_ID = FORM_ID + "error";
+ private final static String SECOND_LINK_ID = FORM_ID + "_link";
+
+ /**
+ * @see org.richfaces.SeleniumTestBase#getTestUrl()
+ */
+ @Override
+ public String getTestUrl() {
+ return URL;
+ }
+
+ @Test(dataProvider = "templates")
+ public void testAjaxMediaOutput(Template template) throws Exception {
+ renderPage(template);
+ writeStatus("Testing loadBundle component");
+ String textId = getParentId() + FIRST_LINK_ID;
+ AssertPresent(textId);
+ AssertNotPresent(getParentId() + SECOND_LINK_ID);
+ Assert.assertEquals(getTextById(textId), SAMPLE_MESSAGE);
+ }
+
+ @Test(dataProvider = "templates")
+ public void testAjaxReRender(Template template) throws Exception {
+ renderPage(template);
+ writeStatus("Testing loadBundle component after ajax rerender");
+ String buttonId = getParentId() + FORM_ID + BUTTON_ID;
+ clickById(buttonId);
+ waitForAjaxCompletion();
+ AssertPresent(getParentId() + SECOND_LINK_ID);
+ }
+}
Property changes on: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxLoadBundleTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r9420 - in trunk/test-applications/seleniumTest: src/main/webapp/pages and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2008-07-07 07:55:10 -0400 (Mon, 07 Jul 2008)
New Revision: 9420
Added:
trunk/test-applications/seleniumTest/src/main/webapp/pages/loadBundle/
trunk/test-applications/seleniumTest/src/main/webapp/pages/loadBundle/loadBundle.xhtml
Modified:
trunk/test-applications/seleniumTest/
Log:
Modify selenium tests
Property changes on: trunk/test-applications/seleniumTest
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
+ .classpath
.project
.settings
target
test-output
Added: trunk/test-applications/seleniumTest/src/main/webapp/pages/loadBundle/loadBundle.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/src/main/webapp/pages/loadBundle/loadBundle.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r9419 - in trunk/test-applications/jsp/src/main: java/dataOrderedList and 70 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-07-07 03:05:31 -0400 (Mon, 07 Jul 2008)
New Revision: 9419
Modified:
trunk/test-applications/jsp/src/main/java/dataDefinitionList/DataDefinitionList.java
trunk/test-applications/jsp/src/main/java/dataOrderedList/DataOrderedList.java
trunk/test-applications/jsp/src/main/java/dataScroller/Data.java
trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java
trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java
trunk/test-applications/jsp/src/main/java/ddMenu/DDMenu.java
trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java
trunk/test-applications/jsp/src/main/java/dnd/DndBean.java
trunk/test-applications/jsp/src/main/java/effect/Effect.java
trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java
trunk/test-applications/jsp/src/main/java/gmap/Gmap.java
trunk/test-applications/jsp/src/main/java/hotKey/HotKey.java
trunk/test-applications/jsp/src/main/java/inplaceInput/InplaceInput.java
trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java
trunk/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java
trunk/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java
trunk/test-applications/jsp/src/main/java/insert/Insert.java
trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java
trunk/test-applications/jsp/src/main/java/message/Message.java
trunk/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java
trunk/test-applications/jsp/src/main/java/orderingList/OrderingList.java
trunk/test-applications/jsp/src/main/java/paint2D/Paint2D.java
trunk/test-applications/jsp/src/main/java/panel/Panel.java
trunk/test-applications/jsp/src/main/java/panelBar/PanelBar.java
trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java
trunk/test-applications/jsp/src/main/java/pickList/PickList.java
trunk/test-applications/jsp/src/main/java/progressBar/ProgressBar.java
trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java
trunk/test-applications/jsp/src/main/java/sb/Sb.java
trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java
trunk/test-applications/jsp/src/main/java/separator/Separator.java
trunk/test-applications/jsp/src/main/java/spacer/Spacer.java
trunk/test-applications/jsp/src/main/java/tabPanel/TabPanel.java
trunk/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java
trunk/test-applications/jsp/src/main/java/toolBar/ToolBar.java
trunk/test-applications/jsp/src/main/java/tooltip/Tooltip.java
trunk/test-applications/jsp/src/main/java/tree/Bean.java
trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionList.jsp
trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.jsp
trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp
trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.jsp
trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp
trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedListProperty.jsp
trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp
trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp
trunk/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp
trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp
trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp
trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp
trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp
trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp
trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp
trunk/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp
trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp
trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp
trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInputProperty.jsp
trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelectProperty.jsp
trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp
trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp
trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp
trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp
trunk/test-applications/jsp/src/main/webapp/Insert/Insert.jsp
trunk/test-applications/jsp/src/main/webapp/Insert/InsertProperty.jsp
trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp
trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp
trunk/test-applications/jsp/src/main/webapp/Message/Message.jsp
trunk/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp
trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp
trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp
trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListProperty.jsp
trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp
trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp
trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp
trunk/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp
trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp
trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp
trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp
trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp
trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp
trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp
trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp
trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp
trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp
trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp
trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp
trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp
trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp
trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp
trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp
trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp
trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp
trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp
trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBarProperty.jsp
trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp
trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp
trunk/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/java/dataDefinitionList/DataDefinitionList.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dataDefinitionList/DataDefinitionList.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/dataDefinitionList/DataDefinitionList.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -2,6 +2,9 @@
import java.util.ArrayList;
+import org.richfaces.component.html.HtmlDataDefinitionList;
+
+import util.componentInfo.ComponentInfo;
import util.data.Data;
public class DataDefinitionList
@@ -13,7 +16,21 @@
private String title;
private String dir;
private int mSize;
+ private HtmlDataDefinitionList htmlDataDefinitionList = null;
+ public HtmlDataDefinitionList getHtmlDataDefinitionList() {
+ return htmlDataDefinitionList;
+ }
+
+ public void setHtmlDataDefinitionList(HtmlDataDefinitionList htmlDataDefinitionList){
+ this.htmlDataDefinitionList = htmlDataDefinitionList;
+ }
+
+ public void addHtmlDataDefinitionList(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlDataDefinitionList);
+ }
+
public String getDir() {
return dir;
}
Modified: trunk/test-applications/jsp/src/main/java/dataOrderedList/DataOrderedList.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dataOrderedList/DataOrderedList.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/dataOrderedList/DataOrderedList.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -2,6 +2,9 @@
import java.util.ArrayList;
+import org.richfaces.component.html.HtmlDataOrderedList;
+
+import util.componentInfo.ComponentInfo;
import util.data.Data;
public class DataOrderedList
@@ -15,7 +18,21 @@
private String dir;
private int mSize;
private ArrayList defaultArr;
+ private HtmlDataOrderedList htmlDataOrderedList = null;
+
+ public void addHtmlDataOrderedList(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlDataOrderedList);
+ }
+ public HtmlDataOrderedList getHtmlDataOrderedList() {
+ return htmlDataOrderedList;
+ }
+
+ public void setHtmlDataOrderedList(HtmlDataOrderedList htmlDataOrderedList){
+ this.htmlDataOrderedList = htmlDataOrderedList;
+ }
+
public String getDir() {
return dir;
}
Modified: trunk/test-applications/jsp/src/main/java/dataScroller/Data.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dataScroller/Data.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/dataScroller/Data.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -8,6 +8,7 @@
public int data1;
public String data2;
public String data3;
+
public Data(String data0, int data1) {
this.data0 = data0;
Modified: trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -8,6 +8,7 @@
import org.richfaces.event.DataScrollerEvent;
import org.richfaces.model.Ordering;
+import util.componentInfo.ComponentInfo;
import util.data.Data;
public class DataScroller {
@@ -25,7 +26,7 @@
private String actionListener;
private boolean ajaxSingle = false;
private String boundaryControls = "auto";
- private HtmlDatascroller binding = null;
+ private HtmlDatascroller htmlDatascroller= null;
private String fastStep = "0";
private String page = "10";
private Object value = null;
@@ -35,8 +36,21 @@
private Ordering sortOrder;
private String filterValue;
private String currentSortOrder;
+
+ public HtmlDatascroller getHtmlDatascroller(){
+ return htmlDatascroller;
+ }
+
+ public void setHtmlDatascroller(HtmlDatascroller htmlDatascroller){
+ this.htmlDatascroller = htmlDatascroller;
+ }
+
+ public void addHtmlDatascroller(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlDatascroller);
+ }
- public String getSortMode() {
+ public String getSortMode() {
return sortMode;
}
@@ -282,20 +296,6 @@
}
/**
- * @return the binding
- */
- public HtmlDatascroller getBinding() {
- return binding;
- }
-
- /**
- * @param binding the binding to set
- */
- public void setBinding(HtmlDatascroller binding) {
- this.binding = binding;
- }
-
- /**
* @return the fastStep
*/
public String getFastStep() {
Modified: trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -5,6 +5,10 @@
import java.util.List;
import java.util.Properties;
+import javax.faces.component.html.HtmlDataTable;
+
+import util.componentInfo.ComponentInfo;
+
public class DataTable {
private static final String [] mNames={"Jan","Feb","Mar","Apr","May", "Jun", "Jul"};
@@ -22,7 +26,21 @@
private String rows;
private boolean r2rendered;
private boolean rendered;
+ private HtmlDataTable htmlDataTable = null;
+ public void addHtmlDataTable(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlDataTable);
+ }
+
+ public HtmlDataTable getHtmlDataTable() {
+ return htmlDataTable;
+ }
+
+ public void setHtmlDataTable(HtmlDataTable htmlDataTable) {
+ this.htmlDataTable = htmlDataTable;
+ }
+
public DataTable() {
columns = "2";
cellpadding = "0";
Modified: trunk/test-applications/jsp/src/main/java/ddMenu/DDMenu.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/ddMenu/DDMenu.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/ddMenu/DDMenu.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,9 +1,11 @@
package ddMenu;
-import java.awt.Event;
-
import javax.faces.event.ActionEvent;
+import org.richfaces.component.html.HtmlDropDownMenu;
+
+import util.componentInfo.ComponentInfo;
+
public class DDMenu {
private int hideDelay;
@@ -25,7 +27,21 @@
private boolean disabled;
private boolean disabledDDM;
private boolean check;
+ private HtmlDropDownMenu htmlDropDownMenu = null;
+
+ public void addHtmlDropDownMenu(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlDropDownMenu);
+ }
+ public HtmlDropDownMenu getHtmlDropDownMenu() {
+ return htmlDropDownMenu;
+ }
+
+ public void setHtmlDropDownMenu(HtmlDropDownMenu htmlDropDownMenu) {
+ this.htmlDropDownMenu = htmlDropDownMenu;
+ }
+
public DDMenu() {
selectMenu = "accord";
hideDelay = 0;
Modified: trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -21,9 +21,12 @@
package dfs;
+import org.richfaces.component.html.HtmlDataFilterSlider;
import org.richfaces.event.DataFilterSliderEvent;
+import util.componentInfo.ComponentInfo;
+
/**
* @author $Autor$
*
@@ -39,12 +42,26 @@
private Integer increment;
private String trailer;
private Integer handleValue;
+ private HtmlDataFilterSlider htmlDataFilterSlider = null;
// " storeResults="true"
// startRange="10000" endRange="60000" increment="10000"
// manualInput="true" width="400px"
// trailer="true" handleValue="10000"
-
+
+ public void addHtmlDataFilterSlider(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlDataFilterSlider);
+ }
+
+ public HtmlDataFilterSlider getHtmlDataFilterSlider(){
+ return htmlDataFilterSlider;
+ }
+
+ public void setHtmlDataFilterSlider(HtmlDataFilterSlider htmlDataFilterSlider){
+ this.htmlDataFilterSlider = htmlDataFilterSlider;
+ }
+
public DemoSliderBean() {
rendered = true;
action = "---";
Modified: trunk/test-applications/jsp/src/main/java/dnd/DndBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dnd/DndBean.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/dnd/DndBean.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -6,11 +6,16 @@
import javax.faces.event.ActionEvent;
+import org.richfaces.component.html.HtmlDragIndicator;
+import org.richfaces.component.html.HtmlDragSupport;
+import org.richfaces.component.html.HtmlDropSupport;
import org.richfaces.event.DragEvent;
import org.richfaces.event.DropEvent;
+import util.componentInfo.ComponentInfo;
+
public class DndBean {
private List types = new ArrayList();
@@ -20,7 +25,41 @@
private String actionListenerDrop;
private String actionDrag;
private String actionListenerDrag;
+ private HtmlDropSupport htmlDropSupport = null;
+ private HtmlDragSupport htmlDragSupport = null;
+ private HtmlDragIndicator htmlDragIndicator = null;
+ public void addHtmlDnD(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlDropSupport);
+ info.addField(htmlDragSupport);
+ info.addField(htmlDragIndicator);
+ }
+
+ public HtmlDropSupport getHtmlDropSupport() {
+ return htmlDropSupport;
+ }
+
+ public void setHtmlDropSupport(HtmlDropSupport htmlDropSupport) {
+ this.htmlDropSupport = htmlDropSupport;
+ }
+
+ public HtmlDragSupport getHtmlDragSupport() {
+ return htmlDragSupport;
+ }
+
+ public void setHtmlDragSupport(HtmlDragSupport htmlDragSupport) {
+ this.htmlDragSupport = htmlDragSupport;
+ }
+
+ public HtmlDragIndicator getHtmlDragIndicator() {
+ return htmlDragIndicator;
+ }
+
+ public void setHtmlDragIndicator(HtmlDragIndicator htmlDragIndicator) {
+ this.htmlDragIndicator = htmlDragIndicator;
+ }
+
public DndBean() {
super();
Modified: trunk/test-applications/jsp/src/main/java/effect/Effect.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/effect/Effect.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/effect/Effect.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -21,11 +21,29 @@
package effect;
+import org.richfaces.component.html.HtmlEffect;
+
+import util.componentInfo.ComponentInfo;
+
public class Effect {
private double time;
private String stateName;
private boolean state;
+ private HtmlEffect htmlEffect = null;
+ public void addHtmlEffect(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlEffect);
+ }
+
+ public HtmlEffect getHtmlEffect() {
+ return htmlEffect;
+ }
+
+ public void setHtmlEffect(HtmlEffect htmlEffect) {
+ this.htmlEffect = htmlEffect;
+ }
+
public Effect() {
time = 1.4;
state = true;
Modified: trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -2,18 +2,19 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
-//import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-//import java.io.InputStream;
-import org.richfaces.component.html.HtmlFileUpload;
+
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
+import javax.faces.event.ValueChangeEvent;
+import org.richfaces.component.html.HtmlFileUpload;
import org.richfaces.event.UploadEvent;
import org.richfaces.model.UploadItem;
-import javax.faces.event.ValueChangeEvent;
+import util.componentInfo.ComponentInfo;
+
public class FileUpload {
private boolean disabled;
private boolean autoclear;
@@ -49,6 +50,11 @@
private boolean ajaxSingle;
private boolean immediate;
+ public void addHtmlFileUpload(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(myFileUpload);
+ }
+
public boolean isImmediate() {
return immediate;
}
Modified: trunk/test-applications/jsp/src/main/java/gmap/Gmap.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/gmap/Gmap.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/gmap/Gmap.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,5 +1,9 @@
package gmap;
+import org.richfaces.component.html.HtmlGmap;
+
+import util.componentInfo.ComponentInfo;
+
/**
* @author user
*
@@ -20,7 +24,21 @@
private String zoom;
private String locale;
private boolean rendered;
+ private HtmlGmap htmlGmap = null;
+
+ public void addHtmlGmap(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlGmap);
+ }
+ public HtmlGmap getHtmlGmap() {
+ return htmlGmap;
+ }
+
+ public void setHtmlGmap(HtmlGmap htmlGmap) {
+ this.htmlGmap = htmlGmap;
+ }
+
public Gmap() {
locale = "en";
zoom = "17";
Modified: trunk/test-applications/jsp/src/main/java/hotKey/HotKey.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/hotKey/HotKey.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/hotKey/HotKey.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -15,7 +15,6 @@
*
*/
public class HotKey {
- private HtmlHotKey binding = null;
private String bindingInfo = "";
private String handler = "alert('work')";
private String key = "alt+a";
@@ -25,18 +24,13 @@
private boolean rendered = true;
private boolean disableInInput = false;
private boolean checkParent = false;
+ private HtmlHotKey htmlHotKey = null;
- /**
- * @return the binding
- */
- public HtmlHotKey getBinding() {
- return binding;
+ public HtmlHotKey getHtmlHotKey() {
+ return htmlHotKey;
}
- /**
- * @param binding the binding to set
- */
- public void setBinding(HtmlHotKey binding) {
- this.binding = binding;
+ public void setHtmlHotKey(HtmlHotKey htmlHotKey) {
+ this.htmlHotKey = htmlHotKey;
}
/**
* @return the handler
@@ -138,7 +132,7 @@
* @return the bindingInfo
*/
public String getBindingInfo() {
- String b = binding.getClientId(FacesContext.getCurrentInstance());
+ String b = htmlHotKey.getClientId(FacesContext.getCurrentInstance());
if(b != null && b.length() != 0)
return "work";
return "don't work";
Modified: trunk/test-applications/jsp/src/main/java/inplaceInput/InplaceInput.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/inplaceInput/InplaceInput.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/inplaceInput/InplaceInput.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,10 +1,13 @@
package inplaceInput;
-import javax.faces.event.ValueChangeEvent;
-import org.richfaces.component.html.HtmlInplaceInput;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
+import javax.faces.event.ValueChangeEvent;
+import org.richfaces.component.html.HtmlInplaceInput;
+
+import util.componentInfo.ComponentInfo;
+
public class InplaceInput {
private String inputMaxLength;
private String inputWidth;
@@ -23,7 +26,7 @@
private boolean rendered;
private boolean immediate;
private String valueCL;
- private HtmlInplaceInput myInplaceInput = null;
+ private HtmlInplaceInput htmlInplaceInput = null;
private String bindLabel;
private String layout;
@@ -50,13 +53,18 @@
}
public HtmlInplaceInput getMyInplaceInput() {
- return myInplaceInput;
+ return htmlInplaceInput;
}
public void setMyInplaceInput(HtmlInplaceInput myInplaceInput) {
- this.myInplaceInput = myInplaceInput;
+ this.htmlInplaceInput = myInplaceInput;
}
+ public void addHtmlInplaceInput(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlInplaceInput);
+ }
+
public String getBindLabel() {
return bindLabel;
}
@@ -67,7 +75,7 @@
public void checkBinding(ActionEvent actionEvent){
FacesContext context = FacesContext.getCurrentInstance();
- bindLabel = myInplaceInput.getClientId(context);
+ bindLabel = htmlInplaceInput.getClientId(context);
}
public void valueChangeListener(ValueChangeEvent event){
Modified: trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,10 +1,13 @@
package inplaceSelect;
-import javax.faces.event.ValueChangeEvent;
-import org.richfaces.component.html.HtmlInplaceSelect;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
+import javax.faces.event.ValueChangeEvent;
+import org.richfaces.component.html.HtmlInplaceSelect;
+
+import util.componentInfo.ComponentInfo;
+
public class InplaceSelect {
private boolean applyFromControlsOnly;
private String controlsHorizontalPosition;
@@ -31,6 +34,11 @@
private String bindLabel;
private String layout;
+ public void addHtmlInplaceSelect(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(myInplaceSelect);
+ }
+
public InplaceSelect() {
valueCL = "---";
editEvent = "onclick";
Modified: trunk/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -2,6 +2,10 @@
import javax.faces.event.ValueChangeEvent;
+import org.richfaces.component.html.HtmlInputNumberSlider;
+
+import util.componentInfo.ComponentInfo;
+
public class InputNumberSlider {
private int inputSize;
@@ -28,7 +32,13 @@
private boolean rendered;
private boolean enableManualInput;
private boolean showBoundaryValues;
+ private HtmlInputNumberSlider htmlInputNumberSlider = null;
+ public void addHtmlInputNumberSlider(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlInputNumberSlider);
+ }
+
public InputNumberSlider() {
immediate = false;
rendered = false;
@@ -353,4 +363,12 @@
public String getValueChangeListener() {
return valueChangeListener;
}
+
+ public HtmlInputNumberSlider getHtmlInputNumberSlider() {
+ return htmlInputNumberSlider;
+ }
+
+ public void setHtmlInputNumberSlider(HtmlInputNumberSlider htmlInputNumberSlider) {
+ this.htmlInputNumberSlider = htmlInputNumberSlider;
+ }
}
Modified: trunk/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,5 +1,9 @@
package inputNumberSpinner;
+import org.richfaces.component.html.HtmlInputNumberSpinner;
+
+import util.componentInfo.ComponentInfo;
+
public class InputNumberSpinner {
// private String size;
@@ -17,6 +21,12 @@
private boolean disabled;
private boolean manualInput;
private boolean rendered;
+ private HtmlInputNumberSpinner htmlInputNumberSpinner = null;
+
+ public void addHtmlInputNumberSpinner(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlInputNumberSpinner);
+ }
public InputNumberSpinner() {
// size= "200";
@@ -218,4 +228,13 @@
setTabindex("5");
setValue("101");
}
+
+ public HtmlInputNumberSpinner getHtmlInputNumberSpinner() {
+ return htmlInputNumberSpinner;
+ }
+
+ public void setHtmlInputNumberSpinner(
+ HtmlInputNumberSpinner htmlInputNumberSpinner) {
+ this.htmlInputNumberSpinner = htmlInputNumberSpinner;
+ }
}
Modified: trunk/test-applications/jsp/src/main/java/insert/Insert.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/insert/Insert.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/insert/Insert.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,10 +1,28 @@
package insert;
+import org.richfaces.ui.component.html.HtmlInsert;
+
+import util.componentInfo.ComponentInfo;
+
public class Insert {
private String highlight;
private String src;
private boolean rendered;
+ private HtmlInsert htmlInsert = null;
+ public void addHtmlInsert(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlInsert);
+ }
+
+ public HtmlInsert getHtmlInsert() {
+ return htmlInsert;
+ }
+
+ public void setHtmlInsert(HtmlInsert htmlInsert) {
+ this.htmlInsert = htmlInsert;
+ }
+
public Insert() {
src = "/Insert/src/test.html";
rendered = true;
Modified: trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,8 +4,9 @@
import java.util.Collection;
import java.util.Iterator;
-import javax.faces.event.ValueChangeEvent;
+import org.richfaces.component.html.HtmlListShuttle;
+import util.componentInfo.ComponentInfo;
import util.data.Data;
public class ListShuttle {
@@ -39,7 +40,21 @@
private String listsHeight;
private String sourceCaptionLabel;
private String targetCaptionLabel;
+ private HtmlListShuttle htmlListShuttle = null;
+
+ public void addHtmlListShuttle(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlListShuttle);
+ }
+ public HtmlListShuttle getHtmlListShuttle() {
+ return htmlListShuttle;
+ }
+
+ public void setHtmlListShuttle(HtmlListShuttle htmlListShuttle) {
+ this.htmlListShuttle = htmlListShuttle;
+ }
+
public ListShuttle() {
this.first = 1;
this.lenght = 10;
Modified: trunk/test-applications/jsp/src/main/java/message/Message.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/message/Message.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/message/Message.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,5 +1,10 @@
package message;
+import javax.faces.component.html.HtmlMessage;
+import javax.faces.component.html.HtmlMessages;
+
+import util.componentInfo.ComponentInfo;
+
public class Message {
private String msg;
private String layout;
@@ -12,7 +17,31 @@
private String select3;
private String select4;
private String select5;
+ private HtmlMessage htmlMessage = null;
+ private HtmlMessages htmlMessages = null;
+ public void addHtmlMessages(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlMessage);
+ info.addField(htmlMessages);
+ }
+
+ public HtmlMessage getHtmlMessage() {
+ return htmlMessage;
+ }
+
+ public void setHtmlMessage(HtmlMessage htmlMessage) {
+ this.htmlMessage = htmlMessage;
+ }
+
+ public HtmlMessages getHtmlMessages() {
+ return htmlMessages;
+ }
+
+ public void setHtmlMessages(HtmlMessages htmlMessages) {
+ this.htmlMessages = htmlMessages;
+ }
+
public Message() {
msg = "select1";
layout = "table";
Modified: trunk/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,9 +1,12 @@
package modalPanel;
-import org.richfaces.component.html.HtmlModalPanel;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
+import org.richfaces.component.html.HtmlModalPanel;
+
+import util.componentInfo.ComponentInfo;
+
public class ModalPanel {
private boolean autosized;
private boolean keepVisualState;
@@ -24,7 +27,7 @@
private String selectOneListboxTest;
private String visualOptions;
private String bindLabel;
- private HtmlModalPanel myModalPanel;
+ private HtmlModalPanel htmlModalPanel;
public String getVisualOptions() {
@@ -71,12 +74,12 @@
this.zindex = 3;
this.showWhenRendered = false;
this.bindLabel = "not ready";
- this.myModalPanel = null;
+ this.htmlModalPanel = null;
}
public void checkBinding(ActionEvent actionEvent){
FacesContext context = FacesContext.getCurrentInstance();
- bindLabel = myModalPanel.getClientId(context);
+ bindLabel = htmlModalPanel.getClientId(context);
}
public int getHeight() {
@@ -254,10 +257,15 @@
}
public HtmlModalPanel getMyModalPanel() {
- return myModalPanel;
+ return htmlModalPanel;
}
public void setMyModalPanel(HtmlModalPanel myModalPanel) {
- this.myModalPanel = myModalPanel;
+ this.htmlModalPanel = myModalPanel;
}
+
+ public void add(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlModalPanel);
+ }
}
Modified: trunk/test-applications/jsp/src/main/java/orderingList/OrderingList.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/orderingList/OrderingList.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/orderingList/OrderingList.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,8 +4,9 @@
import java.util.Collection;
import java.util.Iterator;
-import javax.faces.component.html.HtmlDataTable;
+import org.richfaces.component.html.HtmlOrderingList;
+import util.componentInfo.ComponentInfo;
import util.data.Data;
public class OrderingList{
@@ -30,7 +31,21 @@
private boolean facet;
private boolean showAllData;
private boolean showSelect;
+ private HtmlOrderingList htmlOrderingList = null;
+ public void addHtmlOrderingList(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlOrderingList);
+ }
+
+ public HtmlOrderingList getHtmlOrderingList() {
+ return htmlOrderingList;
+ }
+
+ public void setHtmlOrderingList(HtmlOrderingList htmlOrderingList) {
+ this.htmlOrderingList = htmlOrderingList;
+ }
+
public boolean isFacet() {
return facet;
}
Modified: trunk/test-applications/jsp/src/main/java/paint2D/Paint2D.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/paint2D/Paint2D.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/paint2D/Paint2D.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -13,6 +13,10 @@
import java.awt.Font;
import java.awt.Graphics2D;
+import org.richfaces.component.html.HtmlPaint2D;
+
+import util.componentInfo.ComponentInfo;
+
public class Paint2D {
private static float location = 150;
@@ -30,7 +34,21 @@
private boolean cacheable;
private boolean rendered;
private boolean style;
+ private HtmlPaint2D htmlPaint2D = null;
+ public void addHtmlPaint2D(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlPaint2D);
+ }
+
+ public HtmlPaint2D getHtmlPaint2D() {
+ return htmlPaint2D;
+ }
+
+ public void setHtmlPaint2D(HtmlPaint2D htmlPaint2D) {
+ this.htmlPaint2D = htmlPaint2D;
+ }
+
public boolean isRerender() {
return rendered;
}
Modified: trunk/test-applications/jsp/src/main/java/panel/Panel.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/panel/Panel.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/panel/Panel.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -2,14 +2,32 @@
import javax.faces.event.ValueChangeEvent;
+import org.richfaces.component.html.HtmlPanel;
+
+import util.componentInfo.ComponentInfo;
+
public class Panel {
private boolean rendered;
private String width;
private String height;
- private String[] title ;
+ private String[] title;
+ private HtmlPanel htmlPanel = null;
+
+ public void addHtmlPanel(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlPanel);
+ }
+ public HtmlPanel getHtmlPanel() {
+ return htmlPanel;
+ }
+
+ public void setHtmlPanel(HtmlPanel htmlPanel) {
+ this.htmlPanel = htmlPanel;
+ }
+
public Panel() {
rendered = false;
width = "350px";
Modified: trunk/test-applications/jsp/src/main/java/panelBar/PanelBar.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/panelBar/PanelBar.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/panelBar/PanelBar.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,11 +1,12 @@
package panelBar;
-import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
import javax.faces.event.ValueChangeEvent;
-import javax.faces.event.ActionEvent;
+
import org.richfaces.component.html.HtmlPanelBar;
-import javax.faces.application.Application;
+import util.componentInfo.ComponentInfo;
+
public class PanelBar {
private String width;
@@ -20,6 +21,11 @@
private boolean rendered;
+ public void addHtmlPanelBar(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(panelBar);
+ }
+
public PanelBar() {
height = "300px";
Modified: trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,13 +1,13 @@
package panelMenu;
-import util.icon.Icon;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+
import org.richfaces.component.html.HtmlPanelMenu;
-import com.sun.facelets.FaceletContext;
+import util.componentInfo.ComponentInfo;
+import util.icon.Icon;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-
public class PanelMenu {
private HtmlPanelMenu myPanelMenu;
@@ -27,6 +27,11 @@
private boolean disabled;
private boolean expandSingle;
+ public void addHtmlPanelMenu(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(myPanelMenu);
+ }
+
public PanelMenu() {
myPanelMenu = new HtmlPanelMenu();
bindingStatus = "Ready";
Modified: trunk/test-applications/jsp/src/main/java/pickList/PickList.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/pickList/PickList.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/pickList/PickList.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,17 +1,16 @@
package pickList;
import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.richfaces.component.html.HtmlPickList;
+
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
-
import javax.faces.event.ValueChangeEvent;
import javax.faces.model.SelectItem;
-import util.data.Data;
+import org.richfaces.component.html.HtmlPickList;
+import util.componentInfo.ComponentInfo;
+
public class PickList {
public String copyAllControlLabel;
public String copyControlLabel;
@@ -37,6 +36,11 @@
private HtmlPickList myPickList = null;
private String bindLabel;
+ public void addHtmlPickList(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(myPickList);
+ }
+
public PickList() {
this.copyAllControlLabel = "copyAllControlLabel";
this.copyControlLabel = "copyControlLabel";
Modified: trunk/test-applications/jsp/src/main/java/progressBar/ProgressBar.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/progressBar/ProgressBar.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/progressBar/ProgressBar.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -2,6 +2,9 @@
import javax.faces.event.ActionEvent;
+import org.richfaces.component.html.HtmlProgressBar;
+
+import util.componentInfo.ComponentInfo;
import util.data.Data;
public class ProgressBar {
@@ -19,7 +22,21 @@
private boolean ignoreDupResponses;
private boolean permanent;
private boolean immediate;
+ private HtmlProgressBar htmlProgressBar = null;
+ public HtmlProgressBar getHtmlProgressBar() {
+ return htmlProgressBar;
+ }
+
+ public void setHtmlProgressBar(HtmlProgressBar htmlProgressBar) {
+ this.htmlProgressBar = htmlProgressBar;
+ }
+
+ public void addHtmlProgressBar(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlProgressBar);
+ }
+
public boolean isIgnoreDupResponses() {
return ignoreDupResponses;
}
Modified: trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -2,6 +2,10 @@
import javax.faces.event.ActionEvent;
+import org.richfaces.component.html.HtmlSimpleTogglePanel;
+
+import util.componentInfo.ComponentInfo;
+
public class SimpleTogglePanel {
private String switchType; // "client", "server"(default), "ajax"
@@ -12,7 +16,21 @@
private boolean rendered;
private String action;
private String actionListener;
+ private HtmlSimpleTogglePanel htmlSimpleTogglePanel = null;
+ public void addHtmlSimpleTogglePanel(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlSimpleTogglePanel);
+ }
+
+ public HtmlSimpleTogglePanel getHtmlSimpleTogglePanel() {
+ return htmlSimpleTogglePanel;
+ }
+
+ public void setHtmlSimpleTogglePanel(HtmlSimpleTogglePanel htmlSimpleTogglePanel) {
+ this.htmlSimpleTogglePanel = htmlSimpleTogglePanel;
+ }
+
public SimpleTogglePanel() {
width = "75%";
height = "100%";
Modified: trunk/test-applications/jsp/src/main/java/sb/Sb.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/sb/Sb.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/sb/Sb.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -11,6 +11,8 @@
import org.richfaces.component.html.HtmlSuggestionBox;
import org.richfaces.renderkit.html.SuggestionBoxRenderer;
+import util.componentInfo.ComponentInfo;
+
public class Sb implements Serializable {
private ArrayList cities;
@@ -67,7 +69,10 @@
private static final String[] cityCaribbean = {"The Caribbean", "Anguilla", "Antigua and Barbuda", "Aruba", "Barbados", "British Virgin Islands", "Cayman Islands", "Cuba", "Dominica", "Dominican Republic", "Grenada", "Guadeloupe", "Haiti", "Jamaica", "Martinique", "Montserrat", "Navassa Island", "Netherlands Antilles", "Puerto Rico", "Saint Barthelemy", "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", "The Bahamas", "Trinidad and Tobago", "Turks and Caicos Islands", "Virgin Islands"};
-
+ public void addHtmlSuggestionBox(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(mySuggestionBox);
+ }
public Sb() {
ignoreDupResponses = true;
Modified: trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,8 +4,10 @@
import java.util.GregorianCalendar;
import org.ajax4jsf.model.DataComponentState;
+import org.richfaces.component.html.HtmlScrollableDataTable;
import org.richfaces.model.selection.Selection;
+import util.componentInfo.ComponentInfo;
import util.data.Data;
/**
@@ -35,7 +37,22 @@
private Selection selection;
private boolean ajaxSingle;
private GregorianCalendar date;
+ private HtmlScrollableDataTable htmlScrollableDataTable = null;
+
+ public void addHtmlScrollableDataTable(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlScrollableDataTable);
+ }
+
+ public HtmlScrollableDataTable getHtmlScrollableDataTable() {
+ return htmlScrollableDataTable;
+ }
+ public void setHtmlScrollableDataTable(
+ HtmlScrollableDataTable htmlScrollableDataTable) {
+ this.htmlScrollableDataTable = htmlScrollableDataTable;
+ }
+
public GregorianCalendar getDate() {
return date;
}
Modified: trunk/test-applications/jsp/src/main/java/separator/Separator.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/separator/Separator.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/separator/Separator.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,5 +1,9 @@
package separator;
+import org.richfaces.component.html.HtmlSeparator;
+
+import util.componentInfo.ComponentInfo;
+
public class Separator {
@@ -11,10 +15,13 @@
private String align;
private String btnLabel="ON";
private String style;
-
+ private HtmlSeparator htmlSeparator = null;
private boolean rendered;
-
+ public void addHtmlSeparator(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlSeparator);
+ }
public String getBtnLabel() {
return btnLabel;
Modified: trunk/test-applications/jsp/src/main/java/spacer/Spacer.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/spacer/Spacer.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/spacer/Spacer.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,5 +1,9 @@
package spacer;
+import org.richfaces.component.html.HtmlSpacer;
+
+import util.componentInfo.ComponentInfo;
+
public class Spacer {
private String width;
@@ -8,7 +12,21 @@
private String btn;
private String title;
private boolean rendered;
+ private HtmlSpacer htmlSpacer = null;
+
+ public void addHtmlSpacer(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlSpacer);
+ }
+
+ public HtmlSpacer getHtmlSpacer() {
+ return htmlSpacer;
+ }
+ public void setHtmlSpacer(HtmlSpacer htmlSpacer) {
+ this.htmlSpacer = htmlSpacer;
+ }
+
public Spacer() {
title = "title text";
height = "50px";
Modified: trunk/test-applications/jsp/src/main/java/tabPanel/TabPanel.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/tabPanel/TabPanel.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/tabPanel/TabPanel.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,5 +1,10 @@
package tabPanel;
+import org.richfaces.component.html.HtmlTab;
+import org.richfaces.component.html.HtmlTabPanel;
+
+import util.componentInfo.ComponentInfo;
+
public class TabPanel {
private String width;
@@ -18,11 +23,17 @@
private String contentStyle;
private String BtnLabel="ON";
private boolean immediate;
-
-
+ private HtmlTabPanel htmlTabPanel = null;
+ private HtmlTab htmlTab = null;
private boolean rendered;
private boolean disabledTab;
+ public void addHtmlTabPanel(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlTabPanel);
+ info.addField(htmlTab);
+ }
+
public TabPanel() {
width="75%";
height="200px";
Modified: trunk/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,12 +1,20 @@
package togglePanel;
+import org.richfaces.component.html.HtmlTogglePanel;
+
+import util.componentInfo.ComponentInfo;
+
public class TogglePanel {
private String initialState;
private String stateOrder;
private String switchType;
-
+ private HtmlTogglePanel htmlTogglePanel = null;
+ public void addHtmlTogglePanel(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlTogglePanel);
+ }
public TogglePanel() {
initialState="asus";
Modified: trunk/test-applications/jsp/src/main/java/toolBar/ToolBar.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/toolBar/ToolBar.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/toolBar/ToolBar.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,19 +1,36 @@
package toolBar;
+import org.richfaces.component.html.HtmlToolBar;
+
+import util.componentInfo.ComponentInfo;
+
public class ToolBar {
private String width;
private String height;
private String itemSeparator;//none, line, square, disc and grid
private String location;//A location of a group on a menu bar. Possible values are left and right
-
+ private HtmlToolBar htmlToolBar = null;
private String contentStyle;
private String separatorStyle;
private String btnLabel="ON";
private boolean rendered;
+ public void addHtmlToolBar(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlToolBar);
+ }
-
+ public HtmlToolBar getHtmlToolBar() {
+ return htmlToolBar;
+ }
+
+
+ public void setHtmlToolBar(HtmlToolBar htmlToolBar) {
+ this.htmlToolBar = htmlToolBar;
+ }
+
+
public ToolBar() {
rendered=true;
width="75%";
Modified: trunk/test-applications/jsp/src/main/java/tooltip/Tooltip.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/tooltip/Tooltip.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/tooltip/Tooltip.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,5 +1,9 @@
package tooltip;
+import org.richfaces.component.html.HtmlToolTip;
+
+import util.componentInfo.ComponentInfo;
+
public class Tooltip {
private boolean followMouse;
@@ -16,7 +20,13 @@
private String style;
private String layout;
private String event;
-
+ private HtmlToolTip htmlToolTip = null;
+
+ public void addHtmlToolTip(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlToolTip);
+ }
+
public String getEvent() {
return event;
}
Modified: trunk/test-applications/jsp/src/main/java/tree/Bean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/tree/Bean.java 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/java/tree/Bean.java 2008-07-07 07:05:31 UTC (rev 9419)
@@ -1,11 +1,9 @@
package tree;
import java.io.IOException;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.Set;
import javax.faces.FacesException;
import javax.faces.component.UIComponent;
@@ -15,6 +13,7 @@
import org.ajax4jsf.context.AjaxContext;
import org.richfaces.component.UITree;
import org.richfaces.component.UITreeNode;
+import org.richfaces.component.html.HtmlTree;
import org.richfaces.component.xml.XmlTreeDataBuilder;
import org.richfaces.event.DropEvent;
import org.richfaces.event.NodeExpandedEvent;
@@ -26,6 +25,8 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import util.componentInfo.ComponentInfo;
+
public class Bean {
private String switchType = "client";
private TreeNode data;
@@ -46,6 +47,10 @@
private Boolean adviseNodeSelected;
private Boolean adviseNodeOpened;
+ public void addHtmlTree(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(tree);
+ }
public Bean() {
try {
FacesContext context = FacesContext.getCurrentInstance();
Modified: trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionList.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionList.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionList.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,7 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="dataDefinitionListSubviewID">
- <rich:dataDefinitionList id="ddListID" value="#{dataDefinitionList.arr}" var="arr" first="#{dataDefinitionList.first}"
+ <rich:dataDefinitionList id="ddListID" binding="#{dataDefinitionList.htmlDataDefinitionList}" value="#{dataDefinitionList.arr}" var="arr" first="#{dataDefinitionList.first}"
rendered="#{dataDefinitionList.rendered}" title="#{dataDefinitionList.title}" dir="#{dataDefinitionList.dir}"
rows="#{dataDefinitionList.rows}" style="#{style.style}" styleClass="#{style.styleClass}" columnClasses="#{style.columnClasses}" rowClasses="#{style.rowClasses}">
<f:facet name="header">
Modified: trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,8 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="dataDefinitionListPropertySubviewID">
+
+ <h:commandButton value="add test" action="#{dataDefinitionList.addHtmlDataDefinitionList}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="title" />
<h:inputText value="#{dataDefinitionList.title}">
Modified: trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -6,7 +6,7 @@
<f:subview id="dataFilterSliderSubviewID">
<rich:dataFilterSlider sliderListener="#{dfs.doSlide}" action="#{dfs.act}" actionListener="#{dfs.actListener}"
- rendered="#{dfs.rendered}" binding="#{inventoryList.dataFilterSlider}"
+ rendered="#{dfs.rendered}" binding="#{dfs.htmlDataFilterSlider}"
for="carList" forValRef="inventoryList.carInventory"
filterBy="getMileage"
styleClass="#{style.styleClass}" rangeStyleClass="#{style.rangeStyleClass}" trailerStyleClass="#{style.trailerStyleClass}" style="#{style.style}" fieldStyleClass="#{style.fieldStyleClass}" trackStyleClass="#{style.trackStyleClass}" handleStyleClass="#{style.handleStyleClass}"
Modified: trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="dataFilterSliderPropertySubviewID">
+<h:commandButton value="add test" action="#{dfs.addHtmlCalendar}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="Rendered:" />
<h:selectBooleanCheckbox value="#{dfs.rendered}" >
Modified: trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,7 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="dataOrderedListSubviewID">
- <rich:dataOrderedList id="doListID" value="#{dataOrderedList.arr}" var="arr" first="#{dataOrderedList.first}"
+ <rich:dataOrderedList id="doListID" binding="#{dataOrderedList.htmlDataOrderedList}" value="#{dataOrderedList.arr}" var="arr" first="#{dataOrderedList.first}"
rendered="#{dataOrderedList.rendered}" title="#{dataOrderedList.title}" type="#{dataOrderedList.type}" dir="#{dataOrderedList.dir}"
rows="#{dataOrderedList.rows}"
footerClass="#{style.footerClass}" headerClass="#{style.headerClass}" rowClasses="#{style.rowClasses}" style="#{style.style}" styleClass="#{style.styleClass}" >
Modified: trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedListProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedListProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedListProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="dataOrderedListPropertySubviewID">
+<h:commandButton value="add test" action="#{dataOrderedList.addHtmlDataOrderedList}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="title" />
<h:inputText value="#{dataOrderedList.title}" >
Modified: trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -10,7 +10,7 @@
<f:facet name="header">
<rich:datascroller ajaxSingle="#{dataScroller.ajaxSingle}"
boundaryControls="#{dataScroller.boundaryControls}"
- binding="#{dataScroller.binding}" data="datascrData" fastStep="#{dataScroller.fastStep}" id="dsID"
+ binding="#{dataScroller.htmlDatascroller}" data="datascrData" fastStep="#{dataScroller.fastStep}" id="dsID"
page="#{dataScroller.page}" pagesVar="pages" pageIndexVar="index"
value="#{dataScroller.value}" status="a4jStatusID" stepControls="#{dataScroller.stepControls}"
eventsQueue="eventsQueue" inactiveStyle="#{style.inactiveStyle}" inactiveStyleClass="#{style.inactiveStyleClass}" selectedStyle="#{style.selectedStyle}" selectedStyleClass="#{style.selectedStyleClass}" style="#{style.style}" styleClass="#{style.styleClass}" tableStyle="#{style.tableStyle}" tableStyleClass="#{style.tableStyleClass}"
Modified: trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -5,6 +5,7 @@
<f:subview id="datascrollerPropertySubviewID">
+ <h:commandButton value="add test" action="#{dataScroller.addHtmlDatascroller}"></h:commandButton>
<h:commandButton action="#{dataScroller.CutArray}" value="CutArray" />
<h:commandButton action="#{dataScroller.RestoreArray}"
value="RestoreArray" />
Modified: trunk/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -37,7 +37,7 @@
<f:verbatim>{marker} {nodeParam}({treeParam})</f:verbatim>
</f:facet>
</rich:dragIndicator>
- <rich:dataTable id="dataTableID" var="dataTableID" value="#{dataTable.mounths}" rowKeyVar="key"
+ <rich:dataTable id="dataTableID" binding="#{dataTable.htmlDataTable}" var="dataTableID" value="#{dataTable.mounths}" rowKeyVar="key"
captionClass="#{style.captionClass}" rowClasses="#{style.rowClasses}" headerClass="#{style.headerClass}" footerClass="#{style.footerClass}" styleClass="#{style.styleClass}" captionStyle="#{style.captionStyle}" columnClasses="#{style.columnClasses}"
onRowClick="#{event.onRowClick};alert('row #{key}');" rendered="#{dataTable.rendered}"
align="#{dataTable.align}" bgcolor="red" border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}"
Modified: trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="dataTablePropertySubviewID">
+ <h:commandButton value="add test" action="#{dataTable.addHtmlDataTable}"></h:commandButton>
<h:panelGrid columns="2" style="top">
<h:outputText value="Align:"></h:outputText>
<h:selectOneMenu value="#{dataTable.align}">
Modified: trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -22,7 +22,7 @@
<h:column>
<h:panelGrid styleClass="dropzoneDecoration" id="drag1">
<h:outputText value="#{type} - drag" />
- <rich:dragSupport dragType="dragType" dragValue="#{type} - value"
+ <rich:dragSupport dragType="dragType" binding="#{dndBean.htmlDragSupport}" dragValue="#{type} - value"
actionListener="#{dndBean.actListenerDrag}"
action="#{dndBean.dragAction}"
dragListener="#{dndBean.processDrag}"
@@ -39,7 +39,7 @@
<h:column>
<h:panelGrid styleClass="dropzoneDecoration" id="drop2">
<h:outputText value="#{type} - drop" />
- <rich:dropSupport reRender="dragValueText" id="dropSupportID"
+ <rich:dropSupport binding="#{dndBean.htmlDropSupport}" reRender="dragValueText" id="dropSupportID"
actionListener="#{dndBean.actListenerDrop}"
action="#{dndBean.dropAction}" acceptedTypes="#{type}"
dropListener="#{dndBean.processDrop}" dropValue="#{type} - value"
@@ -60,7 +60,7 @@
<h:outputText value="#{dndBean.actionListenerDrop}" />
</h:panelGrid>
</h:panelGrid>
- <rich:dragIndicator id="indicator" acceptClass="accept"
+ <rich:dragIndicator id="indicator" acceptClass="accept" binding="#{dndBean.htmlDragIndicator}"
rejectClass="reject" style="#{style.style}"
styleClass="#{style.styleClass}">
<f:facet name="single">
@@ -251,4 +251,5 @@
<h:outputText value="#{rich:findComponent('indicator').acceptClass}" />
</rich:column>
</h:panelGrid>
+<h:commandButton value="add test" action="#{dndBean.addHtmlDnD}"></h:commandButton>
</f:subview>
Modified: trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -7,7 +7,7 @@
<h:panelGrid columns="2">
<rich:spacer width="400px" height="400px"></rich:spacer>
<rich:panel>
- <rich:dropDownMenu id="ddmId" disabled="#{dDMenu.disabledDDM}" value="DropDownMenu" submitMode="#{dDMenu.mode}" hideDelay="#{dDMenu.hideDelay}"
+ <rich:dropDownMenu id="ddmId" binding="#{dDMenu.htmlDropDownMenu}" disabled="#{dDMenu.disabledDDM}" value="DropDownMenu" submitMode="#{dDMenu.mode}" hideDelay="#{dDMenu.hideDelay}"
direction="#{dDMenu.direction}" horizontalOffset="#{dDMenu.horizontalOffset}" jointPoint="#{dDMenu.jointPoint}"
popupWidth="#{dDMenu.popupWidth}" showDelay="#{dDMenu.showDelay}" rendered="#{dDMenu.rendered}"
verticalOffset="#{dDMenu.verticalOffset}" styleClass="#{style.styleClass}" style="#{style.style}" event="#{dDMenu.event}"
Modified: trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="dropDownMenuPropertySubviewID">
+ <h:commandButton value="add test" action="#{dDMenu.htmlDropDownMenu}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="HideDelay (ms):" />
<h:inputText value="#{dDMenu.hideDelay}">
Modified: trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -49,7 +49,9 @@
<rich:panel id="frm1">
<h:outputText value="JSF Components:" />
-
+
+ <h:commandButton value="add test" action="#{effect.addHtmlEffect}"></h:commandButton>
+
<h:panelGrid id="panGrID" columns="2">
<h:outputText value="Time:" />
<h:inputText value="#{effect.time}" />
@@ -92,7 +94,7 @@
<h:panelGroup id="form_1b_ID">
<h:inputText value="onmouse and onclick">
- <rich:effect event="onclick" type="Fold"
+ <rich:effect binding="#{effect.htmlEffect}" event="onclick" type="Fold"
params="duration:0.5,from:0.4,to:1.0" />
<rich:effect event="onmouseout" type="Highlight"
params="duration:0.5,from:1.0,to:0.4" />
Modified: trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -10,7 +10,7 @@
</style>
<f:subview id="FileUploadSubviewID">
<rich:fileUpload id="fileUploadID" status="a4jStatusID"
- onadd="#{event.onadd}" immediate="#{fileUpload.immediate}"
+ immediate="#{fileUpload.immediate}"
ajaxSingle="#{fileUpload.ajaxSingle}" uploadData="#{fileUpload.data}"
acceptedTypes="#{fileUpload.acceptedTypes}"
disabled="#{fileUpload.disabled}" autoclear="#{fileUpload.autoclear}"
@@ -54,7 +54,7 @@
stopControlLabel="stopControl"
stopEntryControlLabel="stopEntryControl"
transferErrorLabel="transferError" uploadControlLabel="uploadControl"
- allowFlash="#{fileUpload.allowFlash}">
+ >
<f:facet name="label">
<h:outputText value="{_KB}KB from {KB}KB uploaded :[ {mm}:{ss} ]"></h:outputText>
</f:facet>
@@ -72,7 +72,7 @@
</h:column>
</h:dataTable>
</h:panelGrid>
-
+<h:commandButton value="add test" action="#{fileUpload.addHtmlFileUpload}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="acceptedTypes"></h:outputText>
<h:inputText value="#{fileUpload.acceptedTypes}" onchange="submit();"></h:inputText>
Modified: trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,7 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="GmapSubviewID">
- <rich:gmap id="gMapID" locale="#{gmap.locale}" enableInfoWindow="#{gmap.enableInfoWindow}" mapType="#{gmap.mapType}" lng="#{gmap.lng}" lat="#{gmap.lat}"
+ <rich:gmap id="gMapID" binding="#{gmap.htmlGmap}" locale="#{gmap.locale}" enableInfoWindow="#{gmap.enableInfoWindow}" mapType="#{gmap.mapType}" lng="#{gmap.lng}" lat="#{gmap.lat}"
warningMessage="#{gmap.warningMessage}" rendered="#{gmap.rendered}" zoom="#{gmap.zoom}"
enableContinuousZoom="#{gmap.continuousZoom}" enableDoubleClickZoom="#{gmap.doubleClickZoom}" enableDragging="#{gmap.dragging}"
gmapVar="map" oninit="alert('init ...')" showGLargeMapControl="#{gmap.showGLargeMapControl}" showGMapTypeControl="#{gmap.showGMapTypeControl}"
Modified: trunk/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="GmapPropertySubviewID">
+<h:commandButton value="add test" action="#{gmap.addHtmlGmap}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="mapType"></h:outputText>
<h:selectOneMenu value="#{gmap.mapType}" onchange="submit();">
Modified: trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -9,7 +9,7 @@
<h:commandButton id="commandButtonID" onclick="return false;"
value="test select"></h:commandButton>
- <rich:hotKey id="hotKeyID" binding="#{hotKey.binding}"
+ <rich:hotKey id="hotKeyID" binding="#{hotKey.htmlHotKey}"
disableInInput="#{hotKey.disableInInput}" handler="#{hotKey.handler}"
key="#{hotKey.key}" rendered="#{hotKey.rendered}"
selector="#{hotKey.selector}" timing="#{hotKey.timing}" />
Modified: trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -64,7 +64,7 @@
onselect="#{event.onselect}"
onviewactivated="#{event.onviewactivated}"
onviewactivation="#{event.onviewactivation}"
- binding="#{inplaceInput.myInplaceInput}" >
+ binding="#{inplaceInput.htmlInplaceInput}" >
</rich:inplaceInput>
are easy to exploit.
Modified: trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInputProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInputProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInputProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="inplaceInputPropertySubviewID">
+<h:commandButton value="add test" action="#{inplaceInput.addHtmlInplaceInput}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="value"></h:outputText>
<h:outputText id="inplaceInputValueID" value="#{inplaceInput.value}">
Modified: trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelectProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelectProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/InplaceSelect/InplaceSelectProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,7 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="inplaceSelectPropertySubviewID">
-
+<h:commandButton value="add test" action="#{inplaceSelect.addHtmlInplaceSelect}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="value"></h:outputText>
<h:outputText value="#{inplaceSelect.value}"></h:outputText>
Modified: trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -5,7 +5,7 @@
<f:subview id="inputNumberSliderSubviewID">
<h:panelGrid columns="1">
- <rich:inputNumberSlider id="SliderId" barStyle="#{style.barStyle}" handleSelectedClass="#{style.handleSelectedClass}" inputStyle="#{style.inputStyle}" tipStyle="#{style.tipStyle}" style="#{style.style}" immediate="#{inputNumberSlider.immediate}"
+ <rich:inputNumberSlider binding="#{inputNumberSlider.htmlInputNumberSlider}" id="SliderId" barStyle="#{style.barStyle}" handleSelectedClass="#{style.handleSelectedClass}" inputStyle="#{style.inputStyle}" tipStyle="#{style.tipStyle}" style="#{style.style}" immediate="#{inputNumberSlider.immediate}"
inputPosition="#{inputNumberSlider.inputPosition}" showToolTip="#{inputNumberSlider.showToolTip}"
tabindex="#{inputNumberSlider.tabindex}" value="#{inputNumberSlider.value}" valueChangeListener="#{inputNumberSlider.valueChangeListener}"
required="#{inputNumberSlider.rendered}" requiredMessage="#{inputNumberSlider.requiredMessage}"
Modified: trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,8 +4,9 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="inputNumberSliderPropertySubviewID">
+ <h:commandButton value="add test" action="#{inputNumberSlider.addHtmlInputNumberSlider}"></h:commandButton>
+
<h:panelGrid columns="2" cellspacing="10px" border="1">
-
<h:outputText value="inputPosition"></h:outputText>
<h:selectOneRadio value="#{inputNumberSlider.inputPosition}">
<f:selectItem itemLabel="right" itemValue="right" />
Modified: trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -6,7 +6,7 @@
<f:subview id="inputNumberSpinnerSubviewID">
<h:messages></h:messages>
- <rich:inputNumberSpinner id="SpinnerID" tabindex="#{inputNumberSpinner.tabindex}" cycled="#{inputNumberSpinner.cycled}"
+ <rich:inputNumberSpinner id="SpinnerID" binding="#{inputNumberSpinner.htmlInputNumberSpinner}" tabindex="#{inputNumberSpinner.tabindex}" cycled="#{inputNumberSpinner.cycled}"
disabled="#{inputNumberSpinner.disabled}" maxValue="#{inputNumberSpinner.max}" minValue="#{inputNumberSpinner.min}"
step="#{inputNumberSpinner.step}" rendered="#{inputNumberSpinner.rendered}" value="#{inputNumberSpinner.value}"
inputClass="#{style.inputClass}" styleClass="#{style.styleClass}" inputStyle="#{style.inputStyle}" style="#{style.style}"
Modified: trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="iNSpinnerPropertySubviewID">
+<h:commandButton value="add test" action="#{inputNumberSpinner.addHtmlInputNumberSpinner}"></h:commandButton>
<h:panelGrid columns="2" cellpadding="10px" border="1">
<h:outputText value="Max: "></h:outputText>
<h:inputText value="#{inputNumberSpinner.max}">
Modified: trunk/test-applications/jsp/src/main/webapp/Insert/Insert.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Insert/Insert.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Insert/Insert.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -7,7 +7,7 @@
<h:messages />
<rich:panel id="panelID" header="Highlight: #{insert.highlight}; File: #{insert.src}">
- <rich:insert id="insertID" highlight="#{insert.highlight}"
+ <rich:insert id="insertID" binding="#{insert.htmlInsert}" highlight="#{insert.highlight}"
rendered="#{insert.rendered}" src="#{insert.src}"></rich:insert>
</rich:panel>
</f:subview>
Modified: trunk/test-applications/jsp/src/main/webapp/Insert/InsertProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Insert/InsertProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Insert/InsertProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="InsertPropertySubviewID">
+ <h:commandButton value="add test" action="#{insert.addHtmlInsert}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="Highlight:" />
<h:selectOneMenu value="#{insert.highlight}">
Modified: trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,7 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="listShuttleSubviewID">
- <rich:listShuttle id="listShuttleID" var="item"
+ <rich:listShuttle id="listShuttleID" var="item" binding="#{listShuttle.htmlListShuttle}"
sourceValue="#{listShuttle.sourceValue}" targetValue="#{listShuttle.targetValue}"
bottomControlLabel="#{listShuttle.bottomControlLabel}" copyAllControlLabel="#{listShuttle.copyAllControlLabel}"
copyControlLabel="#{listShuttle.copyControlLabel}" downControlLabel="#{listShuttle.downControlLabel}"
Modified: trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,8 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="listShuttlePropertySubviewID">
+ <h:commandButton value="add test" action="#{listShuttle.addHtmlListShuttle}"></h:commandButton>
+
<h:panelGrid columns="2">
<h:column></h:column>
<h:panelGroup>
Modified: trunk/test-applications/jsp/src/main/webapp/Message/Message.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Message/Message.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Message/Message.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -11,7 +11,7 @@
<br />
</f:verbatim>
- <rich:message for="#{message.msg}" tooltip="#{message.tooltip}" showDetail="#{message.showDetail}"
+ <rich:message for="#{message.msg}" binding="#{message.htmlMessage}" tooltip="#{message.tooltip}" showDetail="#{message.showDetail}"
showSummary="#{message.showSummary}" passedLabel="No Error" errorLabelClass="errorLabel" fatalLabelClass="warnLabel"
infoLabelClass="infoLabel" warnLabelClass="fatalLabel" title="#{message.title}" id="messageID">
@@ -40,7 +40,7 @@
<rich:separator></rich:separator>
<h:outputText value="Rich Messages Demo" />
- <rich:messages layout="#{message.layout}" id="messagesID" tooltip="#{message.tooltip}" showDetail="#{message.showDetail}"
+ <rich:messages binding="#{message.htmlMessages}" layout="#{message.layout}" id="messagesID" tooltip="#{message.tooltip}" showDetail="#{message.showDetail}"
showSummary="#{message.showSummary}" passedLabel="No Error" errorLabelClass="errorLabel" fatalLabelClass="warnLabel"
infoLabelClass="infoLabel" warnLabelClass="fatalLabel" warnMarkerClass="markerWarn" infoMarkerClass="markerInfo"
errorMarkerClass="markerError" fatalMarkerClass="markerFatal" errorClass="errorClass" fatalClass="fatalClass"
Modified: trunk/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="MessagePropertySubviewID">
+ <h:commandButton value="add test" action="#{message.addHtmlMessages}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="1." />
<h:selectOneMenu id="select1" value="#{message.select1}">
Modified: trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -27,6 +27,7 @@
</h:selectOneMenu>
<rich:modalPanel id="modalPanelID"
+ binding="#{modalPanel.htmlModalPanel}"
visualOptions="#{modalPanel.visualOptions}" left="#{modalPanel.left}"
top="#{modalPanel.top}" minHeight="#{modalPanel.minHeight}"
minWidth="#{modalPanel.minWidth}" height="#{modalPanel.height}"
Modified: trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -9,7 +9,7 @@
<h:messages />
</a4j:outputPanel>
- <rich:orderingList id="orderingListID" value="#{orderingList.list}" var="item" listHeight="#{orderingList.listHeight}"
+ <rich:orderingList id="orderingListID" binding="#{orderingList.htmlOrderingList}" value="#{orderingList.list}" var="item" listHeight="#{orderingList.listHeight}"
listWidth="#{orderingList.listWidth}" controlsType="#{orderingList.controlsType}" converter="dataConverter"
bottomControlLabel="#{orderingList.bottomControlLabel}" captionLabel="#{orderingList.captionLabel}"
topControlLabel="#{orderingList.topControlLabel}" upControlLabel="#{orderingList.upControlLabel}"
Modified: trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingListProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="orderingListPropertySubviewID">
+<h:commandButton value="add test" action="#{orderingList.addHtmlOrderingList}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="Enter quantity of lines" />
<h:panelGroup>
Modified: trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,7 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="paint2DSubviewID">
- <rich:paint2D id="paint2dID" cacheable="#{paint2D.cacheable}" paint="#{paint2D.paint}" data="#{paintData}" width="#{paint2D.width}" height="#{paint2D.height}"
+ <rich:paint2D id="paint2dID" binding="#{paint2D.htmlPaint2D}" cacheable="#{paint2D.cacheable}" paint="#{paint2D.paint}" data="#{paintData}" width="#{paint2D.width}" height="#{paint2D.height}"
align="#{paint2D.align}" hspace="#{paint2D.hspace}" vspace="#{paint2D.vspace}" bgcolor="#{paint2D.bgcolor}"
format="#{paint2D.format}" title="#{paint2D.title}" styleClass="#{paint2D.styleString}" border="#{paint2D.border}"
rendered="#{paint2D.rendered}" />
Modified: trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="Paint2DPropertySubviewID">
+ <h:commandButton value="add test" action="#{paintData.addHtmlPaint2D}"></h:commandButton>
<h:panelGrid columns="2" cellpadding="5px" border="2">
<h:outputText value="Text"></h:outputText>
<h:inputText value="#{paintData.text}">
Modified: trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -72,7 +72,7 @@
</rich:panel>
<h:outputText value="Panel 1, rendered: #{!panel.rendered}; Panel 2, rendered #{panel.rendered};"></h:outputText>
-<rich:panel rendered="#{!panel.rendered}" id="p1" style="width:#{panel.width};height:#{panel.height};overflow:auto;"
+<rich:panel binding="#{panel.htmlPanel}" rendered="#{!panel.rendered}" id="p1" style="width:#{panel.width};height:#{panel.height};overflow:auto;"
ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onclick="showEvent('onclickInputID', 'onclick work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')"
onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')"
onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')">
Modified: trunk/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="PanelPropertySubviewID">
+<h:commandButton value="add test" action="#{panel.addHtmlPanel}"></h:commandButton>
<h:panelGrid columns="2" cellpadding="10px">
<h:outputText value="Title"></h:outputText>
<h:inputText valueChangeListener="#{panel.makeTitle}">
Modified: trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="panelBarPropertySubviewID">
+<h:commandButton value="add test" action="#{panelBar.addHtmlPanelBar}"></h:commandButton>
<h:panelGrid columns="2" cellspacing="10px">
<h:outputText value="Label: "></h:outputText>
<h:inputText valueChangeListener="#{panelBar.makeLabels}">
Modified: trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="panelMenuPropertySubviewID">
+<h:commandButton value="add test" action="#{panelMenu.addHtmlPanelMenu}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="Width"></h:outputText>
<h:inputText value="#{panelMenu.width}">
Modified: trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -3,6 +3,7 @@
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="pickListPropertySubviewID">
+<h:commandButton value="add test" action="#{pickList.addHtmlPickList}"></h:commandButton>
<h:panelGrid columns="2">
<a4j:commandButton reRender="pickListTargenID" value="refresh target"></a4j:commandButton>
<h:dataTable id="pickListTargenID" value="#{pickList.value}"
Modified: trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,7 +4,7 @@
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<f:subview id="progressBarSubviewID">
- <rich:progressBar id="progressBarID"
+ <rich:progressBar id="progressBarID" binding="#{progressBar.htmlProgressBar}"
ajaxSingle="#{progressBar.ajaxSingle}" label="#{progressBar.label}"
immediate="#{progressBar.immediate}" value="#{progressBar.value}"
style="width: 450px; height: 19px;#{style.style};"
@@ -155,4 +155,5 @@
<h:outputText value="#{rich:findComponent('progressBarID').value}" id="findID"/>
</rich:column>
</h:panelGrid>
+ <h:commandButton value="add test" action="#{progressBar.addHtmlProgressBar}"></h:commandButton>
</f:subview>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -33,7 +33,7 @@
<h:outputText value="" />
</h:panelGrid>
</h:panelGrid>
- <rich:scrollableDataTable id="sdt" var="sdt" rowKeyVar="key"
+ <rich:scrollableDataTable binding="#{scrollableDT.htmlScrollableDataTable}" id="sdt" var="sdt" rowKeyVar="key"
onRowDblClick="alert('row:#{key}')" rowKeyConverter="#{dataConverter}"
value="#{scrollableDT.data}" rows="#{scrollableDT.rows}"
width="#{scrollableDT.width}" height="#{scrollableDT.height}"
Modified: trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="scrollableDataTablePropertySubviewID">
+<h:commandButton value="add test" action="#{scrollableDT.addHtmlScrollableDataTable}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="length:"></h:outputText>
<h:panelGroup>
Modified: trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -5,7 +5,7 @@
<f:subview id="separatorSubviewID">
<h:outputText value="Some text one..." styleClass="text"></h:outputText>
- <rich:separator id="separatorId" rendered="#{separator.rendered}" width="#{separator.width}" height="#{separator.height}"
+ <rich:separator id="separatorId" binding="#{separator.htmlSeparator}" rendered="#{separator.rendered}" width="#{separator.width}" height="#{separator.height}"
title="#{separator.title}" lineType="#{separator.lineType}" align="#{separator.align}"
style="#{style.style}" styleClass="#{style.styleClass}"
onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"></rich:separator>
Modified: trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="SeparatorPropertySubviewID">
+<h:commandButton value="add test" action="#{separator.addHtmlSeparator}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="Width (px or %): "></h:outputText>
<h:inputText value="#{separator.width}">
Modified: trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -18,7 +18,7 @@
</h:selectOneMenu>
<jsp:include flush="true" page="${richBean.pathComponentContainer}"/>
</rich:simpleTogglePanel>
- <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" action="#{simpleTogglePanel.act}" actionListener="#{simpleTogglePanel.actListener}"
+ <rich:simpleTogglePanel binding="#{simpleTogglePanel.htmlSimpleTogglePanel}" id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" action="#{simpleTogglePanel.act}" actionListener="#{simpleTogglePanel.actListener}"
width="#{simpleTogglePanel.width}" height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}"
style="#{style.style}" styleClass="#{style.styleClass}"
oncollapse="#{event.oncollapse}" onbeforedomupdate="#{event.onbeforedomupdate}" onexpand="#{event.onexpand}" opened="#{event.opened}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}">
Modified: trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="stpPropertySubviewID">
+<h:commandButton value="add test" action="#{simpleTogglePanel.addHtmlSimpleTogglePanel}"></h:commandButton>
<h:panelGrid columns="2" border="1">
<h:outputText value="Width:">
</h:outputText>
Modified: trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -15,7 +15,7 @@
</style>
<h:outputText value="Some text one..." styleClass="text"></h:outputText>
- <rich:spacer id="spacerId" title="#{spacer.title}" width="#{spacer.width}" height="#{spacer.height}" rendered="#{spacer.rendered}"
+ <rich:spacer id="spacerId" binding="#{spacer.htmlSpacer}" title="#{spacer.title}" width="#{spacer.width}" height="#{spacer.height}" rendered="#{spacer.rendered}"
styleClass="#{spacer.style}" style="#{style.style}"
onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}">
</rich:spacer>
Modified: trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -3,7 +3,8 @@
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
-<f:subview id="spacerPropertySubviewID">
+<f:subview id="spacerPropertySubviewID">\
+<h:commandButton value="add test" action="#{spacer.addHtmlSpacer}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="Width (px or %):"></h:outputText>
<h:inputText value="#{spacer.width}">
Modified: trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="suggestionboxPropertySubviewID">
+<h:commandButton value="add test" action="#{sb.addHtmlSuggestionBox}"></h:commandButton>
<h:panelGrid columns="2" cellpadding="5px">
<h:outputText value="ajaxSingle"></h:outputText>
<h:selectBooleanCheckbox value="#{sb.ajaxSingle}" onchange="submit();"></h:selectBooleanCheckbox>
Modified: trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,7 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="tabPanelSubviewID">
- <rich:tabPanel id="tabPanelId"
+ <rich:tabPanel id="tabPanelId" binding="#{tabPanel.htmlTabPanel}"
headerAlignment="#{tabPanel.headerAlignment}"
width="#{tabPanel.width}" contentStyle="#{style.contentStyle}"
headerClass="#{style.headerClass}" style="#{style.style}"
@@ -23,7 +23,7 @@
onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
onmouseup="#{event.onmouseup}">
- <rich:tab id="tabOne" labelWidth="#{tabPanel.labelWidth}"
+ <rich:tab id="tabOne" binding="#{tabPanel.htmlTab}" labelWidth="#{tabPanel.labelWidth}"
label="#{tabPanel.label}" onclick="#{event.onclick}"
oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}"
onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}"
Modified: trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="tabPanelStraightforwardSubviewID">
+<h:commandButton value="add test" action="#{tabPanel.addHtmlTabPanel}"></h:commandButton>
<h:panelGrid columns="2" cellspacing="10px">
<h:outputText value="Width (px or %):"></h:outputText>
<h:inputText value="#{tabPanel.width}" onchange="submit();" />
Modified: trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -5,7 +5,7 @@
<f:subview id="togglePanelSubviewID">
- <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" styleClass="#{style.styleClass}" style="width:300px!important;#{style.style};"
+ <rich:togglePanel id="panel1" binding="#{togglePanel.htmlTogglePanel}" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" styleClass="#{style.styleClass}" style="width:300px!important;#{style.style};"
onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}"
onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}"
onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
Modified: trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="togglePanelPropertySubviewID">
+<h:commandButton value="add test" action="#{togglePanel.addHtmlTogglePanel}"></h:commandButton>
<h:panelGrid columns="2" cellpadding="5px" cellspacing="5px">
<h:outputText value="InitialState:"></h:outputText>
<h:selectOneRadio value="#{togglePanel.initialState}">
Modified: trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -6,7 +6,7 @@
<f:subview id="toolBarSubviewID">
<h:messages></h:messages>
- <rich:toolBar id="toolBarId" width="#{toolBar.width}"
+ <rich:toolBar id="toolBarId" width="#{toolBar.width}" binding="#{toolBar.htmlToolBar}"
height="#{toolBar.height}" rendered="#{toolBar.rendered}"
itemSeparator="#{toolBar.itemSeparator}"
contentClass="#{toolBar.contentStyle}"
Modified: trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBarProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBarProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBarProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="toolBarPropertySubviewID">
+ <h:commandButton value="add test" action="#{toolBar.addHtmlToolBar}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="Image location:"></h:outputText>
<h:selectOneRadio value="#{toolBar.location}">
Modified: trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -40,7 +40,7 @@
</f:verbatim>
<rich:panel style="width:50px; height:50px; background-color: gray">
- <rich:toolTip id="tooltipID" value="#{tooltip.value}" mode="#{tooltip.mode}" styleClass="#{style.styleClass}" style="#{style.style}"
+ <rich:toolTip id="tooltipID" binding="#{tooltip.htmlToolTip}" value="#{tooltip.value}" mode="#{tooltip.mode}" styleClass="#{style.styleClass}" style="#{style.style}"
hideDelay="#{tooltip.hideDelay}" showDelay="#{tooltip.showDelay}" layout="#{tooltip.layout}"
horizontalOffset="#{tooltip.horizontalOffset}" verticalOffset="#{tooltip.verticalOffset}" followMouse="#{tooltip.followMouse}"
direction="#{tooltip.direction}" disabled="#{tooltip.disabled}" rendered="#{tooltip.rendered}"
Modified: trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -4,6 +4,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="toolTipStraightforwardSubviewID">
+ <h:commandButton value="add test" action="#{tooltip.addHtmlToolTip}"></h:commandButton>
<h:panelGrid columns="2">
<h:outputText value="Text:"></h:outputText>
<h:inputText value="#{tooltip.value}">
Modified: trunk/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp 2008-07-04 13:48:25 UTC (rev 9418)
+++ trunk/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp 2008-07-07 07:05:31 UTC (rev 9419)
@@ -6,6 +6,7 @@
<f:subview id="treePropertySubviewID">
<br />
<br />
+ <h:commandButton value="add test" action="#{bean.addHtmlTree}"></h:commandButton>
<div style="FONT-WEIGHT: bold;">rich:findComponent</div>
<h:panelGrid columns="2">
<rich:column>
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r9418 - in trunk/test-applications/seleniumTest/src/main: resources/org/ajax4jsf and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2008-07-04 09:48:25 -0400 (Fri, 04 Jul 2008)
New Revision: 9418
Added:
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/LoadBundleTestBean.java
trunk/test-applications/seleniumTest/src/main/resources/org/ajax4jsf/message/
trunk/test-applications/seleniumTest/src/main/resources/org/ajax4jsf/message/resources_en_US.properties
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxHTMLCommandLink/
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxHTMLCommandLink/ajaxHTMLLinkTest.xhtml
Modified:
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JCommandTestBean.java
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/IndexBean.java
trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml
Log:
Add selenium test for components a4j:htmlCommandLink and a4j:loadBundle
Modified: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JCommandTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JCommandTestBean.java 2008-07-04 00:40:00 UTC (rev 9417)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JCommandTestBean.java 2008-07-04 13:48:25 UTC (rev 9418)
@@ -15,6 +15,8 @@
private String value;
+ private boolean rendered = true;
+
private AjaxContext getAjaxContext () {
FacesContext context = FacesContextImpl.getCurrentInstance();
if (context != null) {
@@ -60,6 +62,20 @@
put2ResponseData("input", true);
}
+ public boolean isRendered() {
+ return rendered;
+ }
+ public String reRender(){
+ this.setRendered(!rendered);
+ return null;
+ }
+ /**
+ * @param value the value to set
+ */
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
+
}
Modified: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/IndexBean.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/IndexBean.java 2008-07-04 00:40:00 UTC (rev 9417)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/IndexBean.java 2008-07-04 13:48:25 UTC (rev 9418)
@@ -53,6 +53,7 @@
public IndexBean() {
list.add(new ComponentItem("<a4j:commandButton>", "ajaxCommandButton/ajaxButtonTest.xhtml"));
list.add(new ComponentItem("<a4j:commandLink>", "ajaxCommandLink/ajaxLinkTest.xhtml"));
+ list.add(new ComponentItem("<a4j:htmlCommandLink>", "ajaxHTMLCommandLink/ajaxHTMLLinkTest.xhtml"));
list.add(new ComponentItem("<a4j:poll>", "ajaxPoll/ajaxPollTest.xhtml"));
list.add(new ComponentItem("<a4j:region>", "ajaxRegion/ajaxRegionTest.xhtml"));
list.add(new ComponentItem("<rich:calendar>", "calendar/calendarTest.xhtml"));
@@ -80,6 +81,7 @@
list.add(new ComponentItem("<a4j:support>", "ajaxOutputPanel/ajaxOutputPanelTest.xhtml"));
list.add(new ComponentItem("<a4j:jsFunction>", "jsFunction/jsFunctionTest.xhtml"));
list.add(new ComponentItem("<rich:spacer>", "spacer/spacerTest.xhtml"));
+ list.add(new ComponentItem("<a4j:loadBundle>", "loadBundle/loadBundle.xhtml"));
sortList();
Added: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/LoadBundleTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/LoadBundleTestBean.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/LoadBundleTestBean.java 2008-07-04 13:48:25 UTC (rev 9418)
@@ -0,0 +1,23 @@
+package org.ajax4jsf.bean;
+
+
+public class LoadBundleTestBean {
+
+ private boolean rendered = false;
+
+ public boolean isRendered() {
+ return rendered;
+ }
+
+ public void reRender(){
+ this.setRendered(!rendered);
+ }
+
+ /**
+ * @param value the value to set
+ */
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
+
+}
Property changes on: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/LoadBundleTestBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/test-applications/seleniumTest/src/main/resources/org/ajax4jsf/message/resources_en_US.properties
===================================================================
--- trunk/test-applications/seleniumTest/src/main/resources/org/ajax4jsf/message/resources_en_US.properties (rev 0)
+++ trunk/test-applications/seleniumTest/src/main/resources/org/ajax4jsf/message/resources_en_US.properties 2008-07-04 13:48:25 UTC (rev 9418)
@@ -0,0 +1,2 @@
+test=It is sample message from resourceBundle
+error=Error was occured.
\ No newline at end of file
Property changes on: trunk/test-applications/seleniumTest/src/main/resources/org/ajax4jsf/message/resources_en_US.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-07-04 00:40:00 UTC (rev 9417)
+++ trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-07-04 13:48:25 UTC (rev 9418)
@@ -6,7 +6,10 @@
<faces-config>
<application>
- <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ <message-bundle>
+ org.ajax4jsf.message.resources
+ </message-bundle>
</application>
<managed-bean>
@@ -175,6 +178,11 @@
<managed-bean-class>org.ajax4jsf.bean.AjaxPushTestBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>loadBundleBean</managed-bean-name>
+ <managed-bean-class>org.ajax4jsf.bean.LoadBundleTestBean</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
<navigation-rule>
<from-view-id>/pages/ajaxInclude/step1.xhtml</from-view-id>
<navigation-case>
@@ -188,5 +196,5 @@
<from-outcome>previous</from-outcome>
<to-view-id>/pages/ajaxInclude/step1.xhtml</to-view-id>
</navigation-case>
- </navigation-rule>
+ </navigation-rule>
</faces-config>
\ No newline at end of file
Modified: trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml 2008-07-04 00:40:00 UTC (rev 9417)
+++ trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml 2008-07-04 13:48:25 UTC (rev 9418)
@@ -8,6 +8,7 @@
<f:view contentType="text/html">
<head>
<a4j:loadScript src="resource:///org/ajax4jsf/javascript/scripts/AJAX.js"></a4j:loadScript>
+ <a4j:loadScript src="resource:///org/ajax4jsf/javascript/scripts/form.js"></a4j:loadScript>
<script>
var errorMessage = null;
var pauseHolder = {};
Added: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxHTMLCommandLink/ajaxHTMLLinkTest.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxHTMLCommandLink/ajaxHTMLLinkTest.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r9417 - trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-07-03 20:40:00 -0400 (Thu, 03 Jul 2008)
New Revision: 9417
Modified:
trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java
Log:
TODO task added
Modified: trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java
===================================================================
--- trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java 2008-07-04 00:34:36 UTC (rev 9416)
+++ trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java 2008-07-04 00:40:00 UTC (rev 9417)
@@ -36,6 +36,7 @@
*/
static BeanValidator createInstance(){
// TODO - get instance class name from a "META-INF/service"
+ // If the Seam framework is active, use org.jboss.seam.core.Validators component should be used.
return new BeanValidator();
}
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r9416 - in trunk/sandbox: samples/beanValidatorSample/.metadata and 14 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-07-03 20:34:36 -0400 (Thu, 03 Jul 2008)
New Revision: 9416
Added:
trunk/sandbox/samples/beanValidatorSample/.metadata/
trunk/sandbox/samples/beanValidatorSample/.metadata/src/
trunk/sandbox/samples/beanValidatorSample/.metadata/src/main/
trunk/sandbox/samples/beanValidatorSample/.metadata/src/main/webapp/
trunk/sandbox/samples/beanValidatorSample/.metadata/src/main/webapp/WEB-INF/
trunk/sandbox/samples/beanValidatorSample/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow
trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/DataBean.java
trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/LengthBean.java
trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MaxBean.java
trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinBean.java
trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinMaxBean.java
trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotEmptyBean.java
trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotNullBean.java
trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/Validable.java
trunk/sandbox/samples/beanValidatorSample/src/main/webapp/META-INF/
trunk/sandbox/samples/beanValidatorSample/src/main/webapp/META-INF/MANIFEST.MF
trunk/sandbox/samples/beanValidatorSample/src/main/webapp/WEB-INF/lib/
trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java
trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/ELContextWrapper.java
trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java
trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/
trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/BeanValidatorTest.java
trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/UnValidableBean.java
trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/ValidableBean.java
Removed:
trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java
Modified:
trunk/sandbox/samples/beanValidatorSample/pom.xml
trunk/sandbox/samples/beanValidatorSample/src/main/webapp/WEB-INF/faces-config.xml
trunk/sandbox/samples/beanValidatorSample/src/main/webapp/WEB-INF/web.xml
trunk/sandbox/samples/beanValidatorSample/src/main/webapp/pages/index.jsp
trunk/sandbox/ui/beanValidator/pom.xml
trunk/sandbox/ui/beanValidator/src/main/config/component/beanValidator.xml
Log:
Validator sample start working
Added: trunk/sandbox/samples/beanValidatorSample/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow (rev 0)
+++ trunk/sandbox/samples/beanValidatorSample/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pageflow:Pageflow xmlns:pageflow="http://www.sybase.com/suade/pageflow" id="pf12151265924800" configfile="/beanValidatorSample/src/main/webapp/WEB-INF/faces-config.xml"/>
Modified: trunk/sandbox/samples/beanValidatorSample/pom.xml
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/pom.xml 2008-07-03 19:26:19 UTC (rev 9415)
+++ trunk/sandbox/samples/beanValidatorSample/pom.xml 2008-07-04 00:34:36 UTC (rev 9416)
@@ -1,38 +1,49 @@
-<?xml version="1.0"?><project>
- <parent>
- <artifactId>samples</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
- <version>3.2.2-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.samples</groupId>
- <artifactId>beanValidatorSample</artifactId>
- <packaging>war</packaging>
- <name>beanValidatorSample Maven Webapp</name>
- <version>3.2.2-SNAPSHOT</version>
- <build>
- <finalName>beanValidatorSample</finalName>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- <version>3.2.2-SNAPSHOT</version>
- </dependency>
- </dependencies>
+<?xml version="1.0"?>
+<project>
+ <parent>
+ <artifactId>samples</artifactId>
+ <groupId>org.richfaces.sandbox</groupId>
+ <version>3.2.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>beanValidatorSample</artifactId>
+ <packaging>war</packaging>
+ <name>beanValidatorSample Maven Webapp</name>
+ <version>3.2.2-SNAPSHOT</version>
+ <build>
+ <finalName>beanValidatorSample</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>beanValidator</artifactId>
+ <version>3.2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>3.2.2-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Added: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/DataBean.java
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/DataBean.java (rev 0)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/DataBean.java 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,186 @@
+/**
+ *
+ */
+package org.richfaces;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class DataBean implements List<Validable> {
+
+ private final List<Validable> backend;
+
+ public DataBean() {
+ backend = new ArrayList<Validable>(6);
+ backend.add(new NotNullBean());
+ backend.add(new NotEmptyBean());
+ backend.add(new LengthBean());
+ backend.add(new MinBean());
+ backend.add(new MaxBean());
+ backend.add(new MinMaxBean());
+ }
+
+ /**
+ * @param o
+ * @return
+ * @see java.util.List#contains(java.lang.Object)
+ */
+ public boolean contains(Object o) {
+ return backend.contains(o);
+ }
+
+ /**
+ * @param c
+ * @return
+ * @see java.util.List#containsAll(java.util.Collection)
+ */
+ public boolean containsAll(Collection<?> c) {
+ return backend.containsAll(c);
+ }
+
+ /**
+ * @param index
+ * @return
+ * @see java.util.List#get(int)
+ */
+ public Validable get(int index) {
+ return backend.get(index);
+ }
+
+ /**
+ * @param o
+ * @return
+ * @see java.util.List#indexOf(java.lang.Object)
+ */
+ public int indexOf(Object o) {
+ return backend.indexOf(o);
+ }
+
+ /**
+ * @return
+ * @see java.util.List#isEmpty()
+ */
+ public boolean isEmpty() {
+ return backend.isEmpty();
+ }
+
+ /**
+ * @return
+ * @see java.util.List#iterator()
+ */
+ public Iterator<Validable> iterator() {
+ return backend.iterator();
+ }
+
+ /**
+ * @param o
+ * @return
+ * @see java.util.List#lastIndexOf(java.lang.Object)
+ */
+ public int lastIndexOf(Object o) {
+ return backend.lastIndexOf(o);
+ }
+
+ /**
+ * @return
+ * @see java.util.List#listIterator()
+ */
+ public ListIterator<Validable> listIterator() {
+ return backend.listIterator();
+ }
+
+ /**
+ * @param index
+ * @return
+ * @see java.util.List#listIterator(int)
+ */
+ public ListIterator<Validable> listIterator(int index) {
+ return backend.listIterator(index);
+ }
+
+ /**
+ * @return
+ * @see java.util.List#size()
+ */
+ public int size() {
+ return backend.size();
+ }
+
+ /**
+ * @param fromIndex
+ * @param toIndex
+ * @return
+ * @see java.util.List#subList(int, int)
+ */
+ public List<Validable> subList(int fromIndex, int toIndex) {
+ return backend.subList(fromIndex, toIndex);
+ }
+
+ /**
+ * @return
+ * @see java.util.List#toArray()
+ */
+ public Object[] toArray() {
+ return backend.toArray();
+ }
+
+ /**
+ * @param <T>
+ * @param a
+ * @return
+ * @see java.util.List#toArray(T[])
+ */
+ public <T> T[] toArray(T[] a) {
+ return backend.toArray(a);
+ }
+
+ public boolean add(Validable o) {
+ throw new IllegalAccessError();
+ }
+
+ public void add(int index, Validable element) {
+ throw new IllegalAccessError();
+ }
+
+ public boolean addAll(Collection<? extends Validable> c) {
+ throw new IllegalAccessError();
+ }
+
+ public boolean addAll(int index, Collection<? extends Validable> c) {
+ throw new IllegalAccessError();
+ }
+
+ public void clear() {
+ throw new IllegalAccessError();
+ }
+
+ public boolean remove(Object o) {
+ throw new IllegalAccessError();
+ }
+
+ public Validable remove(int index) {
+ throw new IllegalAccessError();
+ }
+
+ public boolean removeAll(Collection<?> c) {
+ throw new IllegalAccessError();
+ }
+
+ public boolean retainAll(Collection<?> c) {
+ throw new IllegalAccessError();
+ }
+
+ public Validable set(int index, Validable element) {
+ throw new IllegalAccessError();
+ }
+
+
+
+}
Property changes on: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/DataBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/LengthBean.java
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/LengthBean.java (rev 0)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/LengthBean.java 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,53 @@
+/**
+ *
+ */
+package org.richfaces;
+
+import org.hibernate.validator.Length;
+import org.hibernate.validator.NotEmpty;
+import org.hibernate.validator.NotNull;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class LengthBean implements Validable {
+
+ @Length(max=10,min=2,message="incorrect field length")
+ private String text;
+
+ private int intValue;
+
+ /**
+ * @return the text
+ */
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * @param text the text to set
+ */
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ /**
+ * @return the intValue
+ */
+ public int getIntValue() {
+ return intValue;
+ }
+
+ /**
+ * @param intValue the intValue to set
+ */
+ public void setIntValue(int intValue) {
+ this.intValue = intValue;
+ }
+
+ public String getDescription() {
+ return "String Length Validation";
+ }
+
+}
Property changes on: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/LengthBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MaxBean.java
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MaxBean.java (rev 0)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MaxBean.java 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,55 @@
+/**
+ *
+ */
+package org.richfaces;
+
+import org.hibernate.validator.Length;
+import org.hibernate.validator.Max;
+import org.hibernate.validator.Min;
+import org.hibernate.validator.NotEmpty;
+import org.hibernate.validator.NotNull;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class MaxBean implements Validable {
+
+ private String text;
+
+ @Max(10)
+ private int intValue;
+
+ /**
+ * @return the text
+ */
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * @param text the text to set
+ */
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ /**
+ * @return the intValue
+ */
+ public int getIntValue() {
+ return intValue;
+ }
+
+ /**
+ * @param intValue the intValue to set
+ */
+ public void setIntValue(int intValue) {
+ this.intValue = intValue;
+ }
+
+ public String getDescription() {
+ return "Max integer Validation";
+ }
+
+}
Property changes on: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MaxBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinBean.java
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinBean.java (rev 0)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinBean.java 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,54 @@
+/**
+ *
+ */
+package org.richfaces;
+
+import org.hibernate.validator.Length;
+import org.hibernate.validator.Min;
+import org.hibernate.validator.NotEmpty;
+import org.hibernate.validator.NotNull;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class MinBean implements Validable {
+
+ private String text;
+
+ @Min(2)
+ private int intValue;
+
+ /**
+ * @return the text
+ */
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * @param text the text to set
+ */
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ /**
+ * @return the intValue
+ */
+ public int getIntValue() {
+ return intValue;
+ }
+
+ /**
+ * @param intValue the intValue to set
+ */
+ public void setIntValue(int intValue) {
+ this.intValue = intValue;
+ }
+
+ public String getDescription() {
+ return "Min integer Validation";
+ }
+
+}
Property changes on: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinMaxBean.java
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinMaxBean.java (rev 0)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinMaxBean.java 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,56 @@
+/**
+ *
+ */
+package org.richfaces;
+
+import org.hibernate.validator.Length;
+import org.hibernate.validator.Max;
+import org.hibernate.validator.Min;
+import org.hibernate.validator.NotEmpty;
+import org.hibernate.validator.NotNull;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class MinMaxBean implements Validable {
+
+ private String text;
+
+ @Min(2)
+ @Max(10)
+ private int intValue;
+
+ /**
+ * @return the text
+ */
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * @param text the text to set
+ */
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ /**
+ * @return the intValue
+ */
+ public int getIntValue() {
+ return intValue;
+ }
+
+ /**
+ * @param intValue the intValue to set
+ */
+ public void setIntValue(int intValue) {
+ this.intValue = intValue;
+ }
+
+ public String getDescription() {
+ return "Min and Max integer Validation";
+ }
+
+}
Property changes on: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinMaxBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotEmptyBean.java
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotEmptyBean.java (rev 0)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotEmptyBean.java 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,52 @@
+/**
+ *
+ */
+package org.richfaces;
+
+import org.hibernate.validator.NotEmpty;
+import org.hibernate.validator.NotNull;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class NotEmptyBean implements Validable {
+
+ @NotEmpty
+ private String text;
+
+ private int intValue;
+
+ /**
+ * @return the text
+ */
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * @param text the text to set
+ */
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ /**
+ * @return the intValue
+ */
+ public int getIntValue() {
+ return intValue;
+ }
+
+ /**
+ * @param intValue the intValue to set
+ */
+ public void setIntValue(int intValue) {
+ this.intValue = intValue;
+ }
+
+ public String getDescription() {
+ return "Not Empty Validation";
+ }
+
+}
Property changes on: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotEmptyBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotNullBean.java
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotNullBean.java (rev 0)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotNullBean.java 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,51 @@
+/**
+ *
+ */
+package org.richfaces;
+
+import org.hibernate.validator.NotNull;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class NotNullBean implements Validable {
+
+ @NotNull
+ private String text;
+
+ private int intValue;
+
+ /**
+ * @return the text
+ */
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * @param text the text to set
+ */
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ /**
+ * @return the intValue
+ */
+ public int getIntValue() {
+ return intValue;
+ }
+
+ /**
+ * @param intValue the intValue to set
+ */
+ public void setIntValue(int intValue) {
+ this.intValue = intValue;
+ }
+
+ public String getDescription() {
+ return "Not Null Validation";
+ }
+
+}
Property changes on: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotNullBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/Validable.java
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/Validable.java (rev 0)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/Validable.java 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,17 @@
+/**
+ *
+ */
+package org.richfaces;
+
+/**
+ * @author asmirnov
+ *
+ */
+public interface Validable {
+
+ public String getText();
+
+ public String getDescription();
+
+ public int getIntValue();
+}
Property changes on: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/Validable.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/samples/beanValidatorSample/src/main/webapp/META-INF/MANIFEST.MF
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/webapp/META-INF/MANIFEST.MF (rev 0)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/webapp/META-INF/MANIFEST.MF 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/sandbox/samples/beanValidatorSample/src/main/webapp/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/sandbox/samples/beanValidatorSample/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/webapp/WEB-INF/faces-config.xml 2008-07-03 19:26:19 UTC (rev 9415)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/webapp/WEB-INF/faces-config.xml 2008-07-04 00:34:36 UTC (rev 9416)
@@ -7,4 +7,9 @@
<managed-bean-class>org.richfaces.Bean</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>data</managed-bean-name>
+ <managed-bean-class>org.richfaces.DataBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
</faces-config>
Modified: trunk/sandbox/samples/beanValidatorSample/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/webapp/WEB-INF/web.xml 2008-07-03 19:26:19 UTC (rev 9415)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/webapp/WEB-INF/web.xml 2008-07-04 00:34:36 UTC (rev 9416)
@@ -3,10 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>Archetype Created Web Application</display-name>
<context-param>
- <param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/faces-config.xml</param-value>
- </context-param>
- <context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
<param-value>server</param-value>
</context-param>
Modified: trunk/sandbox/samples/beanValidatorSample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/webapp/pages/index.jsp 2008-07-03 19:26:19 UTC (rev 9415)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/webapp/pages/index.jsp 2008-07-04 00:34:36 UTC (rev 9416)
@@ -1,12 +1,49 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib
+ uri="http://labs.jboss.com/jbossrichfaces/ui/ui/beanValidator"
+ prefix="v"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="data"%>
+<%@taglib prefix="a4j" uri="http://richfaces.org/a4j"%>
<html>
- <head>
- <title></title>
- </head>
- <body>
- <f:view>
-
- </f:view>
- </body>
-</html>
+<head>
+<title>Hibernate validator test</title>
+</head>
+<body>
+<f:view>
+ <h:form id="form">
+ <h:dataTable value="#{data}" var="bean" id="table">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="text field" />
+ </f:facet>
+ <h:outputLabel for="text" value="Text input:" />
+ <h:inputText id="text" value="#{bean.text}">
+ <a4j:support event="onblur" reRender="table"/>
+ <v:beanValidator/>
+ </h:inputText>
+ <h:message for="text"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="integer field" />
+ </f:facet>
+ <h:outputLabel for="intValue" value="Number input:" />
+ <h:inputText id="intValue" value="#{bean.intValue}">
+ <a4j:support event="onblur" reRender="table"/>
+ <v:beanValidator/>
+ </h:inputText>
+ <h:message for="intValue"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="description" />
+ </f:facet>
+ <h:outputText value="#{bean.description}"></h:outputText>
+ </h:column>
+ </h:dataTable>
+</h:form>
+ <data:messages></data:messages>
+</f:view>
+</body>
+</html>
Modified: trunk/sandbox/ui/beanValidator/pom.xml
===================================================================
--- trunk/sandbox/ui/beanValidator/pom.xml 2008-07-03 19:26:19 UTC (rev 9415)
+++ trunk/sandbox/ui/beanValidator/pom.xml 2008-07-04 00:34:36 UTC (rev 9416)
@@ -52,15 +52,19 @@
<artifactId>hibernate-validator</artifactId>
<version>3.1.0.CR1</version>
<exclusions>
- <exclusion>
- <artifactId>hibernate-core</artifactId>
- <groupId>org.hibernate</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
+ <!--
+ <exclusion> <artifactId>hibernate-core</artifactId>
+ <groupId>org.hibernate</groupId> </exclusion> <exclusion>
+ <artifactId>slf4j-api</artifactId> <groupId>org.slf4j</groupId>
+ </exclusion>
+ -->
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/sandbox/ui/beanValidator/src/main/config/component/beanValidator.xml
===================================================================
--- trunk/sandbox/ui/beanValidator/src/main/config/component/beanValidator.xml 2008-07-03 19:26:19 UTC (rev 9415)
+++ trunk/sandbox/ui/beanValidator/src/main/config/component/beanValidator.xml 2008-07-04 00:34:36 UTC (rev 9416)
@@ -40,7 +40,7 @@
</component>
<validator generate="false">
<id>org.richfaces.BeanValidator</id>
- <classname>org.richfaces.validator.BeanValidator</classname>
+ <classname>org.richfaces.validator.FacesBeanValidator</classname>
<description>
<![CDATA[Validate Input by the Bean/Hibernate validator annotations]]>
</description>
Deleted: trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java
===================================================================
--- trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java 2008-07-03 19:26:19 UTC (rev 9415)
+++ trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java 2008-07-04 00:34:36 UTC (rev 9416)
@@ -1,26 +0,0 @@
-/**
- *
- */
-package org.richfaces.validator;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.Validator;
-import javax.faces.validator.ValidatorException;
-
-/**
- * @author asmirnov
- *
- */
-public class BeanValidator implements Validator {
-
- /* (non-Javadoc)
- * @see javax.faces.validator.Validator#validate(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.Object)
- */
- public void validate(FacesContext context, UIComponent component, Object convertedValue)
- throws ValidatorException {
- // TODO Auto-generated method stub
-
- }
-
-}
Added: trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java
===================================================================
--- trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java (rev 0)
+++ trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,257 @@
+/**
+ *
+ */
+package org.richfaces.validator;
+
+import java.beans.FeatureDescriptor;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.el.ELContext;
+import javax.el.ELResolver;
+import javax.el.ValueExpression;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+
+import org.hibernate.validator.ClassValidator;
+import org.hibernate.validator.InvalidValue;
+
+/**
+ * Perform validation by Hibernate Validator annotations
+ * @author asmirnov
+ *
+ */
+public class BeanValidator {
+
+ public static final String VALIDATOR_PARAM = BeanValidator.class.getName();
+
+ private BeanValidator(){
+ // This is a "singleton"-like class. Only factory methods allowed.
+ }
+
+ /**
+ * Create BeanValidator instance. For a Junit tests only.
+ * @return
+ */
+ static BeanValidator createInstance(){
+ // TODO - get instance class name from a "META-INF/service"
+ return new BeanValidator();
+ }
+
+ /**
+ * Return BeanValidator object from a ServletContext attribute.
+ * Create new instance if noone is defined.
+ * @param context
+ * @return
+ */
+ public static BeanValidator getInstance(FacesContext context) {
+ ExternalContext externalContext = context.getExternalContext();
+ externalContext.getContext();
+ BeanValidator instance;
+ // TODO - use properly synchronization mutex ?
+ synchronized (context) {
+ Map<String, Object> applicationMap = externalContext.getApplicationMap();
+ instance = (BeanValidator) applicationMap.get(VALIDATOR_PARAM);
+ if(null == instance){
+ // Vaildator not initialized - create and store new instance.
+ instance = createInstance();
+ applicationMap.put(VALIDATOR_PARAM, instance);
+ }
+ }
+ return instance;
+ }
+
+ /**
+ * Perform Validation for a new value.
+ * @param context current faces context.
+ * @param target {@link ValueExpression} for a value assigement.
+ * @param value new value for validation
+ * @return null if no validation errors. Array of the validation messages othervise.
+ */
+ public String[] validate(FacesContext context, ValueExpression target, Object value) {
+ // TODO -check null parameters.
+ ELContext elContext = context.getELContext();
+ ValidationResolver validationResolver = new ValidationResolver(elContext.getELResolver());
+ ELContextWrapper wrappedElContext = new ELContextWrapper(elContext,validationResolver);
+ // TODO - check null viewRoot and null Locale.
+ wrappedElContext.setLocale(context.getViewRoot().getLocale());
+ // TODO - handle ELExceptions ?
+ target.setValue(wrappedElContext, value);
+ if(validationResolver.isValid()){
+ return null;
+ } else {
+ return validationResolver.getValidationMessages();
+ }
+ }
+
+ /**
+ * Validate bean property for a new value.
+ * TODO - localisation ?
+ * @param base - bean
+ * @param property - bean property name.
+ * @param value new value.
+ * @return null for a valid value, array of the validation messages othervise.
+ */
+ public String[] validate(Object base, String property, Object value, Locale locale) {
+ InvalidValue[] invalidValues = validateBean(base, property, value, locale);
+ if(null == invalidValues){
+ return null;
+ } else {
+ String[] result = new String[invalidValues.length];
+ for (int i = 0; i < invalidValues.length; i++) {
+ InvalidValue invalidValue = invalidValues[i];
+ result[i] = invalidValue.getMessage();
+ }
+ return result;
+ }
+ }
+
+ /**
+ * Validate bean property of the base object aganist new value
+ * @param base
+ * @param property
+ * @param value
+ * @return
+ */
+ protected InvalidValue[] validateBean(Object base, String property,
+ Object value, Locale locale) {
+ Class<? extends Object> beanClass = base.getClass();
+ InvalidValue[] invalidValues = validateClass(beanClass, property, value, locale);
+ return invalidValues;
+ }
+
+ /**
+ * Validate bean property in the base class aganist new value.
+ * @param beanClass
+ * @param property
+ * @param value
+ * @return
+ */
+ protected InvalidValue[] validateClass(Class<? extends Object> beanClass,
+ String property, Object value, Locale locale) {
+ ClassValidator<? extends Object> classValidator = getValidator(beanClass, locale);
+ InvalidValue[] invalidValues = classValidator.getPotentialInvalidValues( property, value );
+ return invalidValues;
+ }
+
+ /**
+ * Get ( or create ) {@link ClassValidator} for a given bean class.
+ * @param beanClass
+ * @return
+ */
+ @SuppressWarnings("unchecked")
+ protected ClassValidator<? extends Object> getValidator(Class<? extends Object> beanClass, Locale locale) {
+ // TODO - cache validator instances.
+ // TODO - localization support.
+ return new ClassValidator(beanClass);
+ }
+
+ /**
+ * Wrapper class for a {@link ELResolver}. For a setValue method, perform validation instead of real assigement.
+ * @author asmirnov
+ *
+ */
+ final class ValidationResolver extends ELResolver {
+
+ /**
+ * Original resolver.
+ */
+ private final ELResolver parent;
+
+ private boolean valid = true;
+
+ private String[] validationMessages = null;
+
+ /**
+ * @param parent
+ */
+ public ValidationResolver(ELResolver parent) {
+ this.parent = parent;
+ }
+
+ public boolean isValid() {
+ // TODO Auto-generated method stub
+ return valid;
+ }
+
+ /**
+ * @param context
+ * @param base
+ * @return
+ * @see javax.el.ELResolver#getCommonPropertyType(javax.el.ELContext, java.lang.Object)
+ */
+ public Class<?> getCommonPropertyType(ELContext context, Object base) {
+ return parent.getCommonPropertyType(context, base);
+ }
+
+ /**
+ * @param context
+ * @param base
+ * @return
+ * @see javax.el.ELResolver#getFeatureDescriptors(javax.el.ELContext, java.lang.Object)
+ */
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(
+ ELContext context, Object base) {
+ return parent.getFeatureDescriptors(context, base);
+ }
+
+ /**
+ * @param context
+ * @param base
+ * @param property
+ * @return
+ * @see javax.el.ELResolver#getType(javax.el.ELContext, java.lang.Object, java.lang.Object)
+ */
+ public Class<?> getType(ELContext context, Object base, Object property) {
+ return parent.getType(context, base, property);
+ }
+
+ /**
+ * @param context
+ * @param base
+ * @param property
+ * @return
+ * @see javax.el.ELResolver#getValue(javax.el.ELContext, java.lang.Object, java.lang.Object)
+ */
+ public Object getValue(ELContext context, Object base, Object property) {
+ return parent.getValue(context, base, property);
+ }
+
+ /**
+ * @param context
+ * @param base
+ * @param property
+ * @return
+ * @see javax.el.ELResolver#isReadOnly(javax.el.ELContext, java.lang.Object, java.lang.Object)
+ */
+ public boolean isReadOnly(ELContext context, Object base,
+ Object property) {
+ return parent.isReadOnly(context, base, property);
+ }
+
+ /**
+ * @param context
+ * @param base
+ * @param property
+ * @param value
+ * @see javax.el.ELResolver#setValue(javax.el.ELContext, java.lang.Object, java.lang.Object, java.lang.Object)
+ */
+ public void setValue(ELContext context, Object base, Object property,
+ Object value) {
+ if(null != base && null != property){
+ context.setPropertyResolved(true);
+ validationMessages = validate(base,property.toString(),value, context.getLocale());
+ valid = null == validationMessages || 0 == validationMessages.length;
+ }
+ }
+
+ /**
+ * @return the validationMessages
+ */
+ public String[] getValidationMessages() {
+ return validationMessages;
+ }
+
+ }
+}
Added: trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/ELContextWrapper.java
===================================================================
--- trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/ELContextWrapper.java (rev 0)
+++ trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/ELContextWrapper.java 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,72 @@
+/**
+ *
+ */
+package org.richfaces.validator;
+
+import javax.el.ELContext;
+import javax.el.ELResolver;
+import javax.el.FunctionMapper;
+import javax.el.VariableMapper;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class ELContextWrapper extends ELContext {
+
+ private final ELContext parent;
+
+ private final ELResolver resolver;
+
+ /**
+ * @param parent
+ */
+ public ELContextWrapper(ELContext parent,ELResolver resolver) {
+ super();
+ this.resolver = resolver;
+ this.parent = parent;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.el.ELContext#getELResolver()
+ */
+ @Override
+ public ELResolver getELResolver() {
+ return resolver;
+ }
+
+ /**
+ * @return
+ * @see javax.el.ELContext#getFunctionMapper()
+ */
+ public FunctionMapper getFunctionMapper() {
+ return parent.getFunctionMapper();
+ }
+
+ /**
+ * @return
+ * @see javax.el.ELContext#getVariableMapper()
+ */
+ public VariableMapper getVariableMapper() {
+ return parent.getVariableMapper();
+ }
+
+ /**
+ * @param key
+ * @return
+ * @see javax.el.ELContext#getContext(java.lang.Class)
+ */
+ public Object getContext(Class key) {
+ return parent.getContext(key);
+ }
+
+ /**
+ * @param key
+ * @param contextObject
+ * @see javax.el.ELContext#putContext(java.lang.Class, java.lang.Object)
+ */
+ public void putContext(Class key, Object contextObject) {
+ parent.putContext(key, contextObject);
+ }
+
+}
Property changes on: trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/ELContextWrapper.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java (from rev 9413, trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java)
===================================================================
--- trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java (rev 0)
+++ trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,43 @@
+/**
+ *
+ */
+package org.richfaces.validator;
+
+import javax.el.ValueExpression;
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.Validator;
+import javax.faces.validator.ValidatorException;
+
+/**
+ * Implementation of the JSF validator to use with Bean Validation / Hibernate validator
+ * @author asmirnov
+ *
+ */
+public class FacesBeanValidator implements Validator {
+
+ /* (non-Javadoc)
+ * @see javax.faces.validator.Validator#validate(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.Object)
+ */
+ public void validate(FacesContext context, UIComponent component, Object convertedValue)
+ throws ValidatorException {
+ if (component instanceof UIInput) {
+ // Validate input component
+ UIInput input = (UIInput) component;
+ ValueExpression valueExpression = input.getValueExpression("value");
+ if(null != valueExpression){
+ // TODO - check EL Exceptions ?
+ String[] messages = BeanValidator.getInstance(context).validate(context, valueExpression, convertedValue);
+ if(null != messages){
+ input.setValid(false);
+ // TODO - send all validation messages.
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,messages[0],""));
+ }
+ }
+ }
+
+ }
+
+}
Property changes on: trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/BeanValidatorTest.java
===================================================================
--- trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/BeanValidatorTest.java (rev 0)
+++ trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/BeanValidatorTest.java 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,49 @@
+package org.richfaces.validator;
+
+import java.util.Locale;
+
+import org.hibernate.validator.ClassValidator;
+import org.hibernate.validator.InvalidValue;
+
+import junit.framework.TestCase;
+
+public class BeanValidatorTest extends TestCase {
+
+ public void testValidate() {
+
+ }
+
+ public void testGetValidator() throws Exception {
+ BeanValidator beanValidator = BeanValidator.createInstance();
+ ClassValidator<? extends Object> validator = beanValidator.getValidator(ValidableBean.class,Locale.getDefault());
+ assertNotNull(validator);
+ assertTrue(validator.hasValidationRules());
+ validator = beanValidator.getValidator(String.class,Locale.getDefault());
+ assertNotNull(validator);
+ assertFalse(validator.hasValidationRules());
+ }
+
+ public void testValidateClass() throws Exception {
+ BeanValidator beanValidator = BeanValidator.createInstance();
+ InvalidValue[] invalidValues = beanValidator.validateClass(ValidableBean.class, "integerProperty", new Integer(3),Locale.getDefault());
+ assertNotNull(invalidValues);
+ assertEquals(0, invalidValues.length);
+ invalidValues = beanValidator.validateClass(ValidableBean.class, "integerProperty", new Integer(-1),Locale.getDefault());
+ assertNotNull(invalidValues);
+ assertEquals(1, invalidValues.length);
+ invalidValues = beanValidator.validateClass(UnValidableBean.class, "integerProperty", new Integer(-1),Locale.getDefault());
+ assertNotNull(invalidValues);
+ assertEquals(0, invalidValues.length);
+ invalidValues = beanValidator.validateClass(ValidableBean.class, "nonExistentProperty", new Integer(-1),Locale.getDefault());
+ assertNotNull(invalidValues);
+ assertEquals(0, invalidValues.length);
+
+ }
+
+ public void testValidateBean() throws Exception {
+ BeanValidator beanValidator = BeanValidator.createInstance();
+ InvalidValue[] invalidValues = beanValidator.validateBean(new ValidableBean(), "integerProperty", new Integer(-1),Locale.getDefault());
+ assertNotNull(invalidValues);
+ assertEquals(1, invalidValues.length);
+ }
+}
Property changes on: trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/BeanValidatorTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/UnValidableBean.java
===================================================================
--- trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/UnValidableBean.java (rev 0)
+++ trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/UnValidableBean.java 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,61 @@
+/**
+ *
+ */
+package org.richfaces.validator;
+
+
+/**
+ * @author asmirnov
+ *
+ */
+public class UnValidableBean {
+
+ private int integerProperty;
+
+ private String text;
+
+ private Object foo;
+
+ /**
+ * @return the integerProperty
+ */
+ public int getIntegerProperty() {
+ return integerProperty;
+ }
+
+ /**
+ * @param integerProperty the integerProperty to set
+ */
+ public void setIntegerProperty(int integerProperty) {
+ this.integerProperty = integerProperty;
+ }
+
+ /**
+ * @return the text
+ */
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * @param text the text to set
+ */
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ /**
+ * @return the foo
+ */
+ public Object getFoo() {
+ return foo;
+ }
+
+ /**
+ * @param foo the foo to set
+ */
+ public void setFoo(Object foo) {
+ this.foo = foo;
+ }
+
+}
Property changes on: trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/UnValidableBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/ValidableBean.java
===================================================================
--- trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/ValidableBean.java (rev 0)
+++ trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/ValidableBean.java 2008-07-04 00:34:36 UTC (rev 9416)
@@ -0,0 +1,71 @@
+/**
+ *
+ */
+package org.richfaces.validator;
+
+import org.hibernate.validator.Length;
+import org.hibernate.validator.Max;
+import org.hibernate.validator.Min;
+import org.hibernate.validator.NotNull;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class ValidableBean {
+
+ @Min(2)
+ @Max(5)
+ private int integerProperty;
+
+ private String text;
+
+ private Object foo;
+
+ /**
+ * @return the integerProperty
+ */
+ public int getIntegerProperty() {
+ return integerProperty;
+ }
+
+ /**
+ * @param integerProperty the integerProperty to set
+ */
+ @Min(2)
+ @Max(5)
+ public void setIntegerProperty(int integerProperty) {
+ this.integerProperty = integerProperty;
+ }
+
+ /**
+ * @return the text
+ */
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * @param text the text to set
+ */
+ @Length(max=10,min=1,message="text size")
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ /**
+ * @return the foo
+ */
+ public Object getFoo() {
+ return foo;
+ }
+
+ /**
+ * @param foo the foo to set
+ */
+ @NotNull
+ public void setFoo(Object foo) {
+ this.foo = foo;
+ }
+
+}
Property changes on: trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/validator/ValidableBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r9415 - trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-07-03 15:26:19 -0400 (Thu, 03 Jul 2008)
New Revision: 9415
Removed:
trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/ui/
Log:
remove unused package
16 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r9414 - trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-07-03 15:25:27 -0400 (Thu, 03 Jul 2008)
New Revision: 9414
Removed:
trunk/sandbox/ui/beanValidator/src/test/java/org/richfaces/ui/
Log:
remove unused package
16 years, 2 months
- 1
- 0