richfaces-svn-commits
April 2011
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 105 discussions
JBoss Rich Faces SVN: r22377 - modules/docs/trunk/Component_Reference/src/main/docbook/en-US.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2011-04-05 21:36:02 -0400 (Tue, 05 Apr 2011)
New Revision: 22377
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Introduction.xml
Log:
Added links to generated docs: RFPL-1411
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Introduction.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Introduction.xml 2011-04-06 00:43:39 UTC (rev 22376)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Introduction.xml 2011-04-06 01:36:02 UTC (rev 22377)
@@ -7,10 +7,79 @@
This book is a guide to the various components available in the RichFaces 4.0 framework. It includes descriptions of the role of the components, details on how best to use them, coded examples of their use, and basic references of their properties and attributes.
</para>
<para>
- For full in-depth references for all component classes and properties, refer to the <citetitle>API Reference</citetitle>, <citetitle>JS Documentation</citetitle>, and <citetitle>VDL Documentation</citetitle> available from the RichFaces website.
+ For full references for all component classes and properties, refer to the following supplementary documentation:
</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <citetitle>VDL (View Definition Language) Documentation</citetitle>
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Available at <ulink url="http://docs.jboss.org/richfaces/latest_4_0_X/vdldoc/" />
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ <citetitle>API (Application Programming Interface) Documentation</citetitle>
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <citetitle>RichFaces Components API</citetitle>
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Available at <ulink url="http://docs.jboss.org/richfaces/latest_4_0_X/javadoc/richfaces-components..." />
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ <citetitle>RichFaces Components UI</citetitle>
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Available at <ulink url="http://docs.jboss.org/richfaces/latest_4_0_X/javadoc/richfaces-components..." />
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ <citetitle>RichFaces Core API</citetitle>
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Available at <ulink url="http://docs.jboss.org/richfaces/latest_4_0_X/javadoc/richfaces-core-api/" />
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ <citetitle>RichFaces Core Implementation</citetitle>
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Available at <ulink url="http://docs.jboss.org/richfaces/latest_4_0_X/javadoc/richfaces-core-impl/" />
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </itemizedlist>
<para>
- For further examples for each component, refer to the <citetitle>RichFaces Showcase</citetitle> at <ulink url="http://richfaces-showcase.appspot.com/">http://richfaces-showcase.appspot.com/</ulink>.
+ For further examples for each component, refer to the <citetitle>RichFaces Showcase</citetitle> at <ulink url="http://richfaces-showcase.appspot.com/" />.
</para>
<section id="sect-Component_Reference-Introduction-Libraries">
<title>Libraries</title>
13 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r22376 - modules/docs/trunk/Component_Reference/src/main/docbook/en-US.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2011-04-05 20:43:39 -0400 (Tue, 05 Apr 2011)
New Revision: 22376
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Functionality_extension.xml
Log:
Added further clarification for hashParam: RFPL-1380
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 00:38:48 UTC (rev 22375)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Functionality_extension.xml 2011-04-06 00:43:39 UTC (rev 22376)
@@ -55,6 +55,9 @@
<title>Using parameters</title>
<programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richcomponentControl-Using_parameters-1.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
</example>
+ <para>
+ To group multiple parameters for a function, use the <sgmltag><rich:hashParam></sgmltag> component to create a hash map. Refer to <xref linkend="sect-Component_Reference-Functionality_extension-richhashParam" /> for details.
+ </para>
</section>
<section id="sect-Component_Reference-richcomponentControl-Reference_data">
13 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r22375 - in modules/docs/trunk/Component_Reference/src/main/docbook/en-US: extras and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2011-04-05 20:38:48 -0400 (Tue, 05 Apr 2011)
New Revision: 22375
Added:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richhashParam-richhashParam.xml_sample
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/Component_Reference.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-Functions.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-Tables_and_grids.xml
Log:
Completed revision for engineering review: RFPL-1380
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/Component_Reference.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/Component_Reference.xml 2011-04-05 16:00:15 UTC (rev 22374)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/Component_Reference.xml 2011-04-06 00:38:48 UTC (rev 22375)
@@ -27,9 +27,7 @@
<xi:include href="chap-Component_Reference-Drag_and_drop.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="chap-Component_Reference-Layout_and_appearance.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="chap-Component_Reference-Functions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!--
<xi:include href="chap-Component_Reference-Functionality_extension.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- -->
</part>
<!--
<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
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-05 16:00:15 UTC (rev 22374)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Functionality_extension.xml 2011-04-06 00:38:48 UTC (rev 22375)
@@ -4,8 +4,144 @@
<chapter id="chap-Component_Reference-Functionality_extension">
<title>Functionality extension</title>
<para>
- Incomplete
+ Read this chapter for details on miscellaneous components that provide extended functionality to web applications.
</para>
+
+ <section id="sect-Component_Reference-Functionality_extension-richcomponentControl">
+ <title><sgmltag><rich:componentControl></sgmltag></title>
+ <para>
+ The <sgmltag><rich:componentControl></sgmltag> behavior allows JavaScript API functions to be called on target components. The functions are called after defined events are triggered on the component to with the <sgmltag><rich:componentControl></sgmltag> behavior is attached. Initialization variants and activation events can be customized, and parameters can be passed to the target component.
+ </para>
+
+ <section id="sect-Component_Reference-richcomponentControl-Basic_usage">
+ <title>Basic usage</title>
+ <para>
+ The <varname>operation</varname> attribute is required to attach JavaScript functions to the parent component, along with either the <varname>target</varname> or <varname>selector</varname> attributes. Use the <varname>operation</varname> attribute to specify the JavaScript API function to perform. Use the <varname>target</varname> attribute to define the <varname>id</varname> identifier of the target component, or use the <varname>selector</varname> attribute to define a number of target components through the use of valid jQuery selectors.
+ </para>
+ <para>
+ Use the <varname>event</varname> attribute to specify the event that triggers the JavaScript API function call if it is different from the default triggering event for the parent component.
+ </para>
+ <example id="exam-Component_Reference-richcomponentControl-richcomponentControl_basic_usage">
+ <title><sgmltag><rich:componentControl></sgmltag> basic usage</title>
+ <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richcomponentControl-richcomponentControl_basic_usage.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+ <para>
+ The example contains a single command button, which when clicked shows the modal panel with the identifier <literal>ccModalPanelID</literal>.
+ </para>
+ </example>
+ </section>
+
+ <!--
+ <section id="sect-Component_Reference-richcomponentControl-Attaching_to_a_component">
+ <title>Attaching to a component</title>
+ <para>
+ The <varname>attachTo</varname> attribute can be used to attach the event to a component other than the parent component. If no <varname>attachTo</varname> attribute is supplied, the <sgmltag><rich:componentControl></sgmltag> component's parent is used, as in <xref linkend="exam-Component_Reference-richcomponentControl-richcomponentControl_basic_usage" />.
+ </para>
+ <example id="exam-Component_Reference-richcomponentControl-Attaching_richcomponentControl_to_a_component">
+ <title>Attaching <sgmltag><rich:componentControl></sgmltag> to a component</title>
+ <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richcomponentControl-Attaching_richcomponentControl_to_a_component.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+ <para>
+ In the example, the <literal>click</literal> event of the component with the identifier <literal>ccCalendarID</literal> will trigger the <literal>Expand</literal> operation for the component with the identifier <literal>doExpandCalendarID</literal>.
+ </para>
+ </example>
+ </section>
+ -->
+
+ <section id="sect-Component_Reference-richcomponentControl-Passing_parameters_to_API_methods">
+ <title>Passing parameters to API methods</title>
+ <para>
+ The operation can receive parameters through nested <sgmltag><f:param></sgmltag> elements.
+ </para>
+ <example id="exam-Component_Reference-richcomponentControl-Using_parameters">
+ <title>Using parameters</title>
+ <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richcomponentControl-Using_parameters-1.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+ </example>
+ </section>
+
+ <section id="sect-Component_Reference-richcomponentControl-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.ComponentControl</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlComponentControl</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>org.richfaces.ComponentControl</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.ComponentControlRenderer</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.ComponentControlTag</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
+ <section id="sect-Component_Reference-Functionality_extension-richhashParam">
+ <title><sgmltag><rich:hashParam></sgmltag></title>
+ <para>
+ The <sgmltag><rich:hashParam></sgmltag> component allows client-side parameters to be grouped into a hash map. The hash map can then be passed to the client JavaScript API functions of any RichFaces component.
+ </para>
+
+ <section id="sect-Component_Reference-richhashParam-Basic_usage">
+ <title>Basic usage</title>
+ <para>
+ Nest parameter tags in the <sgmltag><rich:hashParam></sgmltag> component to group them in the hash map. The hash map itself can then be passed as a function parameter.
+ </para>
+ <example id="exam-Component_Reference-richhashParam-richhashParam">
+ <title><sgmltag><rich:hashParam></sgmltag></title>
+ <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richhashParam-richhashParam.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+ <para>
+ The example illustrates the use of the <sgmltag><rich:hashParam></sgmltag> component to group multiple parameters into a hash map. The parameters are passed through to the <function>show</function> function pop-up panel with the <literal>popupPanel</literal> identifier.
+ </para>
+ </example>
+ </section>
+
+ <section id="sect-Component_Reference-richhashParam-Reference_data">
+ <title>Reference data</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <parameter>component-type</parameter>: <classname>org.richfaces.HashParam</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlHashParam</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>component-family</parameter>: <classname>org.richfaces.HashParam</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.HashParamRenderer</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.HashParamTag</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
+ </section>
+ </section>
+
+ <!--
<section id="sect-Component_Reference-Functionality_extension-richgmap">
<title><sgmltag><rich:gmap></sgmltag></title>
<para>
@@ -26,6 +162,7 @@
Incomplete
</para>
</section>
+ -->
</chapter>
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Functions.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Functions.xml 2011-04-05 16:00:15 UTC (rev 22374)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Functions.xml 2011-04-06 00:38:48 UTC (rev 22375)
@@ -7,88 +7,6 @@
Read this chapter for details on special functions for use with particular components. Using JavaServer Faces Expression Language (<acronym>JSF</acronym> <acronym>EL</acronym>), these functions can be accessed through the <varname>data</varname> attribute of components. Refer to <xref linkend="sect-Component_Reference-Events_and_JavaScript_interactions-data" /> for details on the <varname>data</varname> attribute.
</para>
- <section id="sect-Component_Reference-Functions-richcomponentControl">
- <title><sgmltag><rich:componentControl></sgmltag></title>
- <para>
- The <sgmltag><rich:componentControl></sgmltag> behavior allows JavaScript API functions to be called on target components. The functions are called after defined events are triggered on the component to with the <sgmltag><rich:componentControl></sgmltag> behavior is attached. Initialization variants and activation events can be customized, and parameters can be passed to the target component.
- </para>
-
- <section id="sect-Component_Reference-richcomponentControl-Basic_usage">
- <title>Basic usage</title>
- <para>
- The <varname>operation</varname> attribute is required to attach JavaScript functions to the parent component, along with either the <varname>target</varname> or <varname>selector</varname> attributes. Use the <varname>operation</varname> attribute to specify the JavaScript API function to perform. Use the <varname>target</varname> attribute to define the <varname>id</varname> identifier of the target component, or use the <varname>selector</varname> attribute to define a number of target components through the use of valid jQuery selectors.
- </para>
- <para>
- Use the <varname>event</varname> attribute to specify the event that triggers the JavaScript API function call if it is different from the default triggering event for the parent component.
- </para>
- <example id="exam-Component_Reference-richcomponentControl-richcomponentControl_basic_usage">
- <title><sgmltag><rich:componentControl></sgmltag> basic usage</title>
- <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richcomponentControl-richcomponentControl_basic_usage.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- <para>
- The example contains a single command button, which when clicked shows the modal panel with the identifier <literal>ccModalPanelID</literal>.
- </para>
- </example>
- </section>
-
- <!--
- <section id="sect-Component_Reference-richcomponentControl-Attaching_to_a_component">
- <title>Attaching to a component</title>
- <para>
- The <varname>attachTo</varname> attribute can be used to attach the event to a component other than the parent component. If no <varname>attachTo</varname> attribute is supplied, the <sgmltag><rich:componentControl></sgmltag> component's parent is used, as in <xref linkend="exam-Component_Reference-richcomponentControl-richcomponentControl_basic_usage" />.
- </para>
- <example id="exam-Component_Reference-richcomponentControl-Attaching_richcomponentControl_to_a_component">
- <title>Attaching <sgmltag><rich:componentControl></sgmltag> to a component</title>
- <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richcomponentControl-Attaching_richcomponentControl_to_a_component.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- <para>
- In the example, the <literal>click</literal> event of the component with the identifier <literal>ccCalendarID</literal> will trigger the <literal>Expand</literal> operation for the component with the identifier <literal>doExpandCalendarID</literal>.
- </para>
- </example>
- </section>
- -->
-
- <section id="sect-Component_Reference-richcomponentControl-Passing_parameters_to_API_methods">
- <title>Passing parameters to API methods</title>
- <para>
- The operation can receive parameters through nested <sgmltag><f:param></sgmltag> elements.
- </para>
- <example id="exam-Component_Reference-richcomponentControl-Using_parameters">
- <title>Using parameters</title>
- <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richcomponentControl-Using_parameters-1.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- </example>
- </section>
-
- <section id="sect-Component_Reference-richcomponentControl-Reference_data">
- <title>Reference data</title>
- <itemizedlist>
- <listitem>
- <para>
- <parameter>component-type</parameter>: <classname>org.richfaces.ComponentControl</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlComponentControl</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>component-family</parameter>: <classname>org.richfaces.ComponentControl</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.ComponentControlRenderer</classname>
- </para>
- </listitem>
- <listitem>
- <para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.ComponentControlTag</classname>
- </para>
- </listitem>
- </itemizedlist>
- </section>
- </section>
-
<section id="sect-Component_Reference-Functions-richclientId">
<title><function>rich:clientId</function></title>
<para>
@@ -99,7 +17,7 @@
<section id="sect-Component_Reference-Functions-richcomponent">
<title><function>rich:component</function></title>
<para>
- The <function>rich:component('id')</function> function is a shortcut for the equivalent <code>#{rich:clientId('id')}.component</code> code. It returns the UIComponent instance from the client, based on the passed server-side component identifier (<code>'id'</code>). If the specified component identifier is not found, <literal>null</literal> is returned instead.
+ The <function>rich:component('id')</function> function is equivalent to the <code>RichFaces.$('clientId')</code> code. It returns the client object instance based on the passed server-side component identifier (<code>'id'</code>). If the specified component identifier is not found, <literal>null</literal> is returned instead. The function can be used to get an object from a component to call a JavaScript API function without using the <sgmltag><rich:componentControl></sgmltag> component.
</para>
</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-05 16:00:15 UTC (rev 22374)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels.xml 2011-04-06 00:38:48 UTC (rev 22375)
@@ -557,7 +557,7 @@
<itemizedlist>
<listitem>
<para>
- Using the <sgmltag><rich:componentControl></sgmltag> component. For details on the component, refer to <xref linkend="sect-Component_Reference-Actions-richcomponentControl" />.
+ Using the <sgmltag><rich:componentControl></sgmltag> component. For details on the component, refer to <xref linkend="sect-Component_Reference-Functionality_extension-richcomponentControl" />.
</para>
</listitem>
<listitem>
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-05 16:00:15 UTC (rev 22374)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Tables_and_grids.xml 2011-04-06 00:38:48 UTC (rev 22375)
@@ -1695,13 +1695,6 @@
<section id="sect-Component_Reference-Tables_and_grids-Table_filtering">
<title>Table filtering</title>
- <!-- In development notification -->
- <important>
- <title>Documentation in development</title>
- <para>
- This section is currently under development. Any features it describes may not be available in the current release of RichFaces.
- </para>
- </important>
<!-- TODO: Not in Final -->
<!--
@@ -1754,7 +1747,7 @@
Use the <varname>filterValue</varname> attribute to point to an object which holds the current filtering value for the column. The attribute can be used to store filtering conditions in a session. Alternatively, use the <varname>filterValue</varname> attribute when using the JavaScript API for filtering. The attribute can store a value to pass as parameter to a JavaScript filter method.
</para>
<example id="exam-Component_Reference-Table_filtering-External_filtering">
- <title>External filtering</title>
+ <title>Filtering example</title>
<programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-Table_filtering-External_filtering.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
<para>
The example uses a filter expression on the first column and a filter method on the second column.
@@ -1775,13 +1768,6 @@
<section id="sect-Component_Reference-Tables_and_grids-Table_sorting">
<title>Table sorting</title>
- <!-- In development notification -->
- <important>
- <title>Documentation in development</title>
- <para>
- This section is currently under development. Any features it describes may not be available in the current release of RichFaces.
- </para>
- </important>
<para>
Tables entries can be sorted <!--by the user through either the basic method built in to the <sgmltag><rich:column></sgmltag> component, or -->by defining external sorting algorithms. Refer to <xref linkend="sect-Component_Reference-Tables_and_grids-richcolumn" /> for details on using the <sgmltag><rich:column></sgmltag> component in tables.
@@ -1837,7 +1823,7 @@
If using custom-defined rules for sorting, use the <varname>comparator</varname> attribute instead. Set the <varname>comparator</varname> attribute to point to your comparator method, which will be used when sorting the data model.
</para>
<para>
- Bind the <varname>sortOrder</varname> attribute to bean properties to manage the sorting order. The bean must handle all the sorting algorithms. <xref linkend="exam-Component_Reference-Table_sorting-External_sorting" /> demonstrates table sorting using an external control.
+ Bind the <varname>sortOrder</varname> attribute to bean properties to manage the sorting order. The bean must handle all the sorting algorithms. <xref linkend="exam-Component_Reference-Table_sorting-Sorting" /> demonstrates table sorting using an external control.
</para>
<example id="exam-Component_Reference-Table_sorting-Sorting">
<title>Sorting</title>
Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richhashParam-richhashParam.xml_sample
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richhashParam-richhashParam.xml_sample (rev 0)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richhashParam-richhashParam.xml_sample 2011-04-06 00:38:48 UTC (rev 22375)
@@ -0,0 +1,13 @@
+<h:commandButton value="Show popup">
+ <rich:componentControl target="popupPanel" operation="show">
+ <a4j:param noEscape="true" value="event" />
+ <rich:hashParam>
+ <f:param name="width" value="500" />
+ <f:param name="height" value="300" />
+ <f:param name="minWidth" value="300" />
+ <f:param name="minHeight" value="150" />
+ <a4j:param noEscape="true" name="left" value="(jQuery(window).width()/2)-250" />
+ <a4j:param noEscape="true" name="top" value="(jQuery(window).height()/2)-150" />
+ </rich:hashParam>
+ </rich:componentControl>
+</h:commandButton>
13 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r22374 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-04-05 12:00:15 -0400 (Tue, 05 Apr 2011)
New Revision: 22374
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
Log:
tests updated to use new templates
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-05 15:59:48 UTC (rev 22373)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-04-05 16:00:15 UTC (rev 22374)
@@ -95,7 +95,7 @@
*/
public static final long TIMEOUT = 5000;
@Inject
- @Templates({ "plain", "richDataTable1", "a4jRepeat2", "hDataTable1", "uiRepeat2" })
+ @Templates({ "plain", "richDataTable", "a4jRepeat", "hDataTable", "uiRepeat" })
private TemplatesList template;
/**
13 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r22373 - in modules/tests/metamer/trunk/application/src/main: webapp/templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-04-05 11:59:48 -0400 (Tue, 05 Apr 2011)
New Revision: 22373
Added:
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat.xhtml
Removed:
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
Log:
https://issues.jboss.org/browse/RFPL-943
iteration templates refactored
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-05 15:58:59 UTC (rev 22372)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-05 15:59:48 UTC (rev 22373)
@@ -33,14 +33,10 @@
PLAIN ("plain", "Plain", ""),
REDDIV ("redDiv", "Red div", ""),
BLUEDIV ("blueDiv", "Blue div", ""),
- RICHDATATABLE1 ("richDataTable1", "Rich Data Table Row 1", "containerRichDataTable1:0:"),
- RICHDATATABLE2 ("richDataTable2", "Rich Data Table Row 2", "containerRichDataTable2:1:"),
- HDATATABLE1 ("hDataTable1", "JSF Data Table Row 1", "containerHDataTable1:0:"),
- HDATATABLE2 ("hDataTable2", "JSF Data Table Row 2", "containerHDataTable1:1:"),
- UIREPEAT1 ("uiRepeat1", "UI Repeat Row 1", "containerUiRepeat1:0:"),
- UIREPEAT2 ("uiRepeat2", "UI Repeat Row 2", "containerUiRepeat2:1:"),
- A4JREPEAT1 ("a4jRepeat1", "A4J Repeat Row 1", "containerA4JRepeat1:0:"),
- A4JREPEAT2 ("a4jRepeat2", "A4J Repeat Row 2", "containerA4JRepeat2:1:");
+ 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:");
/**
* identifier of a template
Copied: modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat.xhtml (from rev 22372, modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml)
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat.xhtml 2011-04-05 15:59:48 UTC (rev 22373)
@@ -0,0 +1,40 @@
+<?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:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j">
+
+ <!--
+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>
+
+ <ul>
+ <a4j:repeat value="#{model.simple}" var="containerA4JRepeatItem" id="containerA4JRepeat2">
+ <li><h:panelGroup rendered="#{containerA4JRepeatItem == 'row 2'}">
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
+ </h:panelGroup>
+ <h:outputText value="#{containerA4JRepeatItem}" rendered="#{containerA4JRepeatItem != 'row 2'}" /></li>
+ </a4j:repeat>
+ </ul>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2011-04-05 15:59:48 UTC (rev 22373)
@@ -1,40 +0,0 @@
-<?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:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j">
-
- <!--
-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>
-
- <ul>
- <a4j:repeat value="#{model.simple}" var="containerA4JRepeatItem" id="containerA4JRepeat1">
- <li><h:panelGroup columns="1" rendered="#{containerA4JRepeatItem == 'row 1'}">
- <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerA4JRepeatItem}" rendered="#{containerA4JRepeatItem != 'row 1'}" /></li>
- </a4j:repeat>
- </ul>
-
- </ui:composition>
-</html>
\ No newline at end of file
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2011-04-05 15:59:48 UTC (rev 22373)
@@ -1,40 +0,0 @@
-<?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:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j">
-
- <!--
-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>
-
- <ul>
- <a4j:repeat value="#{model.simple}" var="containerA4JRepeatItem" id="containerA4JRepeat2">
- <li><h:panelGroup columns="1" rendered="#{containerA4JRepeatItem == 'row 2'}">
- <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerA4JRepeatItem}" rendered="#{containerA4JRepeatItem != 'row 2'}" /></li>
- </a4j:repeat>
- </ul>
-
- </ui:composition>
-</html>
\ No newline at end of file
Copied: modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable.xhtml (from rev 22372, modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml)
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable.xhtml 2011-04-05 15:59:48 UTC (rev 22373)
@@ -0,0 +1,56 @@
+<?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">
+
+ <!--
+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:dataTable value="#{model.simple}" var="containerHDataTableItem" id="containerHDataTable1">
+
+ <f:facet name="header">
+ JSF Data Table
+ </f:facet>
+
+ <h:column>
+ <f:facet name="header">
+ Column 1
+ </f:facet>
+ #{containerHDataTableItem}
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ Column 2
+ </f:facet>
+ <h:panelGroup rendered="#{containerHDataTableItem == 'row 3'}">
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
+ </h:panelGroup>
+ <h:outputText value="#{containerHDataTableItem}" rendered="#{containerHDataTableItem != 'row 3'}" />
+ </h:column>
+
+ </h:dataTable>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2011-04-05 15:59:48 UTC (rev 22373)
@@ -1,43 +0,0 @@
-<?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">
-
- <!--
-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:dataTable value="#{model.simple}" var="containerHDataTableItem" id="containerHDataTable1">
- <h:column>
- <f:facet name="header">
- <h:outputText value="JSF Data Table" />
- </f:facet>
- <h:panelGroup columns="1" rendered="#{containerHDataTableItem == 'row 1'}">
- <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerHDataTableItem}" rendered="#{containerHDataTableItem != 'row 1'}" />
- </h:column>
- </h:dataTable>
-
- </ui:composition>
-</html>
\ No newline at end of file
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2011-04-05 15:59:48 UTC (rev 22373)
@@ -1,43 +0,0 @@
-<?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" >
-
- <!--
-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:dataTable value="#{model.simple}" var="containerHDataTableItem" id="containerHDataTable1">
- <h:column>
- <f:facet name="header">
- <h:outputText value="JSF Data Table" />
- </f:facet>
- <h:panelGroup columns="1" rendered="#{containerHDataTableItem == 'row 2'}">
- <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerHDataTableItem}" rendered="#{containerHDataTableItem != 'row 2'}" />
- </h:column>
- </h:dataTable>
-
- </ui:composition>
-</html>
\ No newline at end of file
Copied: modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable.xhtml (from rev 22372, modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml)
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable.xhtml 2011-04-05 15:59:48 UTC (rev 22373)
@@ -0,0 +1,55 @@
+<?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 value="#{model.simple}" var="containerRichDataTableItem" id="containerRichDataTable">
+
+ <f:facet name="header">
+ Rich Data Table
+ </f:facet>
+
+ <h:column>
+ <f:facet name="header">
+ Column 1
+ </f:facet>
+ #{containerRichDataTableItem}
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ Column 2
+ </f:facet>
+ <h:panelGroup rendered="#{containerRichDataTableItem == 'row 3'}">
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
+ </h:panelGroup>
+ <h:outputText value="#{containerRichDataTableItem}" rendered="#{containerRichDataTableItem != 'row 3'}" />
+ </h:column>
+
+ </rich:dataTable>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2011-04-05 15:59:48 UTC (rev 22373)
@@ -1,43 +0,0 @@
-<?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 value="#{model.simple}" var="containerRichDataTableItem" id="containerRichDataTable1" rowKeyVar="row">
- <rich:column>
- <f:facet name="header">
- <h:outputText value="Rich Data Table" />
- </f:facet>
- <h:panelGroup columns="1" rendered="#{containerRichDataTableItem == 'row 1'}">
- <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerRichDataTableItem}" rendered="#{containerRichDataTableItem != 'row 1'}" />
- </rich:column>
- </rich:dataTable>
-
- </ui:composition>
-</html>
\ No newline at end of file
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2011-04-05 15:59:48 UTC (rev 22373)
@@ -1,43 +0,0 @@
-<?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 value="#{model.simple}" var="containerRichDataTableItem" id="containerRichDataTable2" rowKeyVar="row">
- <rich:column>
- <f:facet name="header">
- <h:outputText value="Rich Data Table" />
- </f:facet>
- <h:panelGroup columns="1" rendered="#{containerRichDataTableItem == 'row 2'}">
- <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerRichDataTableItem}" rendered="#{containerRichDataTableItem != 'row 2'}" />
- </rich:column>
- </rich:dataTable>
-
- </ui:composition>
-</html>
\ No newline at end of file
Copied: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat.xhtml (from rev 22372, modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml)
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat.xhtml 2011-04-05 15:59:48 UTC (rev 22373)
@@ -0,0 +1,40 @@
+<?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:ui="http://java.sun.com/jsf/facelets">
+
+ <!--
+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>
+
+ <ol>
+ <ui:repeat value="#{model.simple}" var="containerUiRepeatItem" id="containerUiRepeat2">
+ <li><h:panelGroup rendered="#{containerUiRepeatItem == 'row 2'}">
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
+ </h:panelGroup>
+ <h:outputText value="#{containerUiRepeatItem}" rendered="#{containerUiRepeatItem != 'row 2'}" /></li>
+ </ui:repeat>
+ </ol>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2011-04-05 15:59:48 UTC (rev 22373)
@@ -1,39 +0,0 @@
-<?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:ui="http://java.sun.com/jsf/facelets">
-
- <!--
-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>
-
- <ol>
- <ui:repeat value="#{model.simple}" var="containerUiRepeatItem" id="containerUiRepeat1">
- <li><h:panelGroup columns="1" rendered="#{containerUiRepeatItem == 'row 1'}">
- <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerUiRepeatItem}" rendered="#{containerUiRepeatItem != 'row 1'}" /></li>
- </ui:repeat>
- </ol>
-
- </ui:composition>
-</html>
\ No newline at end of file
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2011-04-05 15:59:48 UTC (rev 22373)
@@ -1,40 +0,0 @@
-<?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:ui="http://java.sun.com/jsf/facelets">
-
- <!--
-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>
-
- <ol>
- <ui:repeat value="#{model.simple}" var="containerUiRepeatItem" id="containerUiRepeat2">
- <li><h:panelGroup columns="1" rendered="#{containerUiRepeatItem == 'row 2'}">
- <ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
- </h:panelGroup>
- <h:outputText value="#{containerUiRepeatItem}" rendered="#{containerUiRepeatItem != 'row 2'}" /></li>
- </ui:repeat>
- </ol>
-
- </ui:composition>
-</html>
\ No newline at end of file
13 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r22372 - in modules/tests/metamer/trunk/application/src/main: webapp/components/a4jRepeat and 6 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-04-05 11:58:59 -0400 (Tue, 05 Apr 2011)
New Revision: 22372
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/Model.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TemplateBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
Log:
model used in templates moved from TemplateBean to Model
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/Model.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/Model.java 2011-04-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/Model.java 2011-04-05 15:58:59 UTC (rev 22372)
@@ -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.bean;
import java.io.Serializable;
@@ -29,6 +28,7 @@
import java.util.List;
import java.util.Set;
+import javax.annotation.PostConstruct;
import javax.faces.bean.ApplicationScoped;
import javax.faces.bean.ManagedBean;
import javax.faces.model.SelectItem;
@@ -54,13 +54,21 @@
public class Model implements Serializable {
private static final long serialVersionUID = 1L;
-
private List<Capital> capitalsList;
private List<Employee> employeesList;
private Set<String> jobTitles;
private List<SelectItem> jobTitlesSelectItems;
private List<CompactDiscXmlDescriptor> compactDiscList;
+ private List<String> simple = new ArrayList<String>();
+ @PostConstruct
+ public void init() {
+ simple.add("row 1");
+ simple.add("row 2");
+ simple.add("row 3");
+ simple.add("row 4");
+ }
+
/**
* Model containing US states, their capitals and timezones.
*
@@ -132,8 +140,7 @@
}
@SuppressWarnings("unchecked")
- static final <R, T extends ListHolder<R>> List<R> unmarshall(Class<T> rootElementType, String resourceURL)
- throws JAXBException {
+ static <R, T extends ListHolder<R>> List<R> unmarshall(Class<T> rootElementType, String resourceURL) throws JAXBException {
ClassLoader ccl = Thread.currentThread().getContextClassLoader();
URL resource = ccl.getResource(resourceURL);
JAXBContext context = JAXBContext.newInstance(rootElementType);
@@ -225,4 +232,8 @@
return jobTitlesSelectItems;
}
+
+ public List<String> getSimple() {
+ return simple;
+ }
}
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TemplateBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TemplateBean.java 2011-04-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/TemplateBean.java 2011-04-05 15:58:59 UTC (rev 22372)
@@ -1,7 +1,7 @@
/*******************************************************************************
* JBoss, Home of Professional Open Source
* Copyright 2007, Exadel, Inc.,
- * 2010, Red Hat, Inc. and individual contributors
+ * 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.
*
@@ -20,7 +20,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.bean;
import java.io.Serializable;
@@ -43,7 +42,6 @@
private static final long serialVersionUID = 5078700314562231363L;
private static Logger logger = LoggerFactory.getLogger(TemplateBean.class);
- private List<String> dataTableModel = new ArrayList<String>();
private TemplatesList templates;
private int templateIndex = 0;
private boolean renderForm;
@@ -51,11 +49,6 @@
@PostConstruct
public void init() {
templates = new TemplatesList();
- dataTableModel.add("row 1");
- dataTableModel.add("row 2");
- dataTableModel.add("row 3");
- dataTableModel.add("row 4");
-
renderForm = true;
}
@@ -77,9 +70,9 @@
this.templates.add(t);
}
}
-
+
public String getComponentPrefix() {
- StringBuffer prefix = new StringBuffer("form:");
+ StringBuilder prefix = new StringBuilder("form:");
for (Template template : templates) {
prefix.append(template.getNestedComponentPrefix());
}
@@ -95,13 +88,6 @@
return retVal;
}
- /**
- * @return the dataTableModel
- */
- public List<String> getDataTableModel() {
- return dataTableModel;
- }
-
public String getFirstTemplate() {
templateIndex = 0;
return templates.get(0).toString();
@@ -118,5 +104,4 @@
public void setRenderForm(boolean renderForm) {
this.renderForm = renderForm;
}
-
}
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/keepSaved.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/keepSaved.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
@@ -54,7 +54,7 @@
<ui:define name="component">
<a4j:repeat id="richList" keepSaved="#{a4jRepeatBean.attributes['keepSaved'].value}"
- value="#{templateBean.dataTableModel}">
+ value="#{model.simple}">
<h:inputText id="input" value="#{maxBean.value}"/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/keepSaved.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/keepSaved.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
@@ -59,7 +59,7 @@
</rich:column>
<rich:collapsibleSubTable id="richSubTable" keepSaved="#{richSubTableBean.attributes['keepSaved'].value}"
- value="#{templateBean.dataTableModel}" >
+ value="#{model.simple}" >
<rich:column id="columnInput">
<h:inputText id="input" value="#{maxBean.value}"/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
@@ -52,7 +52,7 @@
<ui:define name="component">
<rich:dataGrid id="richDataGrid" keepSaved="#{richDataGridBean.attributes['keepSaved'].value}"
- value="#{templateBean.dataTableModel}" columns="2">
+ value="#{model.simple}" columns="2">
<rich:column id="columnInput">
<h:inputText id="input" value="#{maxBean.value}"/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/keepSaved.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/keepSaved.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
@@ -54,7 +54,7 @@
<ui:define name="component">
<rich:dataTable id="richDataTable" keepSaved="#{richDataTableBean.attributes['keepSaved'].value}"
- value="#{templateBean.dataTableModel}" >
+ value="#{model.simple}" >
<rich:column id="columnInput">
<h:inputText id="input" value="#{maxBean.value}"/>
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-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
@@ -66,7 +66,7 @@
<ui:define name="component">
<rich:extendedDataTable id="richEDT" keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}"
- value="#{templateBean.dataTableModel}" >
+ value="#{model.simple}" >
<rich:column id="columnInput">
<h:inputText id="input" value="#{maxBean.value}"/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
@@ -52,7 +52,7 @@
<ui:define name="component">
<rich:list id="richList" keepSaved="#{richListBean.attributes['keepSaved'].value}"
- value="#{templateBean.dataTableModel}" type="unordered">
+ value="#{model.simple}" type="unordered">
<h:inputText id="input" value="#{maxBean.value}"/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
@@ -28,7 +28,7 @@
<ui:composition>
<ul>
- <a4j:repeat value="#{templateBean.dataTableModel}" var="containerA4JRepeatItem" id="containerA4JRepeat1">
+ <a4j:repeat value="#{model.simple}" var="containerA4JRepeatItem" id="containerA4JRepeat1">
<li><h:panelGroup columns="1" rendered="#{containerA4JRepeatItem == 'row 1'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
@@ -28,7 +28,7 @@
<ui:composition>
<ul>
- <a4j:repeat value="#{templateBean.dataTableModel}" var="containerA4JRepeatItem" id="containerA4JRepeat2">
+ <a4j:repeat value="#{model.simple}" var="containerA4JRepeatItem" id="containerA4JRepeat2">
<li><h:panelGroup columns="1" rendered="#{containerA4JRepeatItem == 'row 2'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
@@ -27,7 +27,7 @@
<ui:composition>
- <h:dataTable value="#{templateBean.dataTableModel}" var="containerHDataTableItem" id="containerHDataTable1">
+ <h:dataTable value="#{model.simple}" var="containerHDataTableItem" id="containerHDataTable1">
<h:column>
<f:facet name="header">
<h:outputText value="JSF Data Table" />
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
@@ -27,7 +27,7 @@
<ui:composition>
- <h:dataTable value="#{templateBean.dataTableModel}" var="containerHDataTableItem" id="containerHDataTable1">
+ <h:dataTable value="#{model.simple}" var="containerHDataTableItem" id="containerHDataTable1">
<h:column>
<f:facet name="header">
<h:outputText value="JSF Data Table" />
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
@@ -27,7 +27,7 @@
<ui:composition>
- <rich:dataTable value="#{templateBean.dataTableModel}" var="containerRichDataTableItem" id="containerRichDataTable1" rowKeyVar="row">
+ <rich:dataTable value="#{model.simple}" var="containerRichDataTableItem" id="containerRichDataTable1" rowKeyVar="row">
<rich:column>
<f:facet name="header">
<h:outputText value="Rich Data Table" />
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
@@ -27,7 +27,7 @@
<ui:composition>
- <rich:dataTable value="#{templateBean.dataTableModel}" var="containerRichDataTableItem" id="containerRichDataTable2" rowKeyVar="row">
+ <rich:dataTable value="#{model.simple}" var="containerRichDataTableItem" id="containerRichDataTable2" rowKeyVar="row">
<rich:column>
<f:facet name="header">
<h:outputText value="Rich Data Table" />
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
@@ -27,7 +27,7 @@
<ui:composition>
<ol>
- <ui:repeat value="#{templateBean.dataTableModel}" var="containerUiRepeatItem" id="containerUiRepeat1">
+ <ui:repeat value="#{model.simple}" var="containerUiRepeatItem" id="containerUiRepeat1">
<li><h:panelGroup columns="1" rendered="#{containerUiRepeatItem == 'row 1'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2011-04-05 15:58:59 UTC (rev 22372)
@@ -28,7 +28,7 @@
<ui:composition>
<ol>
- <ui:repeat value="#{templateBean.dataTableModel}" var="containerUiRepeatItem" id="containerUiRepeat2">
+ <ui:repeat value="#{model.simple}" var="containerUiRepeatItem" id="containerUiRepeat2">
<li><h:panelGroup columns="1" rendered="#{containerUiRepeatItem == 'row 2'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
13 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r22371 - in modules/tests/metamer/trunk/application/src/main/webapp/components: richCollapsibleSubTable and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-04-05 11:58:00 -0400 (Tue, 05 Apr 2011)
New Revision: 22371
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml
Log:
samples for attribute keepSaved updated
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/keepSaved.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/keepSaved.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
@@ -56,7 +56,7 @@
<a4j:repeat id="richList" keepSaved="#{a4jRepeatBean.attributes['keepSaved'].value}"
value="#{templateBean.dataTableModel}">
- <h:inputText />
+ <h:inputText id="input" value="#{maxBean.value}"/>
</a4j:repeat>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/keepSaved.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/keepSaved.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
@@ -62,7 +62,7 @@
value="#{templateBean.dataTableModel}" >
<rich:column id="columnInput">
- <h:inputText />
+ <h:inputText id="input" value="#{maxBean.value}"/>
</rich:column>
</rich:collapsibleSubTable>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
@@ -55,7 +55,7 @@
value="#{templateBean.dataTableModel}" columns="2">
<rich:column id="columnInput">
- <h:inputText />
+ <h:inputText id="input" value="#{maxBean.value}"/>
</rich:column>
</rich:dataGrid>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/keepSaved.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/keepSaved.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
@@ -57,7 +57,7 @@
value="#{templateBean.dataTableModel}" >
<rich:column id="columnInput">
- <h:inputText />
+ <h:inputText id="input" value="#{maxBean.value}"/>
</rich:column>
</rich:dataTable>
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-05 15:57:24 UTC (rev 22370)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
@@ -69,7 +69,7 @@
value="#{templateBean.dataTableModel}" >
<rich:column id="columnInput">
- <h:inputText />
+ <h:inputText id="input" value="#{maxBean.value}"/>
</rich:column>
</rich:extendedDataTable>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml 2011-04-05 15:58:00 UTC (rev 22371)
@@ -54,7 +54,7 @@
<rich:list id="richList" keepSaved="#{richListBean.attributes['keepSaved'].value}"
value="#{templateBean.dataTableModel}" type="unordered">
- <h:inputText />
+ <h:inputText id="input" value="#{maxBean.value}"/>
</rich:list>
13 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r22370 - in modules/tests/metamer/trunk/application/src/main/webapp: components/a4jMediaOutput and 12 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-04-05 11:57:24 -0400 (Tue, 05 Apr 2011)
New Revision: 22370
Removed:
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jActionListener.css
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jJSFunction.css
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jLog.css
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jMediaOutput.css
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jParam.css
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jPoll.css
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jPush.css
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jQueue.css
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jRegion.css
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richComponentControl.css
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richDataGrid.css
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richDataScroller.css
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richFunctions.css
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richJQuery.css
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richList.css
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/facets.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/all.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml
Log:
empty css files removed and references to them removed
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -37,9 +37,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="a4jActionListener.css"/>
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="outOfTemplateBefore">
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -36,15 +36,13 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="a4jMediaOutput.css"/>
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="component">
<h:outputScript library="script" name="swfobject.js"/>
<a4j:outputPanel id="flashPanelDynamic">
- <a4j:mediaOutput element="a" id="swfLink" style="display: none;" cacheable="false" session="true"
+ <a4j:mediaOutput element="a" id="swfLink" style="display: none;" cacheable="false"
createContent="#{a4jMediaOutputBean.paintFlash}" value="#{mediaData}" />
<a4j:outputPanel layout="block" id="myFlashContent" style="width: 200px; height: 200px">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -36,9 +36,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="a4jMediaOutput.css"/>
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="component">
<a4j:mediaOutput id="mediaOutput"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -36,9 +36,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="a4jParam.css"/>
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -38,7 +38,6 @@
</ui:define>
<ui:define name="head">
- <h:outputStylesheet library="css" name="a4jPoll.css"/>
<h:outputScript library="script" name="date-format.js" />
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/simple.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/simple.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -36,9 +36,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="a4jPush.css"/>
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -38,9 +38,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="a4jQueue.css" />
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -38,7 +38,6 @@
</ui:define>
<ui:define name="head">
- <h:outputStylesheet library="css" name="a4jQueue.css" />
<script type="text/javascript">
function add(element) {
element.innerHTML = 1 + parseInt(element.innerHTML);
@@ -98,13 +97,13 @@
<ui:define name="outOfTemplateAfter">
<h:form id="attributeForm">
- <h:panelGrid columns="2">
- <h:outputLabel for="introduceDelay" value="Introduce Delay:" />
- <h:selectBooleanCheckbox id="introduceDelay" value="#{a4jQueueBean.introduceDelay}">
- <a4j:ajax event="change" />
- </h:selectBooleanCheckbox>
- </h:panelGrid>
-
+ <h:panelGrid columns="2">
+ <h:outputLabel for="introduceDelay" value="Introduce Delay:" />
+ <h:selectBooleanCheckbox id="introduceDelay" value="#{a4jQueueBean.introduceDelay}">
+ <a4j:ajax event="change" />
+ </h:selectBooleanCheckbox>
+ </h:panelGrid>
+
<metamer:attributes value="#{a4jQueueBean.attributes}" id="attributes" />
</h:form>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -36,8 +36,6 @@
</ui:define>
<ui:define name="head">
- <h:outputStylesheet library="css" name="a4jRegion.css" />
-
<script type="text/javascript">/*<![CDATA[*/
function randomize() {
jQuery("input[type='text']").each(function() {
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -36,9 +36,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="a4jRegion.css" />
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/simple.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/simple.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -36,9 +36,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="richComponentControl.css"/>
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -36,9 +36,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="richDataGrid.css"/>
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="outOfTemplateBefore">
<br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/facets.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/facets.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/facets.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -37,9 +37,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="richDataGrid.css" />
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="component">
<h:panelGroup layout="div">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -36,9 +36,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="richDataGrid.css"/>
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="outOfTemplateBefore">
<br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -36,9 +36,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="richDataGrid.css"/>
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="outOfTemplateBefore">
<br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -36,9 +36,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="richDataGrid.css" />
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="outOfTemplateBefore">
<h:panelGrid columns="2">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -37,9 +37,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="richDataGrid.css"/>
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="outOfTemplateBefore">
<br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -36,9 +36,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="richDataGrid.css" />
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="component">
<h:panelGroup layout="div">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -37,9 +37,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="richDataScroller.css"/>
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="outOfTemplateBefore">
<br/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/all.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/all.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/all.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -35,9 +35,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="richFunctions.css"/>
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="component">
<f:subview id="subview">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -36,9 +36,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="richJQuery.css"/>
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -36,9 +36,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="richList.css" />
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="outOfTemplateBefore">
<h:panelGrid columns="2">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richList/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richList/scroller.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/scroller.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -37,9 +37,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="richList.css" />
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="outOfTemplateBefore">
<rich:dataScroller id="scroller1" for="richList" maxPages="7" render="#{nestedComponentId}" />
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml 2011-04-05 14:39:55 UTC (rev 22369)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml 2011-04-05 15:57:24 UTC (rev 22370)
@@ -36,9 +36,7 @@
</f:metadata>
</ui:define>
- <ui:define name="head">
- <h:outputStylesheet library="css" name="richList.css" />
- </ui:define>
+ <ui:define name="head"/>
<ui:define name="outOfTemplateBefore">
</ui:define>
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jActionListener.css
===================================================================
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jJSFunction.css
===================================================================
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jLog.css
===================================================================
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jMediaOutput.css
===================================================================
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jParam.css
===================================================================
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jPoll.css
===================================================================
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jPush.css
===================================================================
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jQueue.css
===================================================================
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jRegion.css
===================================================================
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richComponentControl.css
===================================================================
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richDataGrid.css
===================================================================
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richDataScroller.css
===================================================================
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richFunctions.css
===================================================================
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richJQuery.css
===================================================================
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richList.css
===================================================================
13 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r22368 - in modules/tests/metamer/trunk/application/src/main: webapp/components/a4jRepeat and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-04-05 10:16:35 -0400 (Tue, 05 Apr 2011)
New Revision: 22368
Added:
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRepeatBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/list.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/list.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/list.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/list.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/list.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml
Log:
https://issues.jboss.org/browse/RFPL-745
added pages for testing keepSaved in iteration components
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRepeatBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRepeatBean.java 2011-04-05 14:15:28 UTC (rev 22367)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRepeatBean.java 2011-04-05 14:16:35 UTC (rev 22368)
@@ -149,7 +149,6 @@
attributes.remove("componentState");
attributes.remove("iterationState");
attributes.remove("iterationStatusVar");
- attributes.remove("keepSaved");
attributes.remove("rowKeyVar");
attributes.remove("rowKeyConverter");
attributes.remove("value");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java 2011-04-05 14:15:28 UTC (rev 22367)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java 2011-04-05 14:16:35 UTC (rev 22368)
@@ -59,12 +59,11 @@
private transient UICollapsibleSubTable binding;
// true = model, false = empty table
private boolean state;
-
// facets
private Map<String, String> facets = new HashMap<String, String>();
-
// sorting
private ColumnSortingMap sorting = new ColumnSortingMap() {
+
private static final long serialVersionUID = 1L;
protected UIDataTableBase getBinding() {
@@ -75,10 +74,8 @@
return attributes;
}
};
-
// filtering
private Map<String, Object> filtering = new HashMap<String, Object>();
-
// expanded
private Map<List<Employee>, Boolean> expanded = new HashMap<List<Employee>, Boolean>();
@@ -91,7 +88,7 @@
logger.debug("initializing bean " + getClass().getName());
attributes = Attributes.getComponentAttributesFromFacesConfig(UICollapsibleSubTable.class, getClass());
-
+
attributes.setAttribute("rendered", true);
attributes.setAttribute("rows", 5);
@@ -100,7 +97,6 @@
attributes.remove("columns");
attributes.remove("selection");
attributes.remove("filterVar");
- attributes.remove("keepSaved");
attributes.remove("iterationStatusVar");
attributes.remove("componentState");
attributes.remove("rowKeyVar");
@@ -122,7 +118,7 @@
lists = new ArrayList<List<Employee>>();
lists.add(men);
lists.add(women);
-
+
expanded.put(men, true);
expanded.put(women, true);
@@ -164,23 +160,23 @@
public Map<String, String> getFacets() {
return facets;
}
-
+
public UICollapsibleSubTable getBinding() {
return binding;
}
-
+
public void setBinding(UICollapsibleSubTable binding) {
this.binding = binding;
}
-
+
public ColumnSortingMap getSorting() {
return sorting;
}
-
+
public Map<String, Object> getFiltering() {
return filtering;
}
-
+
public Map<List<Employee>, Boolean> getExpanded() {
return expanded;
}
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java 2011-04-05 14:15:28 UTC (rev 22367)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java 2011-04-05 14:16:35 UTC (rev 22368)
@@ -61,7 +61,6 @@
attributes.setAttribute("rows", 20);
// TODO has to be tested in other way
- attributes.remove("keepSaved");
attributes.remove("iterationStatusVar");
attributes.remove("rowKeyVar");
attributes.remove("stateVar");
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/keepSaved.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/keepSaved.xhtml 2011-04-05 14:16:35 UTC (rev 22368)
@@ -0,0 +1,70 @@
+<?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:a4j="http://richfaces.org/a4j">
+
+ <!--
+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 template="/templates/template.xhtml">
+ <ui:param name="componentId" value="richDataTable" />
+
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
+ <h:outputStylesheet library="css" name="a4jRepeat.css" />
+ </ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ <h:panelGrid columns="2">
+ keepSaved
+ <h:selectOneRadio id="keepSavedInput" value="#{a4jRepeatBean.attributes['keepSaved'].value}" onchange="submit()">
+ <f:selectItem itemValue="" itemLabel="null"/>
+ <f:selectItem itemValue="true" itemLabel="true"/>
+ <f:selectItem itemValue="false" itemLabel="false"/>
+ </h:selectOneRadio>
+ </h:panelGrid>
+ </ui:define>
+
+ <ui:define name="component">
+
+ <a4j:repeat id="richList" keepSaved="#{a4jRepeatBean.attributes['keepSaved'].value}"
+ value="#{templateBean.dataTableModel}">
+
+ <h:inputText />
+
+ </a4j:repeat>
+
+ <br/>
+ <h:commandButton id="submitButton" value="Submit"/>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter"/>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/list.xhtml 2011-04-05 14:15:28 UTC (rev 22367)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/list.xhtml 2011-04-05 14:16:35 UTC (rev 22368)
@@ -39,6 +39,10 @@
Simple page that contains <b>a4j:repeat</b> rendering a table. Page contains input boxes for all repeat's attributes.
</metamer:testPageLink>
+ <metamer:testPageLink id="keepSaved" outcome="keepSaved" value="Keep Saved">
+ Page for testing attribute keepSaved of <b>a4j:repeat</b>.
+ </metamer:testPageLink>
+
</ui:define>
</ui:composition>
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/keepSaved.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/keepSaved.xhtml 2011-04-05 14:16:35 UTC (rev 22368)
@@ -0,0 +1,78 @@
+<?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 template="/templates/template.xhtml">
+ <ui:param name="componentId" value="richDataTable" />
+
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="head"></ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ <h:panelGrid columns="2">
+ keepSaved
+ <h:selectOneRadio id="keepSavedInput" value="#{richSubTableBean.attributes['keepSaved'].value}" onchange="submit()">
+ <f:selectItem itemValue="" itemLabel="null"/>
+ <f:selectItem itemValue="true" itemLabel="true"/>
+ <f:selectItem itemValue="false" itemLabel="false"/>
+ </h:selectOneRadio>
+ </h:panelGrid>
+ </ui:define>
+
+ <ui:define name="component">
+
+ <rich:dataTable id="richDataTable" value="#{richSubTableBean.lists}" var="list">
+
+ <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" keepSaved="#{richSubTableBean.attributes['keepSaved'].value}"
+ value="#{templateBean.dataTableModel}" >
+
+ <rich:column id="columnInput">
+ <h:inputText />
+ </rich:column>
+
+ </rich:collapsibleSubTable>
+ </rich:dataTable>
+
+ <br/>
+ <h:commandButton id="submitButton" value="Submit"/>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter"/>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/list.xhtml 2011-04-05 14:15:28 UTC (rev 22367)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/list.xhtml 2011-04-05 14:16:35 UTC (rev 22368)
@@ -61,6 +61,10 @@
Page that contains filterable <b>rich:collapsibleSubTable</b> (with model containing employees) and input boxes for all its attributes filterable by its columns.
</metamer:testPageLink>
+ <metamer:testPageLink id="keepSaved" outcome="keepSaved" value="Keep Saved">
+ Page for testing attribute keepSaved of <b>rich:collapsibleSubTable</b>.
+ </metamer:testPageLink>
+
</ui:define>
</ui:composition>
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/keepSaved.xhtml 2011-04-05 14:16:35 UTC (rev 22368)
@@ -0,0 +1,72 @@
+<?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 template="/templates/template.xhtml">
+ <ui:param name="componentId" value="richDataTable" />
+
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
+ <h:outputStylesheet library="css" name="richDataGrid.css" />
+ </ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ <h:panelGrid columns="2">
+ keepSaved
+ <h:selectOneRadio id="keepSavedInput" value="#{richDataGridBean.attributes['keepSaved'].value}" onchange="submit()">
+ <f:selectItem itemValue="" itemLabel="null"/>
+ <f:selectItem itemValue="true" itemLabel="true"/>
+ <f:selectItem itemValue="false" itemLabel="false"/>
+ </h:selectOneRadio>
+ </h:panelGrid>
+ </ui:define>
+
+ <ui:define name="component">
+
+ <rich:dataGrid id="richDataGrid" keepSaved="#{richDataGridBean.attributes['keepSaved'].value}"
+ value="#{templateBean.dataTableModel}" columns="2">
+
+ <rich:column id="columnInput">
+ <h:inputText />
+ </rich:column>
+
+ </rich:dataGrid>
+
+ <br/>
+ <h:commandButton id="submitButton" value="Submit"/>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter"/>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/list.xhtml 2011-04-05 14:15:28 UTC (rev 22367)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/list.xhtml 2011-04-05 14:16:35 UTC (rev 22368)
@@ -57,6 +57,10 @@
Page that contains <b>rich:dataGrid</b> (with model containing employees) with <b>a4j:repeat</b> inside it.
</metamer:testPageLink>
+ <metamer:testPageLink id="keepSaved" outcome="keepSaved" value="Keep Saved">
+ Page for testing attribute keepSaved of <b>rich:dataGrid</b>.
+ </metamer:testPageLink>
+
</ui:define>
</ui:composition>
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/keepSaved.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/keepSaved.xhtml 2011-04-05 14:16:35 UTC (rev 22368)
@@ -0,0 +1,72 @@
+<?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 template="/templates/template.xhtml">
+ <ui:param name="componentId" value="richDataTable" />
+
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
+ <h:outputStylesheet library="css" name="richDataTable.css"/>
+ </ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ <h:panelGrid columns="2">
+ keepSaved
+ <h:selectOneRadio id="keepSavedInput" value="#{richDataTableBean.attributes['keepSaved'].value}" onchange="submit()">
+ <f:selectItem itemValue="" itemLabel="null"/>
+ <f:selectItem itemValue="true" itemLabel="true"/>
+ <f:selectItem itemValue="false" itemLabel="false"/>
+ </h:selectOneRadio>
+ </h:panelGrid>
+ </ui:define>
+
+ <ui:define name="component">
+
+ <rich:dataTable id="richDataTable" keepSaved="#{richDataTableBean.attributes['keepSaved'].value}"
+ value="#{templateBean.dataTableModel}" >
+
+ <rich:column id="columnInput">
+ <h:inputText />
+ </rich:column>
+
+ </rich:dataTable>
+
+ <br/>
+ <h:commandButton id="submitButton" value="Submit"/>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter"/>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/list.xhtml 2011-04-05 14:15:28 UTC (rev 22367)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/list.xhtml 2011-04-05 14:16:35 UTC (rev 22368)
@@ -65,6 +65,10 @@
Page that contains filterable <b>rich:dataTable</b> (with model containing employees) and input boxes for all its attributes.
</metamer:testPageLink>
+ <metamer:testPageLink id="keepSaved" outcome="keepSaved" value="Keep Saved">
+ Page for testing attribute keepSaved of <b>rich:dataTable</b>.
+ </metamer:testPageLink>
+
</ui:define>
</ui:composition>
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml 2011-04-05 14:16:35 UTC (rev 22368)
@@ -0,0 +1,84 @@
+<?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 template="/templates/template.xhtml">
+ <ui:param name="componentId" value="richDataTable" />
+
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
+ <style type="text/css">
+ .rf-edt {
+ width: 151px !important;
+ height:
+ }
+ .rf-edt-c-columnInput {
+ width: 150px !important;
+ text-align: center;
+ }
+ .rf-edt-c {
+ height: 2em !important;
+ }
+ </style>
+ </ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ <h:panelGrid columns="2">
+ keepSaved
+ <h:selectOneRadio id="keepSavedInput" value="#{richExtendedDataTableBean.attributes['keepSaved'].value}" onchange="submit()">
+ <f:selectItem itemValue="" itemLabel="null"/>
+ <f:selectItem itemValue="true" itemLabel="true"/>
+ <f:selectItem itemValue="false" itemLabel="false"/>
+ </h:selectOneRadio>
+ </h:panelGrid>
+ </ui:define>
+
+ <ui:define name="component">
+
+ <rich:extendedDataTable id="richEDT" keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}"
+ value="#{templateBean.dataTableModel}" >
+
+ <rich:column id="columnInput">
+ <h:inputText />
+ </rich:column>
+
+ </rich:extendedDataTable>
+
+ <br/>
+ <h:commandButton id="submitButton" value="Submit"/>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter"/>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/list.xhtml 2011-04-05 14:15:28 UTC (rev 22367)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/list.xhtml 2011-04-05 14:16:35 UTC (rev 22368)
@@ -68,6 +68,10 @@
<metamer:testPageLink id="selection" outcome="selection" value="Selection">
Page that contains sample of <b>rich:extendedDataTable</b> selection model
</metamer:testPageLink>
+
+ <metamer:testPageLink id="keepSaved" outcome="keepSaved" value="Keep Saved">
+ Page for testing attribute keepSaved of <b>rich:extendedDataTable</b>.
+ </metamer:testPageLink>
</ui:define>
</ui:composition>
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/keepSaved.xhtml 2011-04-05 14:16:35 UTC (rev 22368)
@@ -0,0 +1,70 @@
+<?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 template="/templates/template.xhtml">
+ <ui:param name="componentId" value="richDataTable" />
+
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
+ <h:outputStylesheet library="css" name="richList.css" />
+ </ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ <h:panelGrid columns="2">
+ keepSaved
+ <h:selectOneRadio id="keepSavedInput" value="#{richListBean.attributes['keepSaved'].value}" onchange="submit()">
+ <f:selectItem itemValue="" itemLabel="null"/>
+ <f:selectItem itemValue="true" itemLabel="true"/>
+ <f:selectItem itemValue="false" itemLabel="false"/>
+ </h:selectOneRadio>
+ </h:panelGrid>
+ </ui:define>
+
+ <ui:define name="component">
+
+ <rich:list id="richList" keepSaved="#{richListBean.attributes['keepSaved'].value}"
+ value="#{templateBean.dataTableModel}" type="unordered">
+
+ <h:inputText />
+
+ </rich:list>
+
+ <br/>
+ <h:commandButton id="submitButton" value="Submit"/>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter"/>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml 2011-04-05 14:15:28 UTC (rev 22367)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml 2011-04-05 14:16:35 UTC (rev 22368)
@@ -39,6 +39,10 @@
Simple page that contains <b>rich:list</b> (with model containing capitals) with bound dataScroller
</metamer:testPageLink>
+ <metamer:testPageLink id="keepSaved" outcome="keepSaved" value="Keep Saved">
+ Page for testing attribute keepSaved of <b>rich:list</b>.
+ </metamer:testPageLink>
+
</ui:define>
</ui:composition>
13 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r22367 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richProgressBar.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-04-05 10:15:28 -0400 (Tue, 05 Apr 2011)
New Revision: 22367
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richProgressBar/TestProgressBarAjax.java
Log:
progress bar test updated
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richProgressBar/TestProgressBarAjax.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richProgressBar/TestProgressBarAjax.java 2011-04-05 07:32:40 UTC (rev 22366)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richProgressBar/TestProgressBarAjax.java 2011-04-05 14:15:28 UTC (rev 22367)
@@ -104,7 +104,8 @@
assertTrue(selenium.isVisible(progress), "Progress bar should not show progress.");
assertFalse(selenium.isElementPresent(complete), "Progress bar should not show progress.");
- assertEquals(selenium.getText(label), "1 %", "Progress bar's label after start");
+ String labelValue = selenium.getText(label);
+ assertTrue("1 %".equals(labelValue) || "2 %".equals(labelValue), "Progress bar's label after start should be \"1 %\" or \"2 %\".");
}
@Test
13 years, 1 month
- 1
- 0