JBoss Rich Faces SVN: r22387 - modules/docs/trunk/Component_Reference/src/main/docbook/en-US.
by richfaces-svn-commits@lists.jboss.org
Author: SeanRogers
Date: 2011-04-07 03:08:48 -0400 (Thu, 07 Apr 2011)
New Revision: 22387
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml
Log:
Added information on autocomplete tokens: RFPL-1228
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2011-04-07 06:21:49 UTC (rev 22386)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2011-04-07 07:08:48 UTC (rev 22387)
@@ -139,6 +139,15 @@
<para>
Setting <code><varname>autoFill</varname>="true"</code> causes the combo-box to fill the text field box with a matching suggestion as the user types.
</para>
+ <para>
+ To allow users to enter multiple values separated by specific characters, use the <varname>tokens</varname> attribute. As the user types, a suggestion will present as normal. When they enter a character specified as a token, this begins a new suggestion process, and the component only uses text entered after the token character for suggestions. For example, if <code>tokens=", "</code> is set, the <sgmltag><rich:autocomplete></sgmltag> component uses both the comma and space characters as tokens to separate entries. When the user enters a comma or a space, a new suggestion process begins.
+ </para>
+ <note>
+ <title>Using tokens</title>
+ <para>
+ When declaring tokens, avoid using any characters that are present in the list of suggestions. This may cause unexpected behavior as the user expects the character to match suggestions instead of separating suggested entries.
+ </para>
+ </note>
</section>
<section id="sect-Component_Reference-richautocomplete-Customizing_the_filter_in_client_and_lazyClient_modes">
13 years, 8 months
JBoss Rich Faces SVN: r22386 - modules/docs/trunk/Developer_Guide/src/main/docbook/en-US.
by richfaces-svn-commits@lists.jboss.org
Author: SeanRogers
Date: 2011-04-07 02:21:49 -0400 (Thu, 07 Apr 2011)
New Revision: 22386
Modified:
modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/appe-Developer_Guide-Style_classes_and_skin_parameters.xml
modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml
Log:
Changed details for importing Maven projects: RFPL-1416
Modified: modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/appe-Developer_Guide-Style_classes_and_skin_parameters.xml
===================================================================
--- modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/appe-Developer_Guide-Style_classes_and_skin_parameters.xml 2011-04-07 05:12:42 UTC (rev 22385)
+++ modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/appe-Developer_Guide-Style_classes_and_skin_parameters.xml 2011-04-07 06:21:49 UTC (rev 22386)
@@ -263,6 +263,14 @@
</xi:fallback>
</xi:include>
</section>
+ <section id="sect-Developer_Guide-Style_classes_and_skin_parameters-richmessages">
+ <title><sgmltag><rich:messages></sgmltag></title>
+ <xi:include href="skinning/tabl-richmessages.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude">
+ <xi:include href="http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Component_Ref..." xmlns:xi="http://www.w3.org/2001/XInclude" />
+ </xi:fallback>
+ </xi:include>
+ </section>
<section id="sect-Developer_Guide-Style_classes_and_skin_parameters-richprogressBar">
<title><sgmltag><rich:progressBar></sgmltag></title>
<xi:include href="skinning/tabl-richprogressBar.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
Modified: modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml
===================================================================
--- modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml 2011-04-07 05:12:42 UTC (rev 22385)
+++ modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml 2011-04-07 06:21:49 UTC (rev 22386)
@@ -318,38 +318,61 @@
</para>
</step>
- <step id="step-Developer_Guide-Build_the_project-Building_for_Eclipse_and_JBoss_Tools">
+ <step id="step-Developer_Guide-Using_RichFaces_with_Maven-Import_the_project_into_an_IDE">
<title>Import the project into an IDE</title>
<para>
- Import the Maven project into your IDE. For <application>Eclipse</application> and <application>JBoss Tools</application>, you can import the project using the <productname>M2Eclipse</productname> plug-in.
+ To import the project into <productname>Eclipse</productname>, either use Maven to prepare the project or import it directly using <productname>JBoss Tools</productname>.
</para>
- <para>
- To install the plug-in, choose <menuchoice><guimenu>Help</guimenu><guimenuitem>Install New Software</guimenuitem></menuchoice> from the menu. Type <literal>Maven</literal> to locate the <guilabel>Maven Integration for Eclipse Update Site</guilabel> entry, then type <literal>Maven</literal> in the filter to show the available plug-ins. Follow the prompts to install the <guilabel>Maven Integration for Eclipse</guilabel> plug-in.
- </para>
- <para>
- With the plug-in installed, open the importing wizard by choosing <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice> from the menu. Select <menuchoice><guimenu>Maven</guimenu><guimenuitem>Existing Maven Projects</guimenuitem></menuchoice> as the import source and choose the <filename>pom.xml</filename> file for your project.
- </para>
<stepalternatives>
<step>
- <title>Using <application>Maven</application> to prepare the project for <application>Eclipse</application></title>
+ <title>Use <application>Maven</application> to prepare the project for <application>Eclipse</application></title>
+ <substeps>
+ <step>
+ <para>
+ Enter the following command in the root directory of the project:
+ </para>
+ <screen>mvn eclipse:eclipse -DdownloadSources=true -Dwtpversion=2.0</screen>
+ <para>
+ The command generates the required <application>Eclipse</application> project files.
+ </para>
+ </step>
+ <step>
+ Import the project into <application>Eclipse</application> and <application>JBoss Tools</application> through the importing wizard by choosing <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice> from the menu. Select <menuchoice><guimenu>General</guimenu><guimenuitem>Existing Projects into Workspace</guimenuitem></menuchoice> as the import source and choose the root directory for your project.
+ </step>
+ </substeps>
+ </step>
+ <step>
+ <title>Import directly using <productname>JBoss Tools</productname></title>
<para>
- Alternatively, the project can be prepared using Maven then imported normally. Enter the following command in the root directory of the project:
+ <productname>JBoss Tools</productname> contains the following plug-ins to import Maven projects:
</para>
- <screen>mvn eclipse:eclipse -DdownloadSources=true -Dwtpversion=2.0</screen>
- <para>
- The command generates the required <application>Eclipse</application> project files. You can then import the project into <application>Eclipse</application> and <application>JBoss Tools</application> through the importing wizard by choosing <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice> from the menu. Select <menuchoice><guimenu>General</guimenu><guimenuitem>Existing Projects into Workspace</guimenuitem></menuchoice> as the import source and choose the root directory for your project.
- </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ JBoss Maven Integration
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ JBoss Maven JSF Integration
+ </para>
+ </listitem>
+ </itemizedlist>
+ <substeps>
+ <step>
+ <para>
+ Install <productname>JBoss Tools</productname> using the instructions on the <citetitle>JBoss Tools Downloads</citetitle> site at <ulink url="http://www.jboss.org/tools/download.html" />.
+ </para>
+ </step>
+ <step>
+ <para>
+ With the plug-ins installed, open the importing wizard by choosing <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice> from the menu. Select <menuchoice><guimenu>Maven</guimenu><guimenuitem>Existing Maven Projects</guimenuitem></menuchoice> as the import source and choose the <filename>pom.xml</filename> file for your project.
+ </para>
+ </step>
+ </substeps>
</step>
</stepalternatives>
</step>
-<!--
- <step id="step-Developer_Guide-Using_RichFaces_with_Maven-Add_tag_library_references">
- <title>Add tag library references</title>
- <para>
- After importing, edit the <filename><replaceable>jsf-app</replaceable>/src/main/webapp/pages/index.xhtml</filename> file to include the tag library declaration as described in <xref linkend="step-Developer_Guide-Creating_a_project-Reference_the_tag_libraries" /> of <xref linkend="sect-Developer_Guide-Getting_started_with_RichFaces-Creating_a_project" />.
- </para>
- </step>
--->
</procedure>
<para>
13 years, 8 months
JBoss Rich Faces SVN: r22385 - modules/docs/trunk/Component_Reference/src/main/docbook/en-US.
by richfaces-svn-commits@lists.jboss.org
Author: SeanRogers
Date: 2011-04-07 01:12:42 -0400 (Thu, 07 Apr 2011)
New Revision: 22385
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml
Log:
Removed info on nested tree adaptors: RFPL-1353
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml 2011-04-07 02:46:22 UTC (rev 22384)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml 2011-04-07 05:12:42 UTC (rev 22385)
@@ -353,7 +353,8 @@
</para>
<xi:include href="skinning/vlst-richtree.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</section>
-
+
+ <!-- <rich:tree> -->
<section id="sect-Component_Reference-Trees-richtreeNode">
<title><sgmltag><rich:treeNode></sgmltag></title>
<para>
@@ -472,13 +473,15 @@
</para>
</section>
+ <!-- TODO not in Final -->
+ <!--
<section id="sect-Component_Reference-richtreeModelAdaptor-Multiple_levels">
<title>Multiple levels</title>
<para>
<sgmltag><rich:treeModelAdaptor></sgmltag> components can further be nested in other <sgmltag><rich:treeModelAdaptor></sgmltag> components to subsequently populate lower levels of the tree.
</para>
<para>
- To access the current element at each iteration, use the <varname>var</varname> attribute of either the parent <sgmltag><rich:tree></sgmltag> component. <xref linkend="exam-Component_Reference-richtreeModelAdaptor-Nested_richtreeModelAdaptor_components" /> demonstrates a series of nested <sgmltag><rich:treeModelAdaptor></sgmltag> components, each using the parent's <varname>var</varname> attribute to reference the current element.
+ To access the current element at each iteration, use the <varname>var</varname> attribute of the parent <sgmltag><rich:tree></sgmltag> component. <xref linkend="exam-Component_Reference-richtreeModelAdaptor-Nested_richtreeModelAdaptor_components" /> demonstrates a series of nested <sgmltag><rich:treeModelAdaptor></sgmltag> components, each using the parent's <varname>var</varname> attribute to reference the current element.
</para>
<example id="exam-Component_Reference-richtreeModelAdaptor-Nested_richtreeModelAdaptor_components">
<title><sgmltag>Nested <rich:treeModelAdaptor> components</sgmltag></title>
@@ -488,6 +491,7 @@
Each <sgmltag><rich:treeModelAdaptor></sgmltag> component is mapped to a list of objects. During the iteration, the corresponding object properties are used to define the node labels and actions, and are in turn used for iterating through nested lists.
</para>
</section>
+ -->
<section id="sect-Component_Reference-richtreeModelAdaptor-Identifying_nodes">
<title>Identifying nodes</title>
13 years, 8 months
JBoss Rich Faces SVN: r22384 - modules/docs/trunk/Component_Reference/src/main/docbook/en-US.
by richfaces-svn-commits@lists.jboss.org
Author: SeanRogers
Date: 2011-04-06 22:46:22 -0400 (Wed, 06 Apr 2011)
New Revision: 22384
Removed:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Old-Validation.xml
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Containers.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Drag_and_drop.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Functionality_extension.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Layout_and_appearance.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Menus_and_toolbars.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Output_and_messages.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Resources.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Tables_and_grids.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Validation.xml
Log:
Updated reference data lists: RFPL:1414
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml 2011-04-06 22:45:52 UTC (rev 22383)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Actions.xml 2011-04-07 02:46:22 UTC (rev 22384)
@@ -34,32 +34,6 @@
<programlisting language="XML" role="XML"><xi:include href="extras/exam-Component_Reference-a4jajax-a4jajax_example.xml_sample" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
</example>
</section>
-
- <section id="sect-Component_Reference-a4jajax-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.ajax4jsf.Ajax</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.HtmlAjaxSupport</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.ajax4jsf.Ajax</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.ajax4jsf.components.AjaxSupportRenderer</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
<section id="sect-Component_Reference-Actions-a4jparam">
@@ -135,22 +109,6 @@
</example>
</section>
- <section id="sect-Component_Reference-a4jparam-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.ajax4jsf.parameter</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.HTMLParameter</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
-
</section>
<!-- FIXME not in M2 -->
@@ -170,7 +128,7 @@
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.ajax4jsf.taglib.html.jsp.AjaxListenerTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.ajax4jsf.view.facelets.html.jsp.AjaxListenerTag</classname>
</para>
</listitem>
</itemizedlist>
@@ -228,32 +186,6 @@
</note>
-->
</section>
-
- <section id="sect-Component_Reference-a4jcommandButton-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.ajax4jsf.CommandButton</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.HtmlAjaxCommandButton</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>javax.faces.Command</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.ajax4jsf.components.AjaxCommandButtonRenderer</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
@@ -291,32 +223,6 @@
The <sgmltag><a4j:commandLink></sgmltag> uses the <varname>click</varname> event instead of the <varname>submit</varname> event.
</para>
</section>
-
- <section id="sect-Component_Reference-a4jcommandLink-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.ajax4jsf.CommandLink</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.HtmlAjaxCommandLink</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>javax.faces.Command</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.ajax4jsf.components.AjaxCommandLinkRenderer</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
<!-- TODO not in M2 -->
@@ -393,32 +299,6 @@
The <sgmltag><a4j:jsFunction></sgmltag> component allows the use of the <sgmltag><a4j:param></sgmltag> component or the JavaServer Faces <sgmltag><f:param></sgmltag> component to pass any number of parameters for the JavaScript function.
</para>
</section>
-
- <section id="sect-Component_Reference-a4jjsFunction-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.ajax4jsf.Function</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.HtmlajaxFunction</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.ajax4jsf.components.ajaxFunction</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.ajax4jsf.components.ajaxFunctionRenderer</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
<section id="sect-Component_Reference-Actions-a4jpoll">
@@ -464,31 +344,6 @@
</section>
-->
- <section id="sect-Component_Reference-a4jpoll-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.ajax4jsf.Poll</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.AjaxPoll</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.ajax4jsf.components.AjaxPoll</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.ajax4jsf.components.AjaxPollRenderer</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
<section id="sect-Component_Reference-Actions-a4jpush">
@@ -630,31 +485,6 @@
</section>
-->
- <section id="sect-Component_Reference-a4jpush-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.ajax4jsf.Push</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.AjaxPush</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.ajax4jsf.components.AjaxPush</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.ajax4jsf.components.AjaxPushRenderer</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
</chapter>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Containers.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Containers.xml 2011-04-06 22:45:52 UTC (rev 22383)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Containers.xml 2011-04-07 02:46:22 UTC (rev 22384)
@@ -85,32 +85,6 @@
<programlisting language="XML" role="XML"><xi:include href="extras/exam-Component_Reference-a4jinclude-A_wizard_using_a4jinclude-2.xml_sample" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
</example>
</section>
-
- <section id="sect-Component_Reference-a4jinclude-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.ajax4jsf.Include</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.Include</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>javax.faces.Output</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.ajax4jsf.components.AjaxIncludeRenderer</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
-->
@@ -156,31 +130,6 @@
</para>
</section>
- <section id="sect-Component_Reference-a4joutputPanel-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.ajax4jsf.OutputPanel</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.HtmlAjaxOutputPanel</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>javax.faces.Panel</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.ajax4jsf.components.AjaxOutputPanelRenderer</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
<!-- TODO not in M2 -->
@@ -249,32 +198,6 @@
<para>
Regions can be nested, in which case only the parent region of the component initiating the request will be processed.
</para>
-
- <section id="sect-Component_Reference-a4jregion-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.ajax4jsf.AjaxRegion</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.HtmlAjaxRegion</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.ajax4jsf.AjaxRegion</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.ajax4jsf.components.AjaxRegionRenderer</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
</chapter>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Drag_and_drop.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Drag_and_drop.xml 2011-04-06 22:45:52 UTC (rev 22383)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Drag_and_drop.xml 2011-04-07 02:46:22 UTC (rev 22384)
@@ -44,7 +44,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlDragSource</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIDragSource</classname>
</para>
</listitem>
<listitem>
@@ -57,11 +57,6 @@
<parameter>renderer-type</parameter>: <classname>org.richfaces.DragSourceRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.DragSourceTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
</section>
@@ -123,7 +118,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlDropTarget</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIDropTarget</classname>
</para>
</listitem>
<listitem>
@@ -138,7 +133,7 @@
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.DropTargetTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.DropHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -206,7 +201,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlDragIndicator</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIDragIndicator</classname>
</para>
</listitem>
<listitem>
@@ -219,11 +214,6 @@
<parameter>renderer-type</parameter>: <classname>org.richfaces.DragIndicatorRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.DragIndicatorTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Functionality_extension.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Functionality_extension.xml 2011-04-06 22:45:52 UTC (rev 22383)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Functionality_extension.xml 2011-04-07 02:46:22 UTC (rev 22384)
@@ -65,27 +65,27 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.ComponentControl</classname>
+ <parameter>client-behavior-renderer-type</parameter>: <classname>org.richfaces.behavior.ComponentControlBehavior</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlComponentControl</classname>
+ <parameter>behavior-id</parameter>: <classname>org.richfaces.behavior.ComponentControlBehavior</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.ComponentControl</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.taglib.ComponentControlHandler</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.ComponentControlRenderer</classname>
+ <parameter>behavior-class</parameter>: <classname>org.richfaces.component.behavior.ComponentControlBehavior</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.ComponentControlTag</classname>
+ <parameter>client-behavior-renderer-class</parameter>: <classname>org.richfaces.renderkit.html.ToggleControlRenderer</classname>
</para>
</listitem>
</itemizedlist>
@@ -121,7 +121,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlHashParam</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIHashParam</classname>
</para>
</listitem>
<listitem>
@@ -136,7 +136,7 @@
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.HashParamTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.HashParamTag</classname>
</para>
</listitem>
</itemizedlist>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Layout_and_appearance.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Layout_and_appearance.xml 2011-04-06 22:45:52 UTC (rev 22383)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Layout_and_appearance.xml 2011-04-07 02:46:22 UTC (rev 22384)
@@ -276,7 +276,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlJQuery</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIJQuery</classname>
</para>
</listitem>
<listitem>
@@ -289,11 +289,6 @@
<parameter>renderer-type</parameter>: <classname>org.richfaces.JQueryRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.JQueryTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
</section>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Menus_and_toolbars.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Menus_and_toolbars.xml 2011-04-06 22:45:52 UTC (rev 22383)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Menus_and_toolbars.xml 2011-04-07 02:46:22 UTC (rev 22384)
@@ -166,7 +166,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlDropDownMenu</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIDropDownMenu</classname>
</para>
</listitem>
<listitem>
@@ -179,11 +179,6 @@
<parameter>renderer-type</parameter>: <classname>org.richfaces.DropDownMenuRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.DropDownMenuTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
@@ -278,7 +273,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlMenuItem</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIMenuItem</classname>
</para>
</listitem>
<listitem>
@@ -291,11 +286,6 @@
<parameter>renderer-type</parameter>: <classname>org.richfaces.MenuItemRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.MenuItemTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
</section>
@@ -358,30 +348,30 @@
</section>
-->
- <section id="sect-Component_Reference-richmenuGroup-JavaScript_API">
- <title>JavaScript API</title>
- <para>
- The <sgmltag><rich:menuGroup></sgmltag> component can be controlled through the JavaScript API. The JavaScript API provides the following functions:
- </para>
- <variablelist>
- <varlistentry>
- <term><function>show()</function></term>
- <listitem>
- <para>
- Show the menu group.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><function>hide()</function></term>
- <listitem>
- <para>
- Hide the menu group.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </section>
+ <section id="sect-Component_Reference-richmenuGroup-JavaScript_API">
+ <title>JavaScript API</title>
+ <para>
+ The <sgmltag><rich:menuGroup></sgmltag> component can be controlled through the JavaScript API. The JavaScript API provides the following functions:
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term><function>show()</function></term>
+ <listitem>
+ <para>
+ Show the menu group.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><function>hide()</function></term>
+ <listitem>
+ <para>
+ Hide the menu group.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </section>
<section id="sect-Component_Reference-richmenuGroup-Reference_data">
<title>Reference data</title>
@@ -393,7 +383,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlMenuGroup</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIMenuGroup</classname>
</para>
</listitem>
<listitem>
@@ -406,11 +396,6 @@
<parameter>renderer-type</parameter>: <classname>org.richfaces.MenuGroupRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.MenuGroupTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
</section>
@@ -439,7 +424,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlMenuSeparator</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIMenuSeparator</classname>
</para>
</listitem>
<listitem>
@@ -452,11 +437,6 @@
<parameter>renderer-type</parameter>: <classname>org.richfaces.MenuSeparatorRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.MenuSeparatorTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
</section>
@@ -709,7 +689,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlPanelMenu</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIPanelMenu</classname>
</para>
</listitem>
<listitem>
@@ -724,7 +704,7 @@
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.PanelMenuTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.html.PanelMenuTagHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -865,7 +845,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlPanelMenuGroup</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIPanelMenuGroup</classname>
</para>
</listitem>
<listitem>
@@ -878,11 +858,6 @@
<parameter>renderer-type</parameter>: <classname>org.richfaces.PanelMenuGroupRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.PanelMenuGroupTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
</section>
@@ -994,7 +969,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlPanelMenuItem</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIPanelMenuItem</classname>
</para>
</listitem>
<listitem>
@@ -1007,11 +982,6 @@
<parameter>renderer-type</parameter>: <classname>org.richfaces.PanelMenuItemRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.PanelMenuItemTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
</section>
@@ -1146,7 +1116,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlToolbar</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIToolbar</classname>
</para>
</listitem>
<listitem>
@@ -1159,11 +1129,6 @@
<parameter>renderer-type</parameter>: <classname>org.richfaces.ToolbarRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.ToolbarTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
@@ -1223,12 +1188,12 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlToolbarGroup</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIToolbarGroup</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.ToolbarGroup</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Toolbar</classname>
</para>
</listitem>
<listitem>
@@ -1236,11 +1201,6 @@
<parameter>renderer-type</parameter>: <classname>org.richfaces.ToolbarGroupRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.ToolbarGroupTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
</section>
Deleted: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Old-Validation.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Old-Validation.xml 2011-04-06 22:45:52 UTC (rev 22383)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Old-Validation.xml 2011-04-07 02:46:22 UTC (rev 22384)
@@ -1,259 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-<chapter id="chap-Component_Reference-Validation">
- <title>Validation</title>
- <para>
- This chapter covers those components that validate user input. The components enhance <acronym>JSF</acronym> validation capabilities with Ajax support and the use of <application>Hibernate</application> validators.
- </para>
-
- <section id="sect-Component_Reference-Validation-richajaxValidator">
- <title><sgmltag><rich:ajaxValidator></sgmltag></title>
- <para>
- The <sgmltag><rich:ajaxValidator></sgmltag> component provides Ajax validation for <acronym>JSF</acronym> inputs. It is added as a child component to a <acronym>JSF</acronym> tag, and the <varname>event</varname> attribute specifies when to trigger the validation.
- </para>
- <example id="exam-Component_Reference-richajaxValidator-richajaxValidator_example">
- <title><sgmltag><rich:ajaxValidator></sgmltag> example</title>
- <para>
- This example shows the use of <sgmltag><rich:ajaxValidator></sgmltag> with standard <acronym>JSF</acronym> validators. The validators check the length of the entered name, and the range of the entered age.
- </para>
- <programlisting language="XML" role="XML"><xi:include href="extras/exam-Component_Reference-richajaxValidator-richajaxValidator_example.xml_sample" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- </example>
-
- <section id="sect-Component_Reference-richajaxValidator-Custom_validators">
- <title>Custom validators</title>
- <para>
- The <sgmltag><rich:ajaxValidator></sgmltag> component can also work with custom validators made using the <acronym>JSF</acronym> Validation <acronym>API</acronym> in the <package>javax.faces.validator</package> package, or with Hibernate Validator. Refer to the <citetitle>Hibernate Validator documentation</citetitle> for details on how to use Hibernate Validator.
- </para>
- <example id="exam-Component_Reference-richajaxValidator-Using_richajaxValidator_with_Hibernate_Validator">
- <title>Using <sgmltag><rich:ajaxValidator></sgmltag> with Hibernate Validator</title>
- <para>
- This example shows the use of <sgmltag><rich:ajaxValidator></sgmltag> with Hibernate Validator. It validates the entered name, email, and age.
- </para>
- <programlisting language="XML" role="XML"><xi:include href="extras/exam-Component_Reference-richajaxValidator-Using_richajaxValidator_with_Hibernate_Validator-0.xml_sample" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- <para>
- The validation is performed using the <classname>ValidationBean</classname> class:
- </para>
- <programlisting language="Java" role="JAVA"><xi:include href="extras/exam-Component_Reference-ValidationBean.js" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- <blockquote>
- <figure id="figu-Component_Reference-Using_richajaxValidator_with_Hibernate_Validator-richajaxValidator_example_result">
- <title><sgmltag><rich:ajaxValidator></sgmltag> example result</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/figu-Component_Reference-richajaxValidator-richajaxValidator_example_result.png" format="PNG" width="444" />
- </imageobject>
- <textobject>
- <para>
- The result of the <sgmltag><rich:ajaxValidator></sgmltag> example: three text entry fields with corresponding validation messages.
- </para>
- </textobject>
- </mediaobject>
- </figure>
- </blockquote>
- </example>
- </section>
-
- <section id="sect-Component_Reference-richajaxValidator-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.richfaces.ajaxValidator</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlajaxValidator</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.richfaces.ajaxValidator</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.ajaxValidatorRenderer</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.ajaxValidatorTag</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
- </section>
-
- <section id="sect-Component_Reference-Validation-richbeanValidator">
- <title><sgmltag><rich:beanValidator></sgmltag></title>
- <para>
- The <sgmltag><rich:beanValidator></sgmltag> component provides model-based constraints using Hibernate Validator. This allows Hibernate Validator to be used similar to its use with Seam-based applications.
- </para>
- <section id="sect-Component_Reference-richbeanValidator-Basic_usage">
- <title>Basic usage</title>
- <para>
- The <varname>summary</varname> attribute is used for displaying messages about validation errors.
- </para>
- <example id="exam-Component_Reference-richbeanValidator-richbeanValidator_example">
- <title><sgmltag><rich:beanValidator></sgmltag> example</title>
- <para>
- This example shows the bean-based validation of a simple form, containing the user's name, email, and age. The <sgmltag><rich:beanValidator></sgmltag> component is defined in the same way as for <acronym>JSF</acronym> validators.
- </para>
- <programlisting language="XML" role="XML"><xi:include href="extras/exam-Component_Reference-richbeanValidator-richbeanValidator_example-0.xml_sample" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- <para>
- The accompanying bean contains the validation data:
- </para>
- <programlisting language="Java" role="JAVA"><xi:include href="extras/exam-Component_Reference-ValidationBean.js" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- <blockquote>
- <figure id="figu-Component_Reference-richbeanValidator_example-richbeanValidator_example_result">
- <title><sgmltag><rich:beanValidator></sgmltag> example result</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/figu-Component_Reference-richbeanValidator-richbeanValidator_example_result.png" format="PNG" width="444" />
- </imageobject>
- <textobject>
- <para>
- The result of the <sgmltag><rich:beanValidator></sgmltag> example: three text entry fields with corresponding validation messages.
- </para>
- </textobject>
- </mediaobject>
- </figure>
- </blockquote>
- </example>
- </section>
-
- <section id="sect-Component_Reference-richbeanValidator-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.richfaces.beanValidator</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlbeanValidator</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.richfaces.beanValidator</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.beanValidatorRenderer</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.beanValidatorTag</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
- </section>
-
- <section id="sect-Component_Reference-Validation-richgraphValidator">
- <title><sgmltag><rich:graphValidator></sgmltag></title>
- <para>
- The <sgmltag><rich:graphValidator></sgmltag> component is used to wrap a group of input components for overall validation with Hibernate Validators. This is different from the <sgmltag><rich:beanValidator></sgmltag> component, which is used as a child element to individual input components.
- </para>
-
- <section id="sect-Component_Reference-richgraphValidator-Basic_usage">
- <title>Basic usage</title>
- <para>
- The <varname>summary</varname> attribute is used for displaying messages about validation errors.
- </para>
- <example id="exam-Component_Reference-richgraphValidator-richgraphValidator_example">
- <title><sgmltag><rich:graphValidator></sgmltag> example</title>
- <para>
- This example shows the validation of a simple form, containing the user's name, email, and age. The <sgmltag><rich:graphValidator></sgmltag> component wraps the input components to validate them together.
- </para>
- <programlisting language="XML" role="XML"><xi:include href="extras/exam-Component_Reference-richgraphValidator-richgraphValidator_example-0.xml_sample" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- <para>
- The accompanying bean contains the validation data:
- </para>
- <programlisting language="Java" role="JAVA"><xi:include href="extras/exam-Component_Reference-ValidationBean.js" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- <blockquote>
- <figure id="figu-Component_Reference-richgraphValidator_example-richgraphValidator_example_result">
- <title><sgmltag><rich:graphValidator></sgmltag> example result</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/figu-Component_Reference-richgraphValidator-richgraphValidator_example_result.png" format="PNG" width="444" />
- </imageobject>
- <textobject>
- <para>
- The result of the <sgmltag><rich:graphValidator></sgmltag> example: three text entry fields with corresponding validation messages.
- </para>
- </textobject>
- </mediaobject>
- </figure>
- </blockquote>
- </example>
- </section>
-
- <section id="sect-Component_Reference-richgraphValidator-Bean_values">
- <title>Bean values</title>
- <para>
- The optional <varname>value</varname> attribute can be used to define a value bound to the bean. The bean properties are then validated again <emphasis>after</emphasis> the model has been updated.
- </para>
- <example id="exam-Component_Reference-richgraphValidator-Using_the_value_attribute">
- <title>Using the <varname>value</varname> attribute</title>
-
- <programlisting language="XML" role="XML">
- <xi:include href="extras/exam-Component_Reference-richgraphValidator-Using_the_value_attribute.xml_sample" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" />
- </programlisting>
- <blockquote>
- <figure id="figu-Component_Reference-Using_the_value_attribute-Result_from_using_the_value_attribute">
- <title>Result from using the <varname>value</varname> attribute</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/figu-Component_Reference-richgraphValidator-Result_from_using_the_value_attribute.png" format="PNG" width="444" />
- </imageobject>
- <textobject>
- <para>
- The result from the example of using the <varname>value</varname> attribute with <sgmltag><rich:graphValidator></sgmltag>. The values in the number spinners need to validate before being stored.
- </para>
- </textobject>
- </mediaobject>
- </figure>
- </blockquote>
- </example>
- </section>
-
- <section id="sect-Component_Reference-richgraphValidator-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.richfaces.graphValidator</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlgraphValidator</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.richfaces.graphValidator</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.graphValidatorRenderer</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.graphValidatorTag</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
- </section>
-
-</chapter>
-
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Output_and_messages.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Output_and_messages.xml 2011-04-06 22:45:52 UTC (rev 22383)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Output_and_messages.xml 2011-04-07 02:46:22 UTC (rev 22384)
@@ -69,29 +69,24 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.component.RichMessage</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.RichMessage</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlRichMessage</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIRichMessage</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.component.RichMessage</classname>
+ <parameter>component-family</parameter>: <classname>javax.faces.Message</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.RichMessageRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.MessageRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.RichMessageTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
@@ -217,29 +212,24 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.component.RichMessages</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.RichMessages</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlRichMessages</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIRichMessages</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.component.RichMessages</classname>
+ <parameter>component-family</parameter>: <classname>javax.faces.Messages</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.RichMessagesRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.MessagesRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.RichMessagesTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
@@ -492,24 +482,19 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlProgressBar</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIProgressBar</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.component.ProgressBar</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.ProgressBar</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.renderkit.ProgressBarRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.ProgressBarRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.ProgressBarTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
@@ -735,29 +720,24 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.component.tooltip</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Tooltip</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlTooltip</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UITooltip</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.component.tooltip</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Tooltip</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.renderkit.html.tooltipRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.TooltipRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.HtmlTooltipTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels.xml 2011-04-06 22:45:52 UTC (rev 22383)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels.xml 2011-04-07 02:46:22 UTC (rev 22384)
@@ -67,29 +67,24 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.panel</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Panel</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlPanel</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIPanel</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.panel</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Panel</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.panelRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.PanelRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.panelTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
@@ -260,27 +255,27 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.accordion</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Accordion</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlAccordion</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIAccordion</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.accordion</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Accordion</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.accordionRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.AccordionRenderer</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.accordionTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.html.TogglePanelTagHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -332,29 +327,24 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.accordionItem</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.AccordionItem</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlAccordionItem</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIAccordionItem</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.accordionItem</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.AccordionItem</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.accordionItemRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.AccordionItemRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.accordionItemTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
</section>
@@ -499,27 +489,27 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.collapsiblePanel</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.CollapsiblePanel</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlcollapsiblePanel</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UICollapsiblePanel</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.collapsiblePanel</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.CollapsiblePanel</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.collapsiblePanelRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.CollapsiblePanelRenderer</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.collapsiblePanelTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.html.CollapsiblePanelTagHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -714,29 +704,24 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.popupPanel</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.PopupPanel</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlpopupPanel</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIPopupPanel</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.popupPanel</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.PopupPanel</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.popupPanelRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.PopupPanelRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.popupPanelTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
@@ -981,27 +966,27 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.tabPanel</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.TabPanel</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlTabPanel</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UITabPanel</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.tabPanel</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.TabPanel</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.tabPanelRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.TabPanelRenderer</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.tabPanelTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.html.TogglePanelTagHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -1095,29 +1080,24 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.tab</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Tab</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlTab</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UITab</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.tab</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Tab</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.tabRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.TabRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.tabTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
@@ -1253,7 +1233,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlTogglePanel</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UITogglePanel</classname>
</para>
</listitem>
<listitem>
@@ -1268,7 +1248,7 @@
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.TogglePanelTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.html.TogglePanelTagHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -1335,27 +1315,27 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.ToggleControl</classname>
+ <parameter>client-behavior-renderer-type</parameter>: <classname>org.richfaces.component.behavior.ToggleControl</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlToggleControl</classname>
+ <parameter>behavior-id</parameter>: <classname>org.richfaces.component.behavior.ToggleControl</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.ToggleControl</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.html.CustomBehaviorHandler</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.ToggleControlRenderer</classname>
+ <parameter>behavior-class</parameter>: <classname>org.richfaces.component.behavior.ToggleControl</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.ToggleControlTag</classname>
+ <parameter>client-behavior-renderer-class</parameter>: <classname>org.richfaces.renderkit.html.ToggleControlRenderer</classname>
</para>
</listitem>
</itemizedlist>
@@ -1379,7 +1359,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlTogglePanelItem</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UITogglePanelItem</classname>
</para>
</listitem>
<listitem>
@@ -1392,11 +1372,6 @@
<parameter>renderer-type</parameter>: <classname>org.richfaces.TogglePanelItemRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.TogglePanelItemTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
</section>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml 2011-04-06 22:45:52 UTC (rev 22383)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml 2011-04-07 02:46:22 UTC (rev 22384)
@@ -101,32 +101,6 @@
</listitem>
</itemizedlist>
</section>
-
- <section id="sect-Component_Reference-a4jqueue-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.ajax4jsf.QueueRenderer</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.HtmlQueue</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.ajax4jsf.Queue</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.ajax4jsf.taglib.html.jsp.QueueTag</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
<section id="sect-Component_Reference-Processing_management-a4jattachQueue">
<title><sgmltag><a4j:attachQueue></sgmltag></title>
@@ -175,32 +149,6 @@
</para>
</example>
</section>
-
- <section id="sect-Component_Reference-a4jattachQueue-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.ajax4jsf.AttachQueueRenderer</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.HtmlAttachQueue</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.ajax4jsf.AttachQueue</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.ajax4jsf.taglib.html.jsp.AttachQueueTag</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
</section>
@@ -286,32 +234,6 @@
</para>
</note>
</section>
-
- <section id="sect-Component_Reference-a4jlog-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.ajax4jsf.Log</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.AjaxLog</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.ajax4jsf.Log</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.ajax4jsf.LogRenderer</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
<section id="sect-Component_Reference-a4jlog-Style_classes_and_skin_parameters">
<title>Style classes and skin parameters</title>
@@ -418,31 +340,6 @@
</variablelist>
</section>
- <section id="sect-Component_Reference-a4jstatus-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.ajax4jsf.Status</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.HtmlAjaxStatus</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>javax.faces.Panel</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.ajax4jsf.components.AjaxStatusRenderer</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
</chapter>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Resources.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Resources.xml 2011-04-06 22:45:52 UTC (rev 22383)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Resources.xml 2011-04-07 02:46:22 UTC (rev 22384)
@@ -221,26 +221,6 @@
</para>
</section>
- <section id="sect-Component_Reference-a4jkeepAlive-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.ajax4jsf.components.KeepAlive</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.components.AjaxKeepAlive</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.ajax4jsf.components.AjaxKeepAlive</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
-->
@@ -332,32 +312,6 @@
</para>
</note>
</section>
-
- <section id="sect-Component_Reference-a4jmediaOutput-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.ajax4jsf.Push</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.AjaxPush</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.ajax4jsf.components.AjaxPush</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.ajax4jsf.components.AjaxPushRenderer</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
</chapter>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2011-04-06 22:45:52 UTC (rev 22383)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2011-04-07 02:46:22 UTC (rev 22384)
@@ -222,27 +222,27 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.autocomplete</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Autocomplete</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlAutocomplete</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIAutocomplete</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.autocomplete</classname>
+ <parameter>component-family</parameter>: <classname>javax.faces.Input</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.renderkit.autocompleteRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.AutocompleteRenderer</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.autocompleteTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.AutocompleteHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -275,32 +275,6 @@
<programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richautocompleteBehavior-Defining_suggestion_values.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
</example>
</section>
-
- <section id="sect-Component_Reference-richautocompleteBehavior-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.richfaces.autocompleteBehavior</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlAutocompleteBehavior</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.richfaces.autocompleteBehavior</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.autocompleteBehaviorTag</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
-->
@@ -480,7 +454,7 @@
</listitem>
</itemizedlist>
<para>
- Alternatively, use the <classname>org.richfaces.renderkit.calendar</classname> resource bundle with Java Archive files (<acronym>JAR</acronym>s) defining the same properties.
+ Alternatively, use the <classname>org.richfaces.calendar</classname> resource bundle with Java Archive files (<acronym>JAR</acronym>s) defining the same properties.
</para>
</section>
@@ -760,27 +734,27 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.calendar</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Calendar</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlCalendar</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UICalendar</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.calendar</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Calendar</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.renderkit.calendarRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.CalendarRenderer</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.calendarTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.CalendarHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -994,6 +968,11 @@
<parameter>renderer-type</parameter>: <classname>org.richfaces.FileUploadRenderer</classname>
</para>
</listitem>
+ <listitem>
+ <para>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.FileUploadHandler</classname>
+ </para>
+ </listitem>
</itemizedlist>
</section>
@@ -1158,29 +1137,24 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.inplaceInput</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.InplaceInput</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlInplaceInput</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIInplaceInput</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.inplaceInput</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.InplaceInput</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.renderkit.inplaceInputRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.InplaceInputRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.inplaceInputTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
@@ -1413,29 +1387,24 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.inplaceSelect</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.InplaceSelect</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlInplaceSelect</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIInplaceSelect</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.inplaceSelect</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Select</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.renderkit.inplaceSelectRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.InplaceSelectRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.inplaceSelectTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
@@ -1534,29 +1503,24 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.inputNumberSlider</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.InputNumberSlider</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlInputNumberSlider</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIInputNumberSlider</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.inputNumberSlider</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Input</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.renderkit.inputNumberSliderRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.inputNumberSliderRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.inputNumberSliderTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
@@ -1652,29 +1616,24 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.inputNumberSpinner</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.InputNumberSpinner</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlInputNumberSpinner</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIInputNumber</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.inputNumberSpinner</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Input</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.renderkit.inputNumberSpinnerRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.InputNumberSpinnerRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.inputNumberSpinnerTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
@@ -1815,29 +1774,24 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.select</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Select</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlSelect</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UISelect</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.select</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Select</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.renderkit.selectRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.SelectRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.selectTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Tables_and_grids.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Tables_and_grids.xml 2011-04-06 22:45:52 UTC (rev 22383)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Tables_and_grids.xml 2011-04-07 02:46:22 UTC (rev 22384)
@@ -126,12 +126,12 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.ajax4jsf.Repeat</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Repeat</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.ajax4jsf.component.html.HtmlAjaxRepeat</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIRepeat</classname>
</para>
</listitem>
<listitem>
@@ -141,9 +141,14 @@
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.ajax4jsf.components.RepeatRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.RepeatRenderer</classname>
</para>
</listitem>
+ <listitem>
+ <para>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.taglib.html.RepeatHandler</classname>
+ </para>
+ </listitem>
</itemizedlist>
</section>
</section>
@@ -274,12 +279,12 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlDataTable</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIDataTable</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.DataTable</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Data</classname>
</para>
</listitem>
<listitem>
@@ -289,7 +294,7 @@
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.DataTableTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.taglib.DataTableHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -400,7 +405,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlColumn</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIColumn</classname>
</para>
</listitem>
<listitem>
@@ -408,16 +413,6 @@
<parameter>component-family</parameter>: <classname>org.richfaces.Column</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.renderkit.CellRenderer</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.ColumnTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
@@ -473,7 +468,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlColumnGroup</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIColumnGroup</classname>
</para>
</listitem>
<listitem>
@@ -486,11 +481,6 @@
<parameter>renderer-type</parameter>: <classname>org.richfaces.ColumnGroupRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.ColumnGroupTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
@@ -543,22 +533,6 @@
For details on filtering and sorting columns, refer to <xref linkend="sect-Component_Reference-Tables_and_grids-Table_filtering" /> and <xref linkend="sect-Component_Reference-Tables_and_grids-Table_sorting" />.
</para>
</section>
-
- <section id="sect-Component_Reference-richcolumns-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.richfaces.Column</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.ColumnsTagHandler</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
<section id="sect-Component_Reference-richcolumns-Style_classes_and_skin_parameters">
<title>Style classes and skin parameters</title>
@@ -652,22 +626,22 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlCollapsibleSubTable</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UICollapsibleSubTable</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.CollapsibleSubTable</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Data</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.CollapsibleSubTable</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.CollapsibleSubTableRenderer</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.CollapsibleSubTableTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.taglib.CollapsibleSubTableHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -711,7 +685,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlCollapsibleSubTableToggler</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UICollapsibleSubTableToggler</classname>
</para>
</listitem>
<listitem>
@@ -721,14 +695,9 @@
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.CollapsibleSubTableToggler</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.CollapsibleSubTableTogglerRenderer</classname>
</para>
</listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.CollapsibleSubTableTogglerTag</classname>
- </para>
- </listitem>
</itemizedlist>
</section>
@@ -1057,12 +1026,12 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlExtendedDataTable</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIExtendedDataTable</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.ExtendedDataTable</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Data</classname>
</para>
</listitem>
<listitem>
@@ -1072,7 +1041,7 @@
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.ExtendedDataTableTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.taglib.ExtendedDataTableHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -1166,12 +1135,12 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlDataGrid</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIDataGrid</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.DataGrid</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Data</classname>
</para>
</listitem>
<listitem>
@@ -1181,7 +1150,7 @@
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.DataGridTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.taglib.DataGridHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -1415,7 +1384,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlList</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIList</classname>
</para>
</listitem>
<listitem>
@@ -1430,7 +1399,7 @@
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.ListTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.taglib.ListHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -1599,7 +1568,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlDataScroller</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIDataScroller</classname>
</para>
</listitem>
<listitem>
@@ -1614,7 +1583,7 @@
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.DataScrollerTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.taglib.DataScrollerHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -1638,7 +1607,7 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlDataFilterSlider</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UIDataFilterSlider</classname>
</para>
</listitem>
<listitem>
@@ -1653,7 +1622,7 @@
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.dataFilterSliderTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.taglib.dataFilterSliderTag</classname>
</para>
</listitem>
</itemizedlist>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml 2011-04-06 22:45:52 UTC (rev 22383)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml 2011-04-07 02:46:22 UTC (rev 22384)
@@ -320,27 +320,27 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.tree</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.Tree</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.Htmltree</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UItree</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.tree</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.Tree</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.treeRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.TreeRenderer</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.treeTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.TreeHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -414,27 +414,27 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.treeNode</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.TreeNode</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmltreeNode</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UITreeNode</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.treeNode</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.TreeNode</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.treeNodeRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.TreeNodeRenderer</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.treeNodeTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.TreeNodeHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -478,7 +478,7 @@
<sgmltag><rich:treeModelAdaptor></sgmltag> components can further be nested in other <sgmltag><rich:treeModelAdaptor></sgmltag> components to subsequently populate lower levels of the tree.
</para>
<para>
- To access the current element at each iteration, use the <varname>var</varname> attribute of either the parent <sgmltag><rich:tree></sgmltag> component<!-- or the <sgmltag><rich:treeModelAdaptor></sgmltag> component itself-->. <xref linkend="exam-Component_Reference-richtreeModelAdaptor-Nested_richtreeModelAdaptor_components" /> demonstrates a series of nested <sgmltag><rich:treeModelAdaptor></sgmltag> components, each using the parent's <varname>var</varname> attribute to reference the current element.
+ To access the current element at each iteration, use the <varname>var</varname> attribute of either the parent <sgmltag><rich:tree></sgmltag> component. <xref linkend="exam-Component_Reference-richtreeModelAdaptor-Nested_richtreeModelAdaptor_components" /> demonstrates a series of nested <sgmltag><rich:treeModelAdaptor></sgmltag> components, each using the parent's <varname>var</varname> attribute to reference the current element.
</para>
<example id="exam-Component_Reference-richtreeModelAdaptor-Nested_richtreeModelAdaptor_components">
<title><sgmltag>Nested <rich:treeModelAdaptor> components</sgmltag></title>
@@ -509,17 +509,17 @@
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmltreeModelAdaptor</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UITreeModelAdaptor</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.treeModelAdaptor</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.TreeModelAdaptor</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.treeModelAdaptorTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.TreeModelAdaptorHandler</classname>
</para>
</listitem>
</itemizedlist>
@@ -588,22 +588,22 @@
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.treeModelRecursiveAdaptor</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.TreeModelRecursiveAdaptor</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmltreeModelRecursiveAdaptor</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.UITreeModelRecursiveAdaptor</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.treeModelRecursiveAdaptor</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.TreeModelRecursiveAdaptor</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.treeModelRecursiveAdaptorTag</classname>
+ <parameter>handler-class</parameter>: <classname>org.richfaces.view.facelets.TreeModelRecursiveAdaptorHandler</classname>
</para>
</listitem>
</itemizedlist>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Validation.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Validation.xml 2011-04-06 22:45:52 UTC (rev 22383)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Validation.xml 2011-04-07 02:46:22 UTC (rev 22384)
@@ -90,37 +90,6 @@
If no client-side validation method exists for a registered server-side validator, Ajax fall-back is used. The <sgmltag><rich:validator></sgmltag> behavior invokes all available client-side validators. If all the client-side validators return valid, RichFaces performs an Ajax request to invoke the remaining validators on the server side.
</para>
</section>
-
- <section id="sect-Component_Reference-richvalidator-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.richfaces.validator</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.Htmlvalidator</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.richfaces.validator</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.validatorRenderer</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.validatorTag</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
<section id="sect-Component_Reference-Validation-richgraphValidator">
@@ -171,37 +140,6 @@
</mediaobject>
</example>
</section>
-
- <section id="sect-Component_Reference-richgraphValidator-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.richfaces.graphValidator</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlgraphValidator</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.richfaces.graphValidator</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.graphValidatorRenderer</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.graphValidatorTag</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
</section>
</chapter>
13 years, 8 months
JBoss Rich Faces SVN: r22383 - in trunk: ui/validator/api/src/main/java/org/richfaces/validator and 6 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2011-04-06 18:45:52 -0400 (Wed, 06 Apr 2011)
New Revision: 22383
Modified:
trunk/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml
trunk/examples/validator-demo/src/main/webapp/examples/faces-validators.xhtml
trunk/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java
trunk/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java
trunk/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java
trunk/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java
trunk/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidatorServiceImpl.java
trunk/ui/validator/ui/src/main/java/org/richfaces/validator/ConverterServiceImpl.java
trunk/ui/validator/ui/src/main/java/org/richfaces/validator/DummyBeanValidatorService.java
trunk/ui/validator/ui/src/main/java/org/richfaces/validator/FacesServiceBase.java
trunk/ui/validator/ui/src/main/java/org/richfaces/validator/FacesValidatorServiceImpl.java
trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetConverterTest.java
trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java
trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java
trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java
trunk/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java
trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java
trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java
Log:
RESOLVED - issue RF-10434: CSV: validatorMessage defined at component not influece the message for client validation.
https://issues.jboss.org/browse/RF-10434
Modified: trunk/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml
===================================================================
--- trunk/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/examples/validator-demo/src/main/webapp/examples/clientAndajaxValidator.xhtml 2011-04-06 22:45:52 UTC (rev 22383)
@@ -23,9 +23,9 @@
</h:inputText>
<h:outputText id="out" value="#{test.value}"></h:outputText>
<csv:message id="uiMessage" for="text" />
- <h:outputLabel for="number" value="Four annotations for number"/>
- <h:inputText id="number" value="#{test.numbers}">
- <csv:validator onbeforesubmit="alert('Before')"/>
+ <h:outputLabel for="number" value="Four annotations for number, with custom msg"/>
+ <h:inputText id="number" value="#{test.numbers}" converterMessage="Nor a number" validatorMessage="Wrong number">
+ <csv:validator event="blur"/>
</h:inputText>
<h:outputText id="outNum" value="#{test.numbers}"></h:outputText>
<csv:message id="uiNumMessage" for="number" />
Modified: trunk/examples/validator-demo/src/main/webapp/examples/faces-validators.xhtml
===================================================================
--- trunk/examples/validator-demo/src/main/webapp/examples/faces-validators.xhtml 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/examples/validator-demo/src/main/webapp/examples/faces-validators.xhtml 2011-04-06 22:45:52 UTC (rev 22383)
@@ -31,8 +31,8 @@
<h:outputText id="dblrangeOut" value="#{test.doubleValue}"></h:outputText>
<csv:message for="dblrange" />
- <h:outputLabel for="longrange" value="Text long range from 2 to 5:" />
- <h:inputText id="longrange" value="#{test.longValue}">
+ <h:outputLabel for="longrange" value="Text long range from 2 to 5, custom msg:" />
+ <h:inputText id="longrange" value="#{test.longValue}" converterMessage="Nor a number" validatorMessage="Wrong number">
<f:validateLongRange minimum="2" maximum="5" />
<csv:validator event="blur" />
</h:inputText>
@@ -44,7 +44,7 @@
<csv:validator/>
</h:commandButton>
<a4j:commandButton value="AJAX Submit with client-side validation" render="lengthOut,dblrangeOut,longrangeOut">
- <csv:validator/>
+ <csv:validator event="click"/>
</a4j:commandButton>
</h:form>
<csv:messages />
Modified: trunk/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java
===================================================================
--- trunk/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/api/src/main/java/org/richfaces/validator/BeanValidatorService.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -17,9 +17,10 @@
* <p class="changed_added_4_0">Get all constrains for given EL-expression</p>
* @param context
* @param expression
+ * @param message TODO
* @return
*/
- Collection<ValidatorDescriptor> getConstrains(FacesContext context, ValueExpression expression,Class<?> ...groups);
+ Collection<ValidatorDescriptor> getConstrains(FacesContext context, ValueExpression expression,String message, Class<?> ...groups);
/**
* <p class="changed_added_4_0">Validate expression for a new value.</p>
Modified: trunk/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java
===================================================================
--- trunk/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/api/src/main/java/org/richfaces/validator/FacesConverterService.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -12,6 +12,6 @@
*/
public interface FacesConverterService {
- ConverterDescriptor getConverterDescription(FacesContext context,EditableValueHolder input, Converter converter);
+ ConverterDescriptor getConverterDescription(FacesContext context,EditableValueHolder input, Converter converter, String converterMessage);
}
Modified: trunk/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java
===================================================================
--- trunk/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/api/src/main/java/org/richfaces/validator/FacesValidatorService.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -7,5 +7,5 @@
public interface FacesValidatorService {
- ValidatorDescriptor getValidatorDescription(FacesContext context,EditableValueHolder component, Validator validator);
+ ValidatorDescriptor getValidatorDescription(FacesContext context,EditableValueHolder component, Validator validator, String message);
}
Modified: trunk/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java
===================================================================
--- trunk/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -245,7 +245,8 @@
}
if(null != converter){
FacesConverterService converterService = ServiceTracker.getService(facesContext, FacesConverterService.class);
- return converterService.getConverterDescription(facesContext, input, converter);
+ String converterMessage = (String) component.getAttributes().get("converterMessage");
+ return converterService.getConverterDescription(facesContext, input, converter, converterMessage);
} else {
return null;
}
@@ -282,6 +283,7 @@
Validator[] facesValidators = input.getValidators();
FacesContext facesContext = context.getFacesContext();
if (facesValidators.length > 0) {
+ String validatorMessage = (String) component.getAttributes().get("validatorMessage");
boolean beanValidatorsProcessed = false;
FacesValidatorService facesValidatorService = ServiceTracker.getService(facesContext,
FacesValidatorService.class);
@@ -291,11 +293,11 @@
if (null != valueExpression && !beanValidatorsProcessed) {
BeanValidatorService beanValidatorService = ServiceTracker.getService(facesContext,
BeanValidatorService.class);
- validators.addAll(beanValidatorService.getConstrains(facesContext, valueExpression, getGroups()));
+ validators.addAll(beanValidatorService.getConstrains(facesContext, valueExpression, validatorMessage, getGroups()));
beanValidatorsProcessed = true;
}
} else {
- validators.add(facesValidatorService.getValidatorDescription(facesContext, input, validator));
+ validators.add(facesValidatorService.getValidatorDescription(facesContext, input, validator, validatorMessage));
}
}
}
Modified: trunk/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidatorServiceImpl.java
===================================================================
--- trunk/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidatorServiceImpl.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/ui/src/main/java/org/richfaces/validator/BeanValidatorServiceImpl.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -24,6 +24,7 @@
import javax.validation.metadata.ElementDescriptor.ConstraintFinder;
import javax.validation.metadata.PropertyDescriptor;
+import org.richfaces.component.util.Strings;
import org.richfaces.el.ValueDescriptor;
import org.richfaces.el.ValueExpressionAnalayser;
@@ -54,7 +55,7 @@
* javax.el.ValueExpression, java.lang.Class<?>[])
*/
public Collection<ValidatorDescriptor> getConstrains(FacesContext context, ValueExpression expression,
- Class<?>... groups) {
+ String message, Class<?>... groups) {
try {
ValueDescriptor propertyDescriptor = analayser.getPropertyDescriptor(context, expression);
@@ -62,7 +63,7 @@
return Collections.emptySet();
}
- return processBeanAttribute(context, propertyDescriptor, groups);
+ return processBeanAttribute(context, propertyDescriptor, message, groups);
} catch (ELException e) {
return Collections.emptySet();
}
@@ -73,7 +74,7 @@
}
Collection<ValidatorDescriptor> processBeanAttribute(FacesContext context, ValueDescriptor descriptor,
- Class<?>... groups) {
+ String msg, Class<?>... groups) {
PropertyDescriptor constraintsForProperty =
getValidator(context).getConstraintsForClass(descriptor.getBeanType()).getConstraintsForProperty(
descriptor.getName());
@@ -87,23 +88,23 @@
.getConstraintDescriptors();
// ContextHolder is an arbitrary object, it will depend on the implementation
- Set<ValidatorDescriptor> descriptors = new HashSet<ValidatorDescriptor>(constraints.size());
- processConstraints(context, constraints, descriptors);
- return descriptors;
+ FacesMessage message = Strings.isEmpty(msg)?null:new FacesMessage(FacesMessage.SEVERITY_ERROR,msg,msg);
+ return processConstraints(context, constraints, message);
} else {
return Collections.emptySet();
}
}
- void processConstraints(FacesContext context, Set<ConstraintDescriptor<?>> constraints,
- Collection<ValidatorDescriptor> descriptors) {
+ Collection<ValidatorDescriptor> processConstraints(FacesContext context, Set<ConstraintDescriptor<?>> constraints,
+ FacesMessage msg) {
+ Set<ValidatorDescriptor> descriptors = new HashSet<ValidatorDescriptor>(constraints.size());
for (ConstraintDescriptor<?> cd : constraints) {
Annotation a = cd.getAnnotation();
Map<String, Object> parameters = cd.getAttributes();
// TODO if cd.isReportedAsSingleConstraint() make sure than only the root constraint raises an error message
// if one or several of the composing constraints are invalid)
- FacesMessage message = validatorFactory.interpolateMessage(context, cd);
+ FacesMessage message = null == msg?validatorFactory.interpolateMessage(context, cd):msg;
Class<? extends Annotation> validatorClass = findAnnotationClass(a);
BeanValidatorDescriptor beanValidatorDescriptor = new BeanValidatorDescriptor(validatorClass, message);
for (Map.Entry<String, Object> entry : parameters.entrySet()) {
@@ -125,8 +126,9 @@
}
beanValidatorDescriptor.makeImmutable();
descriptors.add(beanValidatorDescriptor);
- processConstraints(context, cd.getComposingConstraints(), descriptors); // process the composing constraints
+ descriptors.addAll(processConstraints(context, cd.getComposingConstraints(), msg)); // process the composing constraints
}
+ return descriptors;
}
private Class<? extends Annotation> findAnnotationClass(Annotation a) {
Modified: trunk/ui/validator/ui/src/main/java/org/richfaces/validator/ConverterServiceImpl.java
===================================================================
--- trunk/ui/validator/ui/src/main/java/org/richfaces/validator/ConverterServiceImpl.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/ui/src/main/java/org/richfaces/validator/ConverterServiceImpl.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -38,9 +38,9 @@
* @see org.richfaces.validator.FacesConverterService#getConverterDescription(javax.faces.context.FacesContext,
* javax.faces.convert.Converter)
*/
- public ConverterDescriptor getConverterDescription(FacesContext context, EditableValueHolder input, Converter converter) {
+ public ConverterDescriptor getConverterDescription(FacesContext context, EditableValueHolder input, Converter converter, String converterMessage) {
// determine converter message.
- FacesMessage message = getMessage(context, converter, input);
+ FacesMessage message = getMessage(context, converter, input,converterMessage);
ConverterDescriptorImpl descriptor = new ConverterDescriptorImpl(converter.getClass(), message);
fillParameters(descriptor, converter);
descriptor.makeImmutable();
Modified: trunk/ui/validator/ui/src/main/java/org/richfaces/validator/DummyBeanValidatorService.java
===================================================================
--- trunk/ui/validator/ui/src/main/java/org/richfaces/validator/DummyBeanValidatorService.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/ui/src/main/java/org/richfaces/validator/DummyBeanValidatorService.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -19,7 +19,7 @@
* @see org.richfaces.validator.BeanValidatorService#getConstrains(javax.faces.context.FacesContext, javax.el.ValueExpression, java.lang.Class<?>[])
*/
public Collection<ValidatorDescriptor> getConstrains(FacesContext context, ValueExpression expression,
- Class<?>... groups) {
+ String message, Class<?>... groups) {
return Collections.emptySet();
}
Modified: trunk/ui/validator/ui/src/main/java/org/richfaces/validator/FacesServiceBase.java
===================================================================
--- trunk/ui/validator/ui/src/main/java/org/richfaces/validator/FacesServiceBase.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/ui/src/main/java/org/richfaces/validator/FacesServiceBase.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -53,14 +53,18 @@
* @param context
* @param component
* @param input TODO
+ * @param msg
* @return
*/
- public FacesMessage getMessage(FacesContext context, T component, EditableValueHolder input) {
- String messageId = getMessageId(component);
- return MessageFactory.createMessage(context, messageId);
+ public FacesMessage getMessage(FacesContext context, T component, EditableValueHolder input, String msg) {
+ if (null == msg) {
+ String messageId = getMessageId(component);
+ return MessageFactory.createMessage(context, messageId);
+ } else {
+ return new FacesMessage(FacesMessage.SEVERITY_ERROR, msg, msg);
+ }
}
-
protected void setLabelParameter(EditableValueHolder input, FacesValidatorDescriptor descriptor) {
if (input instanceof UIComponent) {
UIComponent component = (UIComponent) input;
Modified: trunk/ui/validator/ui/src/main/java/org/richfaces/validator/FacesValidatorServiceImpl.java
===================================================================
--- trunk/ui/validator/ui/src/main/java/org/richfaces/validator/FacesValidatorServiceImpl.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/ui/src/main/java/org/richfaces/validator/FacesValidatorServiceImpl.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -30,8 +30,8 @@
* @see org.richfaces.validator.FacesValidatorService#getValidatorDescription(javax.faces.context.FacesContext,
* javax.faces.validator.Validator)
*/
- public ValidatorDescriptor getValidatorDescription(FacesContext context, EditableValueHolder input, Validator validator) {
- FacesMessage message = getMessage(context, validator, input);
+ public ValidatorDescriptor getValidatorDescription(FacesContext context, EditableValueHolder input, Validator validator, String validatorMessage) {
+ FacesMessage message = getMessage(context, validator, input,validatorMessage);
FacesValidatorDescriptor descriptor = new FacesValidatorDescriptor(validator.getClass(), message);
setLabelParameter(input, descriptor);
fillParameters(descriptor, validator);
Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetConverterTest.java
===================================================================
--- trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetConverterTest.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetConverterTest.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -3,10 +3,13 @@
import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
+import java.util.Collections;
+
import javax.faces.convert.Converter;
import javax.faces.convert.NumberConverter;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.jboss.test.faces.mock.Mock;
import org.jboss.test.faces.mock.MockTestRunner;
import org.jboss.test.faces.mock.Stub;
@@ -45,7 +48,7 @@
public void setupService() {
expect(factory.getInstance(FacesConverterService.class)).andStubReturn(converterService);
converterCapture = new Capture<Converter>();
- expect(converterService.getConverterDescription(same(environment.getFacesContext()), same(input), capture(converterCapture)))
+ expect(converterService.getConverterDescription(same(environment.getFacesContext()), same(input), capture(converterCapture), EasyMock.<String>isNull()))
.andStubReturn(descriptor);
ServiceTracker.setFactory(factory);
}
@@ -66,6 +69,7 @@
public void testGetClientConverterFromComponent() throws Exception {
NumberConverter converter = new NumberConverter();
expect(input.getConverter()).andReturn(converter);
+ expect(input.getAttributes()).andStubReturn(Collections.<String,Object>emptyMap());
checkConverter(converter);
}
@@ -79,6 +83,7 @@
@Test
public void testGetClientConverterByType() throws Exception {
setupConverterFromApplication(converter);
+ expect(input.getAttributes()).andStubReturn(Collections.<String,Object>emptyMap());
checkConverter(converter);
}
Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java
===================================================================
--- trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -4,6 +4,7 @@
import static org.junit.Assert.*;
import java.util.Collection;
+import java.util.Collections;
import javax.el.ValueExpression;
import javax.faces.validator.BeanValidator;
@@ -96,7 +97,7 @@
private void setupBeanValidator(ValidatorDescriptor... validators) {
expect(input.getValidators()).andStubReturn(new Validator[]{new BeanValidator()});
- expect(validatorService.getConstrains(environment.getFacesContext(), expression, DEFAULT_GROUP)).andStubReturn(
+ expect(validatorService.getConstrains(environment.getFacesContext(), expression, null, DEFAULT_GROUP)).andStubReturn(
Lists.newArrayList(validators));
}
@@ -107,7 +108,7 @@
ValidatorDescriptor validatorDescriptor = environment.createMock(ValidatorDescriptor.class);
expect((Class) validatorDescriptor.getImplementationClass()).andStubReturn(validator.getClass());
expect(validatorDescriptor.getMessage()).andStubReturn(VALIDATION_ERROR);
- expect(facesValidatorService.getValidatorDescription(environment.getFacesContext(), input, validator))
+ expect(facesValidatorService.getValidatorDescription(environment.getFacesContext(), input, validator, null))
.andStubReturn(validatorDescriptor);
}
}
@@ -123,6 +124,7 @@
public void testComponentValidator() throws Exception {
setupComponentValidator(validator);
setupBeanValidator();
+ expect(input.getAttributes()).andStubReturn(Collections.<String,Object>emptyMap());
Collection<ValidatorDescriptor> validators = checkValidator();
assertEquals(1, validators.size());
ValidatorDescriptor validatorDescriptor = Iterables.getOnlyElement(validators);
@@ -134,6 +136,7 @@
@Test
public void testBeanValidators() throws Exception {
setupBeanValidator(beanValidatorDescriptor);
+ expect(input.getAttributes()).andStubReturn(Collections.<String,Object>emptyMap());
Collection<ValidatorDescriptor> validators = checkValidator();
assertEquals(1, validators.size());
ValidatorDescriptor validatorDescriptor = Iterables.getOnlyElement(validators);
Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java
===================================================================
--- trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -63,7 +63,7 @@
private Object getErrorMessage(Converter converter) {
ConverterServiceImpl converterService = new ConverterServiceImpl();
- FacesMessage message = converterService.getMessage(facesEnvironment.getFacesContext(), converter, input);
+ FacesMessage message = converterService.getMessage(facesEnvironment.getFacesContext(), converter, input,null);
return new Message(message);
}
Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java
===================================================================
--- trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -80,7 +80,7 @@
private Object getErrorMessage(Validator validator) {
FacesValidatorServiceImpl validatorService = new FacesValidatorServiceImpl();
- FacesMessage message = validatorService.getMessage(facesEnvironment.getFacesContext(), validator, input);
+ FacesMessage message = validatorService.getMessage(facesEnvironment.getFacesContext(), validator, input,null);
return new Message(message);
}
Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java
===================================================================
--- trunk/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -103,7 +103,7 @@
private Collection<ValidatorDescriptor> expectValidatorsWithGroups(Class<?>[] groups, Class<? extends Annotation>... validators) {
controller.replay();
- Collection<ValidatorDescriptor> constrains = validatorService.getConstrains(environment.getFacesContext(), expression,groups);
+ Collection<ValidatorDescriptor> constrains = validatorService.getConstrains(environment.getFacesContext(), expression,null, groups);
controller.verify();
assertEquals(validators.length, constrains.size());
for (final Class<? extends Annotation> class1 : validators) {
Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java
===================================================================
--- trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -70,7 +70,7 @@
public void getConverterClass() throws Exception {
converter = new BooleanConverter();
controller.replay();
- ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter);
+ ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter, null);
assertEquals(converter.getClass(), converterDescription.getImplementationClass());
}
@@ -85,7 +85,7 @@
facesMessage = e.getFacesMessage();
}
assertNotNull(facesMessage);
- ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter);
+ ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter, null);
String summary = converterDescription.getMessage().getSummary();
summary = summary.replace("{2}", "foo");
summary = summary.replace("'{0}'", "abc");
@@ -102,7 +102,7 @@
converter.setType("both");
converter.setTimeZone(TimeZone.getTimeZone("EST"));
controller.replay();
- ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter);
+ ConverterDescriptor converterDescription = serviceImpl.getConverterDescription(environment.getFacesContext(), input, converter, null);
Map<String, ? extends Object> additionalParameters = converterDescription.getAdditionalParameters();
assertEquals("short", additionalParameters.get("dateStyle"));
assertEquals("MM/DD/YYYY", additionalParameters.get("pattern"));
Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java
===================================================================
--- trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java 2011-04-06 15:26:36 UTC (rev 22382)
+++ trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java 2011-04-06 22:45:52 UTC (rev 22383)
@@ -65,7 +65,7 @@
public void getConverterClass() throws Exception {
validator = new LengthValidator();
controller.replay();
- ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input, validator);
+ ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input, validator, null);
assertEquals(validator.getClass(), validatorDescription.getImplementationClass());
}
@@ -80,7 +80,7 @@
facesMessage = e.getFacesMessage();
}
assertNotNull(facesMessage);
- ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input, validator);
+ ValidatorDescriptor validatorDescription = serviceImpl.getValidatorDescription(environment.getFacesContext(), input, validator, null);
String summary = validatorDescription.getMessage().getSummary();
summary = summary.replace("{0}", "foo");
assertEquals(facesMessage.getSummary(), summary);
13 years, 8 months
JBoss Rich Faces SVN: r22382 - in modules/tests/metamer/trunk: application/src/main/webapp/templates and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-04-06 11:26:36 -0400 (Wed, 06 Apr 2011)
New Revision: 22382
Added:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richAccordion.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
Log:
https://issues.jboss.org/browse/RFPL-945
added template for rich:accordion
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-06 13:16:26 UTC (rev 22381)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-06 15:26:36 UTC (rev 22382)
@@ -33,6 +33,7 @@
PLAIN("plain", "Plain", ""),
REDDIV("redDiv", "Red div", ""),
BLUEDIV("blueDiv", "Blue div", ""),
+ RICHACCORDION("richAccordion", "Rich Accordion", ""),
RICHCOLLAPSIBLESUBTABLE("richCollapsibleSubTable", "Rich Collapsible Sub Table", "containerRichCollapsibleSubTable:2:"),
RICHDATATABLE("richDataTable", "Rich Data Table", "containerRichDataTable:2:"),
RICHDATAGRID("richDataGrid", "Rich Data Grid", "containerRichDataGrid:1:"),
Added: modules/tests/metamer/trunk/application/src/main/webapp/templates/richAccordion.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richAccordion.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richAccordion.xhtml 2011-04-06 15:26:36 UTC (rev 22382)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition>
+ <rich:accordion id="containerRichAccordion" activeItem="containerItem3">
+
+ <rich:accordionItem id="containerItem1" name="containerItem1" header="Item 1">
+ content of item 1
+ </rich:accordionItem>
+ <rich:accordionItem id="containerItem2" name="containerItem2" header="Item 2">
+ content of item 2
+ </rich:accordionItem>
+ <rich:accordionItem id="containerItem3" name="containerItem3" header="Item 3">
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
+ </rich:accordionItem>
+ <rich:accordionItem id="containerItem4" name="containerItem4" header="Item 4 (disabled)" disabled="true">
+ content of item 4
+ </rich:accordionItem>
+ <rich:accordionItem id="containerItem5" name="containerItem5" header="Item 5">
+ content of item 5
+ </rich:accordionItem>
+
+ </rich:accordion>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-04-06 13:16:26 UTC (rev 22381)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-04-06 15:26:36 UTC (rev 22382)
@@ -95,7 +95,7 @@
*/
public static final long TIMEOUT = 5000;
@Inject
- @Templates({"plain", "richDataTable", "richCollapsibleSubTable", "richExtendedDataTable", "richDataGrid", "richList",
+ @Templates({"plain", "richAccordion", "richDataTable", "richCollapsibleSubTable", "richExtendedDataTable", "richDataGrid", "richList",
"a4jRepeat", "hDataTable", "uiRepeat"})
private TemplatesList template;
13 years, 8 months
JBoss Rich Faces SVN: r22381 - in modules/tests/metamer/trunk: application/src/main/webapp/templates and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-04-06 09:16:26 -0400 (Wed, 06 Apr 2011)
New Revision: 22381
Added:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richCollapsibleSubTable.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richList.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
Log:
https://issues.jboss.org/browse/RFPL-946
added two new templates - rich:collapsibleSubTable, rich:list
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-06 13:15:36 UTC (rev 22380)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-06 13:16:26 UTC (rev 22381)
@@ -33,9 +33,11 @@
PLAIN("plain", "Plain", ""),
REDDIV("redDiv", "Red div", ""),
BLUEDIV("blueDiv", "Blue div", ""),
+ RICHCOLLAPSIBLESUBTABLE("richCollapsibleSubTable", "Rich Collapsible Sub Table", "containerRichCollapsibleSubTable:2:"),
RICHDATATABLE("richDataTable", "Rich Data Table", "containerRichDataTable:2:"),
RICHDATAGRID("richDataGrid", "Rich Data Grid", "containerRichDataGrid:1:"),
RICHEXTENDEDDATATABLE("richExtendedDataTable", "Rich Extended Data Table", "containerRichExtendedDataTable:2:"),
+ RICHLIST("richList", "Rich List", "containerRichList:2:"),
HDATATABLE("hDataTable", "JSF Data Table", "containerHDataTable:2:"),
UIREPEAT("uiRepeat", "UI Repeat", "containerUiRepeat:1:"),
A4JREPEAT("a4jRepeat", "A4J Repeat", "containerA4JRepeat:1:");
Added: modules/tests/metamer/trunk/application/src/main/webapp/templates/richCollapsibleSubTable.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richCollapsibleSubTable.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richCollapsibleSubTable.xhtml 2011-04-06 13:16:26 UTC (rev 22381)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition>
+ <rich:dataTable id="containerRichCollapsibleSubTable" value="#{richSubTableBean.lists}" var="list">
+
+ <f:facet name="header">
+ Rich Collapible Sub Table
+ </f:facet>
+
+ <rich:column id="columnSubTable" colspan="3">
+ <rich:collapsibleSubTableToggler id="subTableTC" for="richSubTable"/>
+ <h:outputText value="#{list[0].sex == 'MALE' ? 'xxx' : 'yyy'}" />
+ </rich:column>
+
+ <rich:collapsibleSubTable id="richSubTable" value="#{model.simple}" var="containerRichCollapsibleSubTableItem">
+
+ <h:column>
+ <f:facet name="header">
+ Column 1
+ </f:facet>
+ #{containerRichCollapsibleSubTableItem}
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ Column 2
+ </f:facet>
+ <h:panelGroup rendered="#{containerRichCollapsibleSubTableItem == 'row 3' and list[0].sex == 'MALE'}">
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
+ </h:panelGroup>
+ <h:outputText value="#{containerRichCollapsibleSubTableItem}" rendered="#{containerRichCollapsibleSubTableItem != 'row 3' or list[0].sex != 'MALE'}" />
+ </h:column>
+
+ </rich:collapsibleSubTable>
+ </rich:dataTable>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added: modules/tests/metamer/trunk/application/src/main/webapp/templates/richList.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richList.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richList.xhtml 2011-04-06 13:16:26 UTC (rev 22381)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition>
+ <rich:list value="#{model.simple}" var="containerRichListItem" id="containerRichList" type="unordered">
+
+ <f:facet name="header">
+ Rich List
+ </f:facet>
+
+ <h:panelGroup rendered="#{containerRichListItem == 'row 3'}">
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
+ </h:panelGroup>
+ <h:outputText value="#{containerRichListItem}" rendered="#{containerRichListItem != 'row 3'}" />
+
+ </rich:list>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-04-06 13:15:36 UTC (rev 22380)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-04-06 13:16:26 UTC (rev 22381)
@@ -89,13 +89,14 @@
protected TextRetriever retrieveStatusChecker = retrieveText.locator(jq("#statusCheckerOutput"));
protected PhaseInfo phaseInfo = new PhaseInfo();
protected LocatorReference<JQueryLocator> attributesRoot = new LocatorReference<JQueryLocator>(
- pjq("span[id$=:attributes:panel]"));
+ pjq("span[id$=:attributes:panel]"));
/**
* timeout in miliseconds
*/
public static final long TIMEOUT = 5000;
@Inject
- @Templates({ "plain", "richDataTable", "a4jRepeat", "hDataTable", "uiRepeat" })
+ @Templates({"plain", "richDataTable", "richCollapsibleSubTable", "richExtendedDataTable", "richDataGrid", "richList",
+ "a4jRepeat", "hDataTable", "uiRepeat"})
private TemplatesList template;
/**
@@ -204,7 +205,7 @@
selenium.fireEvent(element, event);
waitGui.failWith("Attribute on" + attributeName + " does not work correctly").until(
- new EventFiredCondition(event));
+ new EventFiredCondition(event));
}
/**
@@ -279,9 +280,9 @@
public void testRequestEventsAfter(String... events) {
String[] actualEvents = selenium.getEval(new JavaScript("window.metamerEvents")).split(" ");
assertEquals(
- actualEvents,
- events,
- format("The events ({0}) don't came in right order ({1})", Arrays.deepToString(actualEvents),
+ actualEvents,
+ events,
+ format("The events ({0}) don't came in right order ({1})", Arrays.deepToString(actualEvents),
Arrays.deepToString(events)));
}
@@ -297,9 +298,9 @@
String[] actualEvents = list.toArray(new String[list.size()]);
assertEquals(
- actualEvents,
- events,
- format("The events ({0}) don't came in right order ({1})", Arrays.deepToString(actualEvents),
+ actualEvents,
+ events,
+ format("The events ({0}) don't came in right order ({1})", Arrays.deepToString(actualEvents),
Arrays.deepToString(events)));
}
@@ -398,7 +399,7 @@
selenium.waitForPageToLoad();
assertTrue(selenium.getAttribute(attr).contains(value), "Attribute " + attribute + " should contain \"" + value
- + "\".");
+ + "\".");
}
/**
13 years, 8 months
JBoss Rich Faces SVN: r22380 - in modules/tests/metamer/trunk/application/src/main: webapp/components/richExtendedDataTable and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-04-06 09:15:36 -0400 (Wed, 06 Apr 2011)
New Revision: 22380
Added:
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/template-edt.css
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataGrid.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richExtendedDataTable.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml
Log:
https://issues.jboss.org/browse/RFPL-946
added two new templates - rich:dataGrid and rich:extendedDataTable
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-06 08:50:27 UTC (rev 22379)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-06 13:15:36 UTC (rev 22380)
@@ -19,7 +19,6 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*******************************************************************************/
-
package org.richfaces.tests.metamer;
/**
@@ -30,24 +29,24 @@
* @version $Revision$
*/
public enum Template {
- PLAIN ("plain", "Plain", ""),
- REDDIV ("redDiv", "Red div", ""),
- BLUEDIV ("blueDiv", "Blue div", ""),
- RICHDATATABLE ("richDataTable", "Rich Data Table", "containerRichDataTable:2:"),
- HDATATABLE ("hDataTable", "JSF Data Table", "containerHDataTable:2:"),
- UIREPEAT ("uiRepeat", "UI Repeat", "containerUiRepeat:1:"),
- A4JREPEAT ("a4jRepeat", "A4J Repeat", "containerA4JRepeat:1:");
+ PLAIN("plain", "Plain", ""),
+ REDDIV("redDiv", "Red div", ""),
+ BLUEDIV("blueDiv", "Blue div", ""),
+ RICHDATATABLE("richDataTable", "Rich Data Table", "containerRichDataTable:2:"),
+ RICHDATAGRID("richDataGrid", "Rich Data Grid", "containerRichDataGrid:1:"),
+ RICHEXTENDEDDATATABLE("richExtendedDataTable", "Rich Extended Data Table", "containerRichExtendedDataTable:2:"),
+ HDATATABLE("hDataTable", "JSF Data Table", "containerHDataTable:2:"),
+ UIREPEAT("uiRepeat", "UI Repeat", "containerUiRepeat:1:"),
+ A4JREPEAT("a4jRepeat", "A4J Repeat", "containerA4JRepeat:1:");
/**
* identifier of a template
*/
private String name;
-
/**
* human-readable name of the template
*/
private String desc;
-
/**
* prefix of the component nested in this template
*/
@@ -80,7 +79,7 @@
public String getDesc() {
return desc;
}
-
+
/**
* Returns the prefix of component nested in this template
* @return
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2011-04-06 08:50:27 UTC (rev 22379)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2011-04-06 13:15:36 UTC (rev 22380)
@@ -39,50 +39,50 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt-c {
+ .rf-edt[id$=richEDT] .rf-edt-c {
height: 30px !important;
vertical-align: middle;
}
- .rf-edt {
- width: 720px !important;
+ .rf-edt[id$=richEDT] {
+ width: 920px !important;
height: 400px !important;
}
- .rf-edt-hdr-c {
- height: 2.5em !important;
+ .rf-edt[id$=richEDT] .rf-edt-hdr-c {
+ height: 3em !important;
}
- .rf-edt-c-columnSex {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnSex {
width: 100px !important;
text-align: center;
}
- .rf-edt-c-columnName {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnName {
width: 150px !important;
}
- .rf-edt-c-columnTitle {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnTitle {
width: 210px !important;
text-align: center;
}
- .rf-edt-c-columnSmoker {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnSmoker {
text-align: center;
width: 150px !important;
}
- .rf-edt-c-columnFavoriteColor {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnFavoriteColor {
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids {
width: 150px !important;
text-align: center;
vertical-align: middle;
}
- .rf-sel-fld {
+ .rf-edt[id$=richEDT] .rf-sel-fld {
width: 180px !important;
}
</style>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2011-04-06 08:50:27 UTC (rev 22379)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2011-04-06 13:15:36 UTC (rev 22380)
@@ -39,43 +39,43 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt-c {
+ .rf-edt[id$=richEDT] .rf-edt-c {
height: 70px !important;
vertical-align: middle;
}
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 990px !important;
height: 400px !important;
}
- .rf-edt-hdr-c {
- height: 2.5em !important;
+ .rf-edt[id$=richEDT] .rf-edt-hdr-c {
+ height: 3em !important;
}
- .rf-edt-c-columnSex {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnSex {
width: 100px !important;
text-align: center;
}
- .rf-edt-c-columnName {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnName {
width: 150px !important;
}
- .rf-edt-c-columnTitle {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnTitle {
width: 150px !important;
}
- .rf-edt-c-columnBirthdate {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnBirthdate {
text-align: center;
width: 170px !important;
}
- .rf-edt-c-columnCompanies {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnCompanies {
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids {
width: 250px !important;
}
</style>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2011-04-06 08:50:27 UTC (rev 22379)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2011-04-06 13:15:36 UTC (rev 22380)
@@ -39,7 +39,7 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 215px !important;
height: 300px !important;
}
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-04-06 08:50:27 UTC (rev 22379)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-04-06 13:15:36 UTC (rev 22380)
@@ -40,39 +40,39 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt-c {
+ .rf-edt[id$=richEDT] .rf-edt-c {
height: 30px !important;
vertical-align: middle;
}
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 820px !important;
height: 400px !important;
}
- .rf-edt-hdr-c {
- height: 4.2em !important;
+ .rf-edt[id$=richEDT] .rf-edt-hdr-c {
+ height: 5.3em !important;
}
- .rf-edt-c-columnSex {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnSex {
width: 100px !important;
text-align: center;
}
- .rf-edt-c-columnName {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnName {
width: 150px !important;
}
- .rf-edt-c-columnTitle {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnTitle {
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids {
text-align: center;
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids2 {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids2 {
text-align: center;
width: 250px !important;
}
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml 2011-04-06 08:50:27 UTC (rev 22379)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml 2011-04-06 13:15:36 UTC (rev 22380)
@@ -38,15 +38,15 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 151px !important;
height:
}
- .rf-edt-c-columnInput {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnInput {
width: 150px !important;
text-align: center;
}
- .rf-edt-c {
+ .rf-edt[id$=richEDT] .rf-edt-c {
height: 2em !important;
}
</style>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2011-04-06 08:50:27 UTC (rev 22379)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2011-04-06 13:15:36 UTC (rev 22380)
@@ -40,7 +40,7 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 300px !important;
height: 300px !important;
}
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2011-04-06 08:50:27 UTC (rev 22379)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2011-04-06 13:15:36 UTC (rev 22380)
@@ -39,7 +39,7 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 300px !important;
height: 300px !important;
}
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2011-04-06 08:50:27 UTC (rev 22379)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2011-04-06 13:15:36 UTC (rev 22380)
@@ -39,7 +39,7 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 215px !important;
height: 300px !important;
}
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2011-04-06 08:50:27 UTC (rev 22379)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2011-04-06 13:15:36 UTC (rev 22380)
@@ -39,39 +39,39 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt-c {
+ .rf-edt[id$=richEDT] .rf-edt-c {
height: 30px !important;
vertical-align: middle;
}
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 820px !important;
height: 400px !important;
}
- .rf-edt-hdr-c {
+ .rf-edt[id$=richEDT] .rf-edt-hdr-c {
height: 4.2em !important;
}
- .rf-edt-c-columnSex {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnSex {
width: 100px !important;
text-align: center;
}
- .rf-edt-c-columnName {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnName {
width: 150px !important;
}
- .rf-edt-c-columnTitle {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnTitle {
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids {
text-align: center;
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids2 {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids2 {
text-align: center;
width: 250px !important;
}
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2011-04-06 08:50:27 UTC (rev 22379)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2011-04-06 13:15:36 UTC (rev 22380)
@@ -39,39 +39,39 @@
<ui:define name="head">
<style type="text/css">
- .rf-edt-c {
+ .rf-edt[id$=richEDT] .rf-edt-c {
height: 30px !important;
vertical-align: middle;
}
- .rf-edt {
+ .rf-edt[id$=richEDT] {
width: 820px !important;
height: 400px !important;
}
- .rf-edt-hdr-c {
+ .rf-edt[id$=richEDT] .rf-edt-hdr-c {
height: 4.2em !important;
}
- .rf-edt-c-columnSex {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnSex {
width: 100px !important;
text-align: center;
}
- .rf-edt-c-columnName {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnName {
width: 150px !important;
}
- .rf-edt-c-columnTitle {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnTitle {
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids {
text-align: center;
width: 150px !important;
}
- .rf-edt-c-columnNumberOfKids2 {
+ .rf-edt[id$=richEDT] .rf-edt-c-columnNumberOfKids2 {
text-align: center;
width: 250px !important;
}
Added: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/template-edt.css
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/resources/css/template-edt.css (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/resources/css/template-edt.css 2011-04-06 13:15:36 UTC (rev 22380)
@@ -0,0 +1,20 @@
+.rf-edt[id$=containerRichExtendedDataTable] {
+ width: 1200px;
+}
+
+.rf-edt[id$=containerRichExtendedDataTable] .rf-edt-c-col1 {
+ width: 100px !important;
+}
+
+.rf-edt[id$=containerRichExtendedDataTable] .rf-edt-c-col2 {
+ width: 1095px !important;
+}
+
+.rf-edt[id$=containerRichExtendedDataTable] tr:nth-child(3) .rf-edt-c-col1{
+ height: 400px !important;
+}
+
+.rf-edt[id$=containerRichExtendedDataTable] tr:nth-child(3) .rf-edt-c-col2{
+ height: 400px !important;
+ overflow: auto;
+}
Added: modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataGrid.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataGrid.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataGrid.xhtml 2011-04-06 13:15:36 UTC (rev 22380)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition>
+ <rich:dataGrid value="#{model.simple}" var="containerRichDataGridItem" id="containerRichDataGrid" columns="2">
+
+ <f:facet name="header">
+ Rich Data Grid
+ </f:facet>
+
+ <h:panelGroup rendered="#{containerRichDataGridItem == 'row 4'}">
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
+ </h:panelGroup>
+ <h:outputText value="#{containerRichDataGridItem}" rendered="#{containerRichDataGridItem != 'row 4'}" />
+
+ </rich:dataGrid>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added: modules/tests/metamer/trunk/application/src/main/webapp/templates/richExtendedDataTable.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richExtendedDataTable.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richExtendedDataTable.xhtml 2011-04-06 13:15:36 UTC (rev 22380)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition>
+ <h:outputStylesheet library="css" name="template-edt.css"/>
+
+ <rich:extendedDataTable value="#{model.simple}" var="containerRichExtendedDataTableItem" id="containerRichExtendedDataTable">
+
+ <f:facet name="header">
+ Rich Extended Data Table
+ </f:facet>
+
+ <h:column id="col1">
+ <f:facet name="header">
+ Column 1
+ </f:facet>
+ #{containerRichExtendedDataTableItem}
+ </h:column>
+
+ <h:column id="col2">
+ <f:facet name="header">
+ Column 2
+ </f:facet>
+ <h:panelGroup rendered="#{containerRichExtendedDataTableItem == 'row 3'}">
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
+ </h:panelGroup>
+ <h:outputText value="#{containerRichExtendedDataTableItem}" rendered="#{containerRichExtendedDataTableItem != 'row 3'}" />
+ </h:column>
+
+ </rich:extendedDataTable>
+
+ </ui:composition>
+</html>
\ No newline at end of file
13 years, 8 months
JBoss Rich Faces SVN: r22379 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: richDataGrid and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-04-06 04:50:27 -0400 (Wed, 06 Apr 2011)
New Revision: 22379
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableScrollerTest.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestScrollerOutsideTable.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestScrollerOutsideTable.java
Log:
template names fixed
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableScrollerTest.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableScrollerTest.java 2011-04-06 03:34:41 UTC (rev 22378)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableScrollerTest.java 2011-04-06 08:50:27 UTC (rev 22379)
@@ -42,8 +42,7 @@
testRowCount(dataScroller2);
}
- @Templates(exclude = { "a4jRepeat1", "a4jRepeat2", "hDataTable1", "hDataTable2", "richDataTable1,redDiv",
- "richDataTable2,redDiv", "uiRepeat1", "uiRepeat2" })
+ @Templates(exclude = {"a4jRepeat", "hDataTable", "richDataTable", "uiRepeat"})
public void testRowCountOutsideTable() {
testRowCount(dataScroller1);
}
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestScrollerOutsideTable.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestScrollerOutsideTable.java 2011-04-06 03:34:41 UTC (rev 22378)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestScrollerOutsideTable.java 2011-04-06 08:50:27 UTC (rev 22379)
@@ -36,8 +36,7 @@
* @version $Revision$
*/
@Use(field = "dataScroller", value = "dataScroller1")
-@Templates(exclude = { "a4jRepeat1", "a4jRepeat2", "hDataTable1", "hDataTable2", "richDataTable1,redDiv",
- "richDataTable2,redDiv", "uiRepeat1", "uiRepeat2" })
+@Templates(exclude = {"a4jRepeat", "hDataTable", "richDataTable", "uiRepeat"})
public class TestScrollerOutsideTable extends AbstractScrollerTest {
public TestScrollerOutsideTable() throws JAXBException {
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestScrollerOutsideTable.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestScrollerOutsideTable.java 2011-04-06 03:34:41 UTC (rev 22378)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestScrollerOutsideTable.java 2011-04-06 08:50:27 UTC (rev 22379)
@@ -36,8 +36,7 @@
* @version $Revision$
*/
@Use(field = "dataScroller", value = "dataScroller1")
-@Templates(exclude = { "a4jRepeat1", "a4jRepeat2", "hDataTable1", "hDataTable2", "richDataTable1,redDiv",
- "richDataTable2,redDiv", "uiRepeat1", "uiRepeat2" })
+@Templates(exclude = {"a4jRepeat", "hDataTable", "richDataTable", "uiRepeat"})
public class TestScrollerOutsideTable extends AbstractScrollerTest {
public TestScrollerOutsideTable() throws JAXBException {
13 years, 8 months
JBoss Rich Faces SVN: r22378 - in modules/docs/trunk/Component_Reference/src/main/docbook/en-US: extras and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: SeanRogers
Date: 2011-04-05 23:34:41 -0400 (Tue, 05 Apr 2011)
New Revision: 22378
Added:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richmessages-In-line_messages.css
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richmessages-Messages_in_a_list.css
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richmessages-In-line_messages.png
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richmessages-Messages_in_a_block.png
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richmessages-Messages_in_a_list.png
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Output_and_messages.xml
Log:
Documented messages layout support: RFPL-1136
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Output_and_messages.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Output_and_messages.xml 2011-04-06 01:36:02 UTC (rev 22377)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Output_and_messages.xml 2011-04-06 03:34:41 UTC (rev 22378)
@@ -145,6 +145,71 @@
<para>
The <sgmltag><rich:messages></sgmltag> component can be further styled through CSS, the same as for the <sgmltag><rich:message></sgmltag> component. Refer to <xref linkend="sect-Component_Reference-richmessage-Appearance" /> for an example of message styling, and refer to <xref linkend="sect-Component_Reference-richmessages-Style_classes_and_skin_parameters" /> for a complete list of style classes for the <sgmltag><rich:message></sgmltag> component.
</para>
+ <para>
+ The layout of the messages can also be customized through CSS. By default, the messages are arranged in a block as shown in <xref linkend="figu-Component_Reference-richmessages-Messages_in_a_block" />.
+ </para>
+ <figure id="figu-Component_Reference-richmessages-Messages_in_a_block">
+ <title>Messages in a block</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/figu-Component_Reference-richmessages-Messages_in_a_block.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <para>
+ Messages are displayed in a block arrangement.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Override the <property>display</property> property for all CSS message classes to customize the layout as follows:
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term>Display messages in a list with no icons</term>
+ <listitem>
+ <para>
+ To display the messages in a list format without the default icons, override the message styles as follows:
+ </para>
+ <programlisting><xi:include href="extras/exam-Component_Reference-richmessages-Messages_in_a_list.css" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+ <figure id="figu-Component_Reference-richmessages-Messages_in_a_list">
+ <title>Messages in a list</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/figu-Component_Reference-richmessages-Messages_in_a_list.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <para>
+ Messages are displayed in a list with bullet points and no icons.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Display in-line messages</term>
+ <listitem>
+ <para>
+ To display the messages in line with text, override the message styles as follows:
+ </para>
+ <programlisting><xi:include href="extras/exam-Component_Reference-richmessages-In-line_messages.css" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+ <figure id="figu-Component_Reference-richmessages-In-line_messages">
+ <title>In-line messages</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/figu-Component_Reference-richmessages-In-line_messages.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <para>
+ Messages are displayed in a list with bullet points and no icons.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</section>
<section id="sect-Component_Reference-richmessages-Reference_data">
Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richmessages-In-line_messages.css
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richmessages-In-line_messages.css (rev 0)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richmessages-In-line_messages.css 2011-04-06 03:34:41 UTC (rev 22378)
@@ -0,0 +1,2 @@
+.rf-msg-err, .rf-msgs-err, .rf-msg-ftl, .rf-msgs-ftl, .rf-msg-inf,
+.rf-msgs-inf, .rf-msg-wrn, .rf-msgs-wrn, .rf-msg-ok, .rf-msgs-ok { display:inline; }
Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richmessages-Messages_in_a_list.css
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richmessages-Messages_in_a_list.css (rev 0)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richmessages-Messages_in_a_list.css 2011-04-06 03:34:41 UTC (rev 22378)
@@ -0,0 +1,7 @@
+.rf-msg-err, .rf-msgs-err, .rf-msg-ftl, .rf-msgs-ftl, .rf-msg-inf,
+.rf-msgs-inf, .rf-msg-wrn, .rf-msgs-wrn, .rf-msg-ok, .rf-msgs-ok {
+ display: list-item;
+ margin-left: 20px;
+ padding-left: 0px; }
+
+.rf-msg-err, .rf-msgs-err{ background-image:none; }
Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richmessages-In-line_messages.png
===================================================================
(Binary files differ)
Property changes on: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richmessages-In-line_messages.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richmessages-Messages_in_a_block.png
===================================================================
(Binary files differ)
Property changes on: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richmessages-Messages_in_a_block.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richmessages-Messages_in_a_list.png
===================================================================
(Binary files differ)
Property changes on: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richmessages-Messages_in_a_list.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
13 years, 8 months