November 2007 - richfaces-svn-commits

JBoss Rich Faces SVN: r4289 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2007-11-27 11:25:02 -0500 (Tue, 27 Nov 2007) New Revision: 4289 Modified: trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml Log: Fix Details of Usage or 'selection' attribute of scrollableDataTable. Add screenshot for example. Modified: trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2007-11-27 15:57:04 UTC (rev 4288) +++ trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2007-11-27 16:25:02 UTC (rev 4289) @@ -67,50 +67,42 @@ ... ]]></programlisting> </section> - - <section> + + <section> <title>Details of Usage</title> - <para> - The component represents on a page as a scrollable table with some fixed (non-scrollable) rows (header, footer) and columns. - Columns of the table are optionally resizable. Resizing is available using "drag and drop" of the column vertical borders. - There is possibility to expand or collapse the columns through JS API on the client side. - User can define the number of the fixed columns from the left side using attribute <emphasis><property>"frozenColCount"</property></emphasis> that will not be scrolled - via horizontal scroll. - </para> - <para> - There is possibility to increase component performance using attribute <emphasis><property>"hideWhenScrolling"</property></emphasis>. - If attribute value is 'true' data will be hidden during scrolling. - </para> - - <para> - It's possible to select the whole row with onclick on the row or some set of rows. Selection is optional and availability of such feature - is defined on the component. - There are two ways to select a few rows: - <itemizedlist> - <listitem>Just clicking the columns one by one.</listitem> - <listitem>Clicking some row with the SHIFT button hold. - In this case all the rows starting from last selected up to clicked should be selected.</listitem> - </itemizedlist> - </para> - - <para> - The columns provides the possibility of expanding/collapsing on the client side through the next JS API: - - <itemizedlist> - <listitem>doCollapse(columnId) - Performs the collapse action for the column with the corresponding id</listitem> - </itemizedlist> + <para> The component represents on a page as a scrollable table with some fixed (non-scrollable) + rows (header, footer) and columns. Columns of the table are optionally resizable. Resizing is + available using "drag and drop" of the column vertical borders. There is possibility to expand + or collapse the columns through JS API on the client side. User can define the number of the + fixed columns from the left side using attribute <emphasis> + <property>"frozenColCount"</property> + </emphasis> that will not be scrolled via horizontal scroll. </para> + <para> There is possibility to increase component performance using attribute <emphasis> + <property>"hideWhenScrolling"</property> + </emphasis>. If attribute value is 'true' data will be hidden during scrolling. </para> - It's possible to sort the table content after clicks on the header. The feature is optional. - Every column should be pointed to the comparator method that will be used for sorting the table. - - In case the <property><rich:scrollableDataTable></property> is already sorted by some - column and the header of this column has been clicked again - the sorting will be - reversed. - </para> + <para> It's possible to select the whole row with onclick on the row or some set of rows. + Selection is optional and availability of such feature is defined on the component. There are + two ways to select a few rows: <itemizedlist> + <listitem>Just clicking the columns one by one.</listitem> + <listitem>Clicking some row with the SHIFT button hold. In this case all the rows starting + from last selected up to clicked should be selected.</listitem> + </itemizedlist> + </para> -<para> + <para> The columns provides the possibility of expanding/collapsing on the client side through + the next JS API: <itemizedlist> + <listitem>doCollapse(columnId) - Performs the collapse action for the column with the + corresponding id</listitem> + </itemizedlist> It's possible to sort the table content after clicks on the header. The + feature is optional. Every column should be pointed to the comparator method that will be used + for sorting the table. In case the + <property><rich:scrollableDataTable></property> is already sorted by some column + and the header of this column has been clicked again - the sorting will be reversed. </para> + + <para> <emphasis role="bold">The typical variant of using:</emphasis> -</para> + </para> <programlisting role="XML"><![CDATA[... <rich:scrollableDataTable value="#{modelBuilder.model}" var="issues" frozenColCount="1" @@ -118,7 +110,6 @@ rows="40" width="300px" height="396px"> - <rich:column width="100px"> <f:facet name="header" > <h:outputText value="State"/> @@ -132,18 +123,28 @@ </rich:scrollableDataTable> ... ]]></programlisting> - <para>In order to get the row data when using <property>one and multi-selection rows mode</property> the access to the selected rows is required.</para> - <para>In this case you can use the <emphasis><property>"selection"</property></emphasis> attribute. - This attribute is a reference to object to the instace of <code>org.richfaces.model.selection.Selection</code> interface, containing current selection.</para> - It's only necessary to work up a selection in a particular way and to get data. -Simple code is placed below. - <para><emphasis role="bold">Example:</emphasis></para> - <programlisting role="XML"><![CDATA[... -<rich:scrollableDataTable frozenColCount="1" height="400px" - width="700px" id="carList" rows="40" columnClasses="col" + + <para>The <emphasis> + <property>"selection"</property> + </emphasis> attribute allows to get the row data when using <property>one and multi-selection + rows mode</property>.</para> + <para>This attribute is a reference to object to the instace of + <property>org.richfaces.model.selection.Selection</property> interface, containing current + collection of objects selected by user.</para> + <para>In the following example when user submits the form current collection of objects selected + by user is placed in the object's property. Then on complete action the <emphasis role="bold"> + <property><rich:modalPanel></property> + </emphasis> with selected data will be shown.</para> + <para> + <emphasis role="bold">Example:</emphasis> + </para> + <programlisting role="XML"><![CDATA[... + <h:form> + <rich:spacer height="30" /> + <rich:scrollableDataTable rowKeyVar="rkv" frozenColCount="1" height="200px" + width="300px" id="carList" rows="40" columnClasses="col" value="#{dataTableScrollerBean.allCars}" var="category" sortMode="single" selection="#{dataTableScrollerBean.selection}"> - <rich:column id="make"> <f:facet name="header"><h:outputText styleClass="headerText" value="Make" /></f:facet> <h:outputText value="#{category.make}" /> @@ -156,82 +157,86 @@ <f:facet name="header"><h:outputText styleClass="headerText" value="Price" /></f:facet> <h:outputText value="#{category.price}" /> </rich:column> + </rich:scrollableDataTable> + <rich:spacer height="20px"/> + <a4j:commandButton value="Show Current Selection" reRender="table" + action="#{dataTableScrollerBean.takeSelection}" + oncomplete="javascript:Richfaces.showModalPanel('panel');"/> + </h:form> + <rich:modalPanel id="panel" autosized="true"> + <f:facet name="header"> + <h:outputText value="Selected Rows"/> + </f:facet> + <f:facet name="controls"> + <span style="cursor:pointer" onclick="javascript:Richfaces.hideModalPanel('panel')">X</span> + </f:facet> + <rich:dataTable value="#{dataTableScrollerBean.selectedCars}" var="sel" id="table"> + <rich:column> + <f:facet name="header"><h:outputText value="Make" /></f:facet> + <h:outputText value="#{sel.make}" /> + </rich:column> + <rich:column id="model"> + <f:facet name="header"><h:outputText value="Model" /></f:facet> + <h:outputText value="#{sel.model}" /> + </rich:column> + <rich:column id="price"> + <f:facet name="header"><h:outputText value="Price" /></f:facet> + <h:outputText value="#{sel.price}" /> + </rich:column> + </rich:dataTable> + </rich:modalPanel> +...]]></programlisting> + <para>This is a result:</para> + <figure> + <title>The <emphasis>"selection"</emphasis> attribute usage</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/scrollableDataTable.png"/> + </imageobject> + </mediaobject> + </figure> -</rich:scrollableDataTable> -... -]]></programlisting> - <para>In order to build this application, you can create a managed bean like this one. - Function takeSelection() fills the array 'selectedCars': with the data, got from the <property>selection</property>.</para> - <para><emphasis role="bold">Example:</emphasis></para> - <programlisting role="XML"><![CDATA[... -public class DataTableScrollerBean { - private SimpleSelection selection = new SimpleSelection(); - private ArrayList<DemoInventoryItem> selectedCars = new ArrayList<DemoInventoryItem>(); - - ... - - public SimpleSelection getSelection() { - return selection; - } - - public String takeSelection() { - getSelectedCars().clear(); - Iterator<SimpleRowKey> iterator = getSelection().getKeys(); - while (iterator.hasNext()){ - SimpleRowKey key = iterator.next(); - getSelectedCars().add(getAllCars().get(key.intValue())); - } - return null; - } + <para> The <emphasis role="bold"> + <property><rich:scrollableDataTable></property> + </emphasis> component has the following extra attributes for event processing on the client: <itemizedlist> + <listitem>onselectionchange</listitem> + <listitem>oncomplete</listitem> + <listitem>onRowClick</listitem> + <listitem>onRowDblClick</listitem> + <listitem>onRowMouseUp</listitem> + <listitem>onRowMouseDown</listitem> + </itemizedlist> + </para> + </section> - public ArrayList<DemoInventoryItem> getSelectedCars() { - return selectedCars; - } -... -]]></programlisting> - <para> -Finally, the component has the following extra attributes for event processing on the client: - <itemizedlist> - <listitem>onselectionchange</listitem> - <listitem>oncomplete</listitem> - <listitem>onRowClick</listitem> - <listitem>onRowDblClick</listitem> - <listitem>onRowMouseUp</listitem> - <listitem>onRowMouseDown</listitem> - </itemizedlist> - -</para> - </section> - <section> <title>Look-and-Feel Customization</title> - + <para>For skinnability implementation, the components use a <emphasis> - <property>style class redefinition method.</property> - </emphasis> - Default style classes are mapped on <emphasis> + <property>style class redefinition method.</property> + </emphasis> Default style classes are mapped on <emphasis> <property>skin parameters.</property> </emphasis></para> - + <para>There are two ways to redefine the appearance of all <emphasis role="bold"> - <property><rich:scrollableDataTable></property> - </emphasis> components at once:</para> - + <property><rich:scrollableDataTable></property> + </emphasis> components at once:</para> + <itemizedlist> <listitem> <para>Redefine the corresponding skin parameters</para> </listitem> - + <listitem> <para>Add to your style sheets <emphasis> - <property>style classes</property> - </emphasis> used by a <emphasis role="bold"> - <property><rich:scrollableDataTable></property> - </emphasis> component</para> + <property>style classes</property> + </emphasis> used by a <emphasis role="bold"> + <property><rich:scrollableDataTable></property> + </emphasis> component</para> </listitem> </itemizedlist> </section> - + <section> <title>Skin Parameters Redefinition</title> <table> @@ -259,7 +264,7 @@ </tbody> </tgroup> </table> - + <table> <title>Skin parameters for header rows and cells</title> <tgroup cols="2"> @@ -274,7 +279,7 @@ <entry>headerBackgroundColor</entry> <entry>background-color</entry> </row> - + <row> <entry>headerTextColor</entry> <entry>color</entry> @@ -303,10 +308,10 @@ <entry>tableBorderColor</entry> <entry>border-right-color</entry> </row> - </tbody> + </tbody> </tgroup> - </table> - + </table> + <table> <title>Skin parameters for footer rows and cells</title> <tgroup cols="2"> @@ -315,7 +320,7 @@ <entry>Skin parameters</entry> <entry>CSS properties</entry> </row> - </thead> + </thead> <tbody> <row> <entry>tableSubfooterBackgroundColor</entry> @@ -329,7 +334,7 @@ <entry>generalSizeFont</entry> <entry>font-size</entry> </row> - + <row> <entry>tableBorderColor</entry> <entry>border-right-color</entry> @@ -344,8 +349,8 @@ </row> </tbody> </tgroup> - </table> - + </table> + <table> <title>Skin parameters for column cells </title> <tgroup cols="2"> @@ -367,7 +372,7 @@ </tbody> </tgroup> </table> - + <table> <title>Skin parameters for active rows</title> <tgroup cols="2"> @@ -385,7 +390,7 @@ </tbody> </tgroup> </table> - + <table> <title>Skin parameters for selected rows</title> <tgroup cols="2"> @@ -400,164 +405,163 @@ <entry>additionalBackgroundColor</entry> <entry>background-color</entry> </row> - </tbody> + </tbody> </tgroup> </table> - + </section> - + <section> <title>Definition of Custom Style Classes</title> - + <para>On the screenshot there are classes names that define styles for component elements.</para> - + <figure> <title>Classes names</title> - + <mediaobject> <imageobject> <imagedata fileref="images/sdt.png"/> </imageobject> </mediaobject> </figure> - + <table> <title>Classes names that define a component appearance</title> - + <tgroup cols="2"> <thead> <row> <entry>Class name</entry> - + <entry>Description</entry> </row> </thead> - + <tbody> <row> <entry>rich-sdt</entry> - + <entry>Defines styles for a component appearance</entry> </row> - + </tbody> </tgroup> </table> - + <table> <title>Classes names that define footer and header elements</title> - + <tgroup cols="2"> <thead> <row> <entry>Class name</entry> - + <entry>Description</entry> </row> </thead> - + <tbody> - + <row> <entry>rich-sdt-header-cell</entry> - + <entry>Defines styles for header cells</entry> </row> - + <row> <entry>rich-sdt-header-raw</entry> - + <entry>Defines styles for a header raw</entry> </row> - + <row> <entry>rich-sdt-column-cell</entry> - + <entry>Defines styles for column cells</entry> </row> <row> <entry>rich-sdt-footer-cell</entry> - + <entry>Defines styles for footer cells</entry> </row> - + <row> <entry>rich-sdt-footer-raw</entry> - + <entry>Defines styles for a footer raw</entry> </row> <row> <entry>rich-sdt-hsep</entry> - + <entry>Defines styles for header separators</entry> </row> - + </tbody> </tgroup> </table> - + <table> <title>Classes names that define different states</title> - + <tgroup cols="2"> <thead> <row> <entry>Class name</entry> - + <entry>Description</entry> </row> </thead> - + <tbody> - + <row> <entry>rich-sdt-row-active</entry> - + <entry>Defines styles for an active row</entry> </row> - + <row> <entry>rich-sdt-row-selected</entry> - + <entry>Defines styles for a selected row</entry> </row> - + <row> <entry>rich-sdt-column-sort-up</entry> - + <entry>Defines styles for ascending sorted column</entry> </row> - + <row> <entry>rich-sdt-column-sort-down</entry> - + <entry>Defines styles for descending sorted column</entry> </row> </tbody> </tgroup> </table> - + <para>In order to redefine styles for all <emphasis role="bold"> - <property><rich:scrollableDataTable></property> - </emphasis> components on a page using CSS, it's enough to create classes with the + <property><rich:scrollableDataTable></property> + </emphasis> components on a page using CSS, it's enough to create classes with the same names and define necessary properties in them.</para> - + <para>To change styles of particular <emphasis role="bold"> - <property><rich:scrollableDataTable></property> - </emphasis> components, define your own style classes in the corresponding <emphasis - role="bold"> - <property><rich:scrollableDataTable></property> - </emphasis>attributes.</para> + <property><rich:scrollableDataTable></property> + </emphasis> components, define your own style classes in the corresponding <emphasis + role="bold"> + <property><rich:scrollableDataTable></property> + </emphasis>attributes.</para> </section> - + <section> <title>Relevant Resources Links</title> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/scrollableDataTable.j...">Here</ulink> - you can see the example of <emphasis role="bold"><property><rich:scrollableDataTable></property>s</emphasis> usage. </para> - <para>How to use <property>one and multi-selection rows mode</property> see on the - <ulink url="http://www.jboss.com/index.html?module=bb&op=viewtopic&t=122543"> RichFaces Users Forum</ulink> - </para> - - </section> + <ulink + url="http://livedemo.exadel.com/richfaces-demo/richfaces/scrollableDataTable.j..." + >Here</ulink> you can see the example of <emphasis role="bold"> + <property><rich:scrollableDataTable></property> + </emphasis> usage. </para> + </section> </section>

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4288 - branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit.

by richfaces-svn-commits＠lists.jboss.org

Author: akushunin Date: 2007-11-27 10:57:04 -0500 (Tue, 27 Nov 2007) New Revision: 4288 Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java Log: RF-997 Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-11-27 15:52:55 UTC (rev 4287) +++ branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-11-27 15:57:04 UTC (rev 4288) @@ -52,6 +52,8 @@ import org.richfaces.component.UICalendar; import org.richfaces.component.util.ComponentUtil; import org.ajax4jsf.event.AjaxSingleEvent; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * @author Nick Belaevski - mailto:nbelaevski@exadel.com created 08.06.2007 @@ -70,6 +72,8 @@ public static final String DATE_SCROLL = "DateScroll"; protected static final String MARKUP_SUFFIX = "Markup"; + + private final static Log log = LogFactory.getLog(CalendarRendererBase.class); /* * (non-Javadoc) @@ -233,7 +237,17 @@ UICalendar input = (UICalendar) component; // XXX nick - nick - can contain either Date or String instance - Date value = input.getAsDate(input.getSubmittedValue()); + Date value = null; + //Fix for myfaces-1.1.x (RF-997.) + try { + value = input.getAsDate(input.getSubmittedValue()); + } catch (Exception e) { + if (log.isDebugEnabled()) { + log.debug(" InputValue: " + + e.toString(), e); + } + value = null; + } Date curVal = input.getAsDate(input.getValue()); DateTimeConverter converter = new DateTimeConverter(); @@ -346,15 +360,21 @@ public String getSelectedDate(FacesContext context, UICalendar calendar) throws IOException { - Date submittedValue = calendar.getAsDate(calendar.getSubmittedValue()); - Date date; - - if (submittedValue != null) { - date = submittedValue; - } else { + + //Fix for myFaces 1.1.x RF-997 + Date date; + if(calendar.isValid()){ + Date submittedValue = calendar.getAsDate(calendar.getSubmittedValue()); + if (submittedValue != null) { + date = submittedValue; + } else { + date = calendar.getAsDate(calendar.getValue()); + } + }else{ date = calendar.getAsDate(calendar.getValue()); - } - + //Date submittedValue = null; + } + if (date != null) { return ScriptUtils.toScript(formatDate(date)); }

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4287 - trunk/ui/calendar/src/main/java/org/richfaces/renderkit.

by richfaces-svn-commits＠lists.jboss.org

Author: akushunin Date: 2007-11-27 10:52:55 -0500 (Tue, 27 Nov 2007) New Revision: 4287 Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java Log: RF-997 Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-11-27 15:01:50 UTC (rev 4286) +++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-11-27 15:52:55 UTC (rev 4287) @@ -21,7 +21,8 @@ package org.richfaces.renderkit; -import java.awt.Component; + + import java.io.IOException; import java.text.DateFormatSymbols; import java.util.Calendar; @@ -30,29 +31,26 @@ import java.util.Iterator; import java.util.Locale; import java.util.Map; -import java.util.TimeZone; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.DateTimeConverter; import javax.faces.event.PhaseId; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.event.AjaxSingleEvent; import org.ajax4jsf.javascript.JSFunction; import org.ajax4jsf.javascript.JSFunctionDefinition; import org.ajax4jsf.javascript.JSReference; import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.renderkit.AjaxRendererUtils; -import org.ajax4jsf.util.SelectUtils; -import org.richfaces.event.CurrentDateChangeEvent; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.richfaces.component.UICalendar; import org.richfaces.component.util.ComponentUtil; -import org.ajax4jsf.event.AjaxSingleEvent; +import org.richfaces.event.CurrentDateChangeEvent; /** * @author Nick Belaevski - mailto:nbelaevski@exadel.com created 08.06.2007 @@ -71,6 +69,8 @@ public static final String DATE_SCROLL = "DateScroll"; protected static final String MARKUP_SUFFIX = "Markup"; + + private final static Log log = LogFactory.getLog(CalendarRendererBase.class); /* * (non-Javadoc) @@ -329,8 +329,17 @@ public String getInputValue(FacesContext context, UIComponent component) { UICalendar input = (UICalendar) component; // XXX nick - nick - can contain either Date or String instance - - Date value = input.getAsDate(input.getSubmittedValue()); + //Fix for myFaces 1.1.x RF-997 + Date value = null; + try { + value = input.getAsDate(input.getSubmittedValue()); + } catch (Exception e) { + if (log.isDebugEnabled()) { + log.debug(" InputValue: " + + e.toString(), e); + } + value = null; + } Date curVal = input.getAsDate(input.getValue()); DateTimeConverter converter = new DateTimeConverter(); @@ -444,14 +453,20 @@ public String getSelectedDate(FacesContext context, UICalendar calendar) throws IOException { - Date submittedValue = calendar.getAsDate(calendar.getSubmittedValue()); - Date date; - - if (submittedValue != null) { - date = submittedValue; - } else { + + //Fix for myFaces 1.1.x RF-997 + Date date; + if(calendar.isValid()){ + Date submittedValue = calendar.getAsDate(calendar.getSubmittedValue()); + if (submittedValue != null) { + date = submittedValue; + } else { + date = calendar.getAsDate(calendar.getValue()); + } + }else{ date = calendar.getAsDate(calendar.getValue()); - } + //Date submittedValue = null; + } if (date != null) { return ScriptUtils.toScript(formatSelectedDate(date));

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4286 - branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF.

by richfaces-svn-commits＠lists.jboss.org

Author: viktor_volkov Date: 2007-11-27 10:01:50 -0500 (Tue, 27 Nov 2007) New Revision: 4286 Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml Log: set default locale to en Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-11-27 14:41:47 UTC (rev 4285) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-11-27 15:01:50 UTC (rev 4286) @@ -2,6 +2,11 @@ <!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> <faces-config> + <application> + <locale-config> + <default-locale>en</default-locale> + </locale-config> + </application> <navigation-rule> <from-view-id>/pages/main.xhtml</from-view-id> <navigation-case>

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4285 - in branches/3.1.x/ui/orderingList/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: vmolotkov Date: 2007-11-27 09:41:47 -0500 (Tue, 27 Nov 2007) New Revision: 4285 Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx Log: fixed bug for IE Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-11-27 13:17:54 UTC (rev 4284) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-11-27 14:41:47 UTC (rev 4285) @@ -211,7 +211,15 @@ writer.startElement(HTML.DIV_ELEM, orderingList); writer.writeAttribute(HTML.id_ATTRIBUTE, clientId + helper.getIdSuffix(), null); //FIXME: - writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button_border " + currentStyle, null); //HTML.class_ATTRIBUTE, "ol_button_border " + (enabled ? "ol_control_shown" : "ol_control_hidden") + currentStyle + writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button_border " + currentStyle, null); + //HTML.class_ATTRIBUTE, "ol_button_border " + (enabled ? "ol_control_shown" : "ol_control_hidden") + currentStyle + String style = null; + if (enabled) { + style = "display:block;"; + } else { + style = "display:none;"; + } + writer.writeAttribute(HTML.style_ATTRIBUTE, style, null); if (!useFacet) { writer.startElement(HTML.DIV_ELEM, orderingList); Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js =================================================================== --- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js 2007-11-27 13:17:54 UTC (rev 4284) +++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js 2007-11-27 14:41:47 UTC (rev 4285) @@ -1,6 +1,6 @@ LayoutManager = function(headerId, contentId) { - this.headerTable = document.getElementById(headerId); - this.contentTable = document.getElementById(contentId); + this.headerTable = $(headerId); + this.contentTable = $(contentId); this.headerDiv = this.headerTable.parentNode; this.contentDiv = this.contentTable.parentNode; @@ -27,19 +27,16 @@ return ; var headerCells = this.headerTable.tHead.rows[0].cells; var width; - var totalWidth = 0; for (var i = 0; i < contentCells.length; i++) { var curCell = contentCells[i]; var headCell = headerCells[i]; width = LayoutManager.calculateWidth(curCell, headCell).colWidth; - if (i == contentCells.length - 1) { width = width + (this.contentDiv.offsetWidth - this.contentDiv.clientWidth); } headCell.firstChild.style.width = width + "px"; headCell.style.width = width + "px"; - //totalWidth += width; } //this.headerTable.style.width = this.contentTable.offsetWidth + (this.contentDiv.offsetWidth - this.contentDiv.clientWidth); } @@ -69,33 +66,35 @@ var srcElemPaddingWidth = LayoutManager.getPaddingWidth(srcElem, "lr"); var srcElemMarginWidth = LayoutManager.getMarginWidth(srcElem, "lr"); - var tgtElemBorderWidth = LayoutManager.getBorderWidth(srcElem, "lr"); - var tgtElemPaddingWidth = LayoutManager.getPaddingWidth(srcElem, "lr"); - var tgtElemMarginWidth = LayoutManager.getMarginWidth(srcElem, "lr"); + var tgtElemBorderWidth = LayoutManager.getBorderWidth(tgtElem, "lr"); + var tgtElemPaddingWidth = LayoutManager.getPaddingWidth(tgtElem, "lr"); + var tgtElemMarginWidth = LayoutManager.getMarginWidth(tgtElem, "lr"); var srcWidth = srcElem.offsetWidth - srcElemBorderWidth - srcElemPaddingWidth - srcElemMarginWidth; return {srcWidth : srcWidth, colWidth : (srcWidth + (srcElemBorderWidth - tgtElemBorderWidth) + (srcElemPaddingWidth - tgtElemPaddingWidth) - + (srcElemMarginWidth - tgtElemMarginWidth))}; + + (srcElemMarginWidth - tgtElemMarginWidth))}; } LayoutManager.getBorderWidth = function(el, side) { - return this.getStyles(el, side, LayoutManager.borders); + return LayoutManager.getStyles(el, side, LayoutManager.borders); } LayoutManager.getPaddingWidth = function(el, side) { - return this.getStyles(el, side, LayoutManager.paddings); + return LayoutManager.getStyles(el, side, LayoutManager.paddings); } LayoutManager.getMarginWidth = function(el, side) { - return this.getStyles(el, side, LayoutManager.margins); + return LayoutManager.getStyles(el, side, LayoutManager.margins); } LayoutManager.getStyles = function(el, sides, styles) { var val = 0; for(var i = 0, len = sides.length; i < len; i++){ - var w = parseInt(el.getStyle(styles[sides.charAt(i)]), 10); - if(!isNaN(w)) val += w; + if (el.getStyle) { + var w = parseInt(el.getStyle(styles[sides.charAt(i)]), 10); + if(!isNaN(w)) val += w; + } } return val; } Modified: branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx =================================================================== --- branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-11-27 13:17:54 UTC (rev 4284) +++ branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-11-27 14:41:47 UTC (rev 4285) @@ -81,10 +81,14 @@ <script type="text/javascript"> var clientId = '#{cId}'; Event.onReady(function() { + try { var cotrolsIdPrefix = [['up', 'disup'], ['down', 'disdown'], ['last', 'dislast'], ['first','disfirst']]; var shuttle = new Richfaces.OrderingList('#{cId}', '#{cId}internal_tab', '#{cId}internal_header_tab', '#{cId}focusKeeper', '#{cId}valueKeeper', cotrolsIdPrefix, '#{cId}sortLabel', function() {#{component.attributes['onorderchanged']}}); var layoutManager = new LayoutManager('#{clientId}internal_header_tab', '#{clientId}internal_tab'); layoutManager.widthSynchronization(); + } catch (error) { + alert(error); + } }); //setTimeout(init, 0);

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4284 - in branches/3.1.x/ui/orderingList/src/main: java/org/richfaces/renderkit and 3 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: vmolotkov Date: 2007-11-27 08:17:54 -0500 (Tue, 27 Nov 2007) New Revision: 4284 Modified: branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx Log: bug: RF-1379 Modified: branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml =================================================================== --- branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml 2007-11-27 13:12:27 UTC (rev 4283) +++ branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml 2007-11-27 13:17:54 UTC (rev 4284) @@ -68,7 +68,6 @@ <description> listWidth </description> - <defaultvalue><![CDATA[200]]></defaultvalue> </property> <property> <name>listHeight</name> @@ -76,7 +75,6 @@ <description> listHeight </description> - <defaultvalue><![CDATA[150]]></defaultvalue> </property> <property> <name>rowClasses</name> Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-27 13:12:27 UTC (rev 4283) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-27 13:17:54 UTC (rev 4284) @@ -162,9 +162,11 @@ UIColumn column = (UIColumn) component; writer.startElement(HTML.td_ELEM, table); - + + if (!iterator.hasNext()) { + cellClassName.insert(7, " ol_endcol "); + } writer.writeAttribute("class", cellClassName.toString(), null); - renderChildren(context, column); writer.endElement(HTML.td_ELEM); Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss =================================================================== --- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-27 13:12:27 UTC (rev 4283) +++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-27 13:17:54 UTC (rev 4284) @@ -81,12 +81,11 @@ .ol_outputlist{ margin : 0px 8px 8px 8px;} .ol_list_content { - overflow-y : scroll; - overflow-x: auto; - /*width: 300px; - height: 232px;*/ - width: 200px; - height: 150px; + /*overflow-y : scroll; + overflow-x: auto;*/ + overflow: auto; + /*width: 200px; + height: 150px;*/ } .ol_list_header { @@ -113,8 +112,10 @@ .ol_internal_tab .ol_endcol{border-right : 0px;} -.ol_internal_tab td{font-family : Arial; font-size :11px; padding : 2px;} +.ol_internal_tab td{font-family : Arial; font-size :11px; padding : 2px;border-right : 1px solid #FFFFFF; border-left : 1px solid #FFFFFF;} +.ol_internal_tab .ol_endcol{border-right : 0px;} + .ol_internal_tab tr.ol_select{background : #EAF0F8} .ol_internal_tab tr.ol_active { Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js =================================================================== --- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js 2007-11-27 13:12:27 UTC (rev 4283) +++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js 2007-11-27 13:17:54 UTC (rev 4284) @@ -27,19 +27,21 @@ return ; var headerCells = this.headerTable.tHead.rows[0].cells; var width; + var totalWidth = 0; for (var i = 0; i < contentCells.length; i++) { - width = contentCells[i].offsetWidth - LayoutManager.STYLE_CONTENTTD_BORDER - LayoutManager.STYLE_CONTENTTD_PADDING; + var curCell = contentCells[i]; + var headCell = headerCells[i]; + + width = LayoutManager.calculateWidth(curCell, headCell).colWidth; + if (i == contentCells.length - 1) { - width = width + LayoutManager.SCROLL_WIDTH + "px"; - headerCells[i].firstChild.style.width = width; - headerCells[i].style.width = width; - } else { - width = width + "px"; - headerCells[i].firstChild.style.width = width; - headerCells[i].style.width = width; + width = width + (this.contentDiv.offsetWidth - this.contentDiv.clientWidth); } + headCell.firstChild.style.width = width + "px"; + headCell.style.width = width + "px"; + //totalWidth += width; } - this.headerTable.style.width = this.contentTable.offsetWidth + LayoutManager.SCROLL_WIDTH; + //this.headerTable.style.width = this.contentTable.offsetWidth + (this.contentDiv.offsetWidth - this.contentDiv.clientWidth); } } @@ -60,4 +62,44 @@ y += parent.offsetTop; } return {left: x, top: y}; -} \ No newline at end of file +} + +LayoutManager.calculateWidth = function(srcElem, tgtElem) { + var srcElemBorderWidth = LayoutManager.getBorderWidth(srcElem, "lr"); + var srcElemPaddingWidth = LayoutManager.getPaddingWidth(srcElem, "lr"); + var srcElemMarginWidth = LayoutManager.getMarginWidth(srcElem, "lr"); + + var tgtElemBorderWidth = LayoutManager.getBorderWidth(srcElem, "lr"); + var tgtElemPaddingWidth = LayoutManager.getPaddingWidth(srcElem, "lr"); + var tgtElemMarginWidth = LayoutManager.getMarginWidth(srcElem, "lr"); + + var srcWidth = srcElem.offsetWidth - srcElemBorderWidth - srcElemPaddingWidth - srcElemMarginWidth; + return {srcWidth : srcWidth, colWidth : (srcWidth + (srcElemBorderWidth - tgtElemBorderWidth) + + (srcElemPaddingWidth - tgtElemPaddingWidth) + + (srcElemMarginWidth - tgtElemMarginWidth))}; +} + +LayoutManager.getBorderWidth = function(el, side) { + return this.getStyles(el, side, LayoutManager.borders); +} + +LayoutManager.getPaddingWidth = function(el, side) { + return this.getStyles(el, side, LayoutManager.paddings); +} + +LayoutManager.getMarginWidth = function(el, side) { + return this.getStyles(el, side, LayoutManager.margins); +} + +LayoutManager.getStyles = function(el, sides, styles) { + var val = 0; + for(var i = 0, len = sides.length; i < len; i++){ + var w = parseInt(el.getStyle(styles[sides.charAt(i)]), 10); + if(!isNaN(w)) val += w; + } + return val; +} + +LayoutManager.borders = {l: 'border-left-width', r: 'border-right-width', t: 'border-top-width', b: 'border-bottom-width'}, +LayoutManager.paddings = {l: 'padding-left', r: 'padding-right', t: 'padding-top', b: 'padding-bottom'}, +LayoutManager.margins = {l: 'margin-left', r: 'margin-right', t: 'margin-top', b: 'margin-bottom'} Modified: branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx =================================================================== --- branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-11-27 13:12:27 UTC (rev 4283) +++ branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-11-27 13:17:54 UTC (rev 4284) @@ -38,12 +38,25 @@ <tr> <td> <div id="#{clientId}headerBox" class="ol_list ol_outputlist"> - <div class="ol_list_header" style="width: #{component.attributes['listWidth']}px;"> + <jsp:scriptlet><![CDATA[ + String contentContainerStyle = ""; + if (component.getAttributes().get("listWidth") != null) { + contentContainerStyle = contentContainerStyle.concat("width:").concat(component.getAttributes().get("listWidth").toString()).concat("px;"); + variables.setVariable("contentContainerStyle", contentContainerStyle); + } + ]]></jsp:scriptlet> + <div class="ol_list_header" style="#{contentContainerStyle}"> <table id="#{clientId}internal_header_tab" class="ol_internal_header_tab rich-ordering-list-items" cellpadding="0" cellspacing="0"> <f:call name="encodeHeader"/> </table> </div> - <div id="#{clientId}contentBox" class="ol_list_content" style="width: #{component.attributes['listWidth']}px; height:#{component.attributes['listHeight']}px;"> + <jsp:scriptlet><![CDATA[ + if (component.getAttributes().get("listHeight") != null) { + contentContainerStyle = contentContainerStyle.concat("height:").concat(component.getAttributes().get("listHeight").toString()).concat("px;"); + variables.setVariable("contentContainerStyle", contentContainerStyle); + } + ]]></jsp:scriptlet> + <div id="#{clientId}contentBox" class="ol_list_content" style="#{contentContainerStyle}"> <table id="#{clientId}internal_tab" class="ol_internal_tab" cellpadding="0" cellspacing="0"> <tbody id="#{clientId}tbody"> <vcp:body>

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4283 - in branches/3.1.x/test-applications/facelets/src/main: java/contextMenu and 41 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ayanul Date: 2007-11-27 08:12:27 -0500 (Tue, 27 Nov 2007) New Revision: 4283 Added: branches/3.1.x/test-applications/facelets/src/main/java/contextMenu/ branches/3.1.x/test-applications/facelets/src/main/java/contextMenu/ContextMenu.java branches/3.1.x/test-applications/facelets/src/main/java/dataDefinitionList/ branches/3.1.x/test-applications/facelets/src/main/java/dataDefinitionList/DataDefinitionList.java branches/3.1.x/test-applications/facelets/src/main/java/dataOrderedList/ branches/3.1.x/test-applications/facelets/src/main/java/dataOrderedList/DataOrderedList.java branches/3.1.x/test-applications/facelets/src/main/java/util/data/ branches/3.1.x/test-applications/facelets/src/main/java/util/data/Data.java branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/ branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionList.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/ branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ContextMenu.xml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataDefinitionList.xml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataOrderedList.xml Modified: branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java branches/3.1.x/test-applications/facelets/src/main/java/tree/test.xml branches/3.1.x/test-applications/facelets/src/main/resources/message_en.properties branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTableStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Message/MessageStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2DStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/PanelStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBarStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/SeparatorStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/SpacerStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipStraightforward.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml Log: add descriptions add dataDefinitionList, dataOrderedList update orderingList Added: branches/3.1.x/test-applications/facelets/src/main/java/contextMenu/ContextMenu.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/contextMenu/ContextMenu.java (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/java/contextMenu/ContextMenu.java 2007-11-27 13:12:27 UTC (rev 4283) @@ -0,0 +1,5 @@ +package contextMenu; + +public class ContextMenu { + +} Added: branches/3.1.x/test-applications/facelets/src/main/java/dataDefinitionList/DataDefinitionList.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/dataDefinitionList/DataDefinitionList.java (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/java/dataDefinitionList/DataDefinitionList.java 2007-11-27 13:12:27 UTC (rev 4283) @@ -0,0 +1,85 @@ +package dataDefinitionList; + +import java.util.ArrayList; + +import util.data.Data; + +public class DataDefinitionList +{ + private ArrayList<Data> arr; + private int first; + private int rows; + private boolean rendered; + private String title; + private String dir; + private int mSize; + + public String getDir() { + return dir; + } + + public void setDir(String dir) { + this.dir = dir; + } + + public int getMSize() { + return mSize; + } + + public void setMSize(int size) { + mSize = size; + } + + public void setArr(ArrayList<Data> arr) { + this.arr = arr; + } + + public DataDefinitionList(){ + arr = new ArrayList<Data>(); + dir ="LTR"; + rows = 20; + rows = 0; + first = 0; + rendered = true; + title = "title"; + for(int i = 1; i < Data.cityAfrica.length; i++) + arr.add(new Data(Data.cityAfrica[i])); + } + + public int getFirst() { + return first; + } + + public void setFirst(int first) { + this.first = first; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public int getRows() { + return rows; + } + + public void setRows(int rows) { + this.rows = rows; + } + + public ArrayList<Data> getArr() { + return arr; + } + +} \ No newline at end of file Added: branches/3.1.x/test-applications/facelets/src/main/java/dataOrderedList/DataOrderedList.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/dataOrderedList/DataOrderedList.java (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/java/dataOrderedList/DataOrderedList.java 2007-11-27 13:12:27 UTC (rev 4283) @@ -0,0 +1,95 @@ +package dataOrderedList; + +import java.util.ArrayList; + +import util.data.Data; + +public class DataOrderedList +{ + private ArrayList<Data> arr; + private int first; + private int rows; + private boolean rendered; + private String title; + private String type; + private String dir; + private int mSize; + + public String getDir() { + return dir; + } + + public void setDir(String dir) { + this.dir = dir; + } + + public int getMSize() { + return mSize; + } + + public void setMSize(int size) { + mSize = size; + } + + public void setArr(ArrayList<Data> arr) { + this.arr = arr; + } + + public DataOrderedList(){ + arr = new ArrayList<Data>(); + dir ="LTR"; + rows = 20; + rows = 0; + first = 0; + rendered = true; + title = "title"; + type = "1"; + for(int i = 1; i < Data.cityAfrica.length; i++) + arr.add(new Data(Data.cityAfrica[i])); + } + + public int getFirst() { + return first; + } + + public void setFirst(int first) { + this.first = first; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public int getRows() { + return rows; + } + + public void setRows(int rows) { + this.rows = rows; + } + + public ArrayList<Data> getArr() { + return arr; + } + +} \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java 2007-11-27 13:12:27 UTC (rev 4283) @@ -1,10 +1,11 @@ package orderingList; -import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.Random; +import javax.faces.event.ValueChangeEvent; + import dataScroller.Data; public class OrderingList{ @@ -30,6 +31,10 @@ private boolean showButtonLabels; private boolean facet; + public void clSelect(ValueChangeEvent event) { + System.out.println(event.getNewValue()); + } + public boolean isFacet() { return facet; } @@ -276,11 +281,11 @@ } public void bTest4(){ - setCaptionLabel("Caption Test1"); + setCaptionLabel("Caption Test4"); setControlsHorizontalAlign("0"); setControlsVerticalAlign("0"); setControlsType("button"); - setHeaderLabel("Header Test1"); + setHeaderLabel("Header Test4"); setLenght(10000); setListHeight(500); setListWidth(600); Modified: branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2007-11-27 13:12:27 UTC (rev 4283) @@ -5,9 +5,16 @@ public class RichBean { private String src; private MapComponent map; + private boolean reComponent; + private boolean reProperty; + private boolean reStraightforward; + //private String [] menu = {"Blank", "Calendar", "DataFilterSlider", "DataScroller", "DataTable", "DragAndDrop", "DropDownMenu", "Effect", "Gmap", "InputNumberSlider", "InputNumberSpinner", "Insert", "Message", "ModalPanel", "Paint2D", "Panel", "Panel2", "PanelBar", "PanelMenu", "Separator", "SimpleTogglePanel", "Spacer", "SuggestionBox", "TabPanel", "TogglePanel", "ToolBar", "Tooltip", "Tree", "VirtualEarth", "ScrollableDataTable", "jQuery", "OrderingList"}; public RichBean() { src = "Blank"; + reComponent = true; + reProperty = true; + reStraightforward = true; map = new MapComponent(); // map.add( value, add( pages_path/name_pages, array<boolean>(Property, Straightforward) ); map.add("Blank", add("/pages/Blank/Blank", new boolean [] {true, true})); @@ -42,6 +49,8 @@ map.add("ScrollableDataTable", add("/ScrollableDataTable/ScrollableDataTable", new boolean [] {true, false})); map.add("jQuery", add("/jQuery/jQuery", new boolean [] {false, false})); map.add("OrderingList", add("/OrderingList/OrderingList", new boolean [] {true, true})); + map.add("DataDefinitionList", add("/DataDefinitionList/DataDefinitionList", new boolean [] {true, false})); + map.add("DataOrderedList", add("/DataOrderedList/DataOrderedList", new boolean [] {true, false})); } public String getSrc() { @@ -71,4 +80,28 @@ if(arr[1]) list.add(path + "Straightforward.xhtml"); else list.add("/pages/Blank/BlankStraightforward.xhtml"); return list; } + + public boolean isReComponent() { + return reComponent; + } + + public void setReComponent(boolean reComponent) { + this.reComponent = reComponent; + } + + public boolean isReProperty() { + return reProperty; + } + + public void setReProperty(boolean reProperty) { + this.reProperty = reProperty; + } + + public boolean isReStraightforward() { + return reStraightforward; + } + + public void setReStraightforward(boolean reStraightforward) { + this.reStraightforward = reStraightforward; + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/tree/test.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/tree/test.xml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/java/tree/test.xml 2007-11-27 13:12:27 UTC (rev 4283) @@ -1,16 +1,17 @@ <?xml version="1.0"?> -<web-app version="2.4"> - <description>Tree demo</description> - <display-name>tree-demo</display-name> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + <description>RF Test-Application</description> + <display-name>test-application</display-name> <context-param> + <param-name>org.ajax4jsf.SKIN</param-name> + <param-value>#{skinBean.skin}</param-value> + </context-param> + <context-param> <param-name>javax.faces.DEFAULT_SUFFIX</param-name> <param-value>.xhtml</param-value> </context-param> <context-param> - <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> - <param-value>false</param-value> - </context-param> - <context-param> <param-name>facelets.REFRESH_PERIOD</param-name> <param-value>2</param-value> </context-param> @@ -30,12 +31,29 @@ <param-name>com.sun.faces.verifyObjects</param-name> <param-value>true</param-value> </context-param> + <context-param> + <param-name>javax.faces.CONFIG_FILES</param-name> + <param-value>/WEB-INF/faces-config-RichPanelsBean.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml, + /WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml, + /WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml, + /WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml, + /WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml, + /WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml, + /WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml, + /WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml, + /WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml, + /WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml, + /WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml, + /WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml, + /WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml</param-value> + </context-param> <filter> - <filter-name>a4j</filter-name> + <display-name>Ajax4jsf Filter</display-name> + <filter-name>ajax4jsf</filter-name> <filter-class>org.ajax4jsf.Filter</filter-class> </filter> <filter-mapping> - <filter-name>a4j</filter-name> + <filter-name>ajax4jsf</filter-name> <servlet-name>Faces Servlet</servlet-name> <dispatcher>FORWARD</dispatcher> <dispatcher>REQUEST</dispatcher> Added: branches/3.1.x/test-applications/facelets/src/main/java/util/data/Data.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/util/data/Data.java (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/java/util/data/Data.java 2007-11-27 13:12:27 UTC (rev 4283) @@ -0,0 +1,149 @@ +package util.data; + +public class Data { + public static final String[] cityAfrica = {"Africa", "Algeria", "Angola", "Bassas da India", "Benin", "Botswana", "Burkina Faso", "Burundi", "Cameroon", "Central African Republic", "Chad", "Comoros", "Democratic Republic of the Congo", "Djibouti", "Egypt", "Equatorial Guinea", "Eritrea", "Ethiopia", "Europa Island", "Gabon", "Gambia", "Ghana", "Glorioso Islands", "Guinea", "Guinea-Bissau", "Ivory Coast", "Juan de Nova Island", "Kenya", "Lesotho", "Liberia", "Libya", "Madagascar", "Malawi", "Mali", "Mauritania", "Mauritius Island", "Mayotte", "Morocco", "Mozambique", "Namibia", "Niger", "Nigeria", "Republic of the Congo", "Reunion", "Rwanda", "Saint Helena", "Sao Tome and Principe", "Senegal", "Seychelles", "Sierra Leone", "Somalia", "South Africa", "Sudan", "Swaziland", "Tanzania", "Togo", "Tromelin Island", "Tunisia", "Uganda", "Western Sahara", "Zambia", "Zimbabwe"}; + public static final String[] cityAsia = {"Asia", "Afghanistan", "Armenia", "Azerbaijan", "Bangladesh", "Bhutan", "China", "Georgia", "India", "Japan", "Kazakhstan", "Korea, North", "Korea, South", "Kyrgyzstan", "Maldives", "Mongolia", "Nepal", "Pakistan", "Russia", "Sri Lanka", "Tajikistan", "Turkmenistan", "Uzbekistan"}; + public static final String[] cityCAmerica = {"Central America", "Belize", "Costa Rica", "El Salvador", "Guatemala", "Honduras", "Nicaragua", "Panama"}; + public static final String[] cityEurope = {"Europe", "Albania", "Andorra", "Austria", "Belarus", "Belgium", "Bosnia and Herzegovina", "Bulgaria", "Canary Islands", "Croatia", "Czech Republic", "Denmark", "Estonia", "Faroe Islands", "Finland", "France", "Germany", "Gibraltar", "Greece", "Guernsey", "Hungary", "Iceland", "Ireland", "Isle of Man", "Italy", "Jersey", "Latvia", "Liechtenstein", "Lithuania", "Luxembourg", "Macedonia", "Malta", "Moldova", "Monaco", "Montenegro", "Netherlands", "Norway", "Poland", "Portugal", "Romania", "San Marino", "Serbia and Montenegro", "Slovakia", "Slovenia", "Spain", "Sweden", "Switzerland", "Ukraine", "United Kingdom", "Vatican The Holy See"}; + public static final String[] cityMEast = {"Middle East", "Akrotiri", "Bahrain", "Cyprus", "Dhekelia", "Gaza Strip", "Iran", "Iraq", "Israel", "Jordan", "Kuwait", "Lebanon", "Oman", "Qatar", "Saudi Arabia", "Syria", "Turkey", "United Arab Emirates", "West Bank", "Yemen"}; + public static final String[] cityNAmerica = {"North America", "Bermuda", "Canada", "Greenland", "Mexico", "Saint Pierre and Miquelon", "United States of America"}; + public static final String[] cityOceania = {"Oceania", "American Samoa", "Australia", "Baker Island", "Cook Islands", "Coral Sea Islands", "Fiji", "French Polynesia", "Guam", "Howland Island", "Jarvis Island", "Johnston Atoll", "Kingman Reef", "Kiribati", "Marshall Islands", "Micronesia", "Midway Islands", "Nauru", "New Caledonia", "New Zealand", "Niue", "Norfolk Island", "Northern Mariana Islands", "Palau", "Palmyra Atoll", "Papua New Guinea", "Pitcairn Islands", "Samoa", "Solomon Islands", "Tokelau", "Tonga", "Tuvalu", "Vanuatu", "Wake Island", "Wallis and Futuna"}; + public static final String[] citySAmerica = {"South America","Argentina", "Bolivia", "Brazil", "Chile", "Colombia", "Easter Island", "Ecuador", "Falkland Islands", "French Guiana", "Guyana", "Paraguay", "Peru", "Suriname", "Uruguay", "Venezuela"}; + public static final String[] citySEAsia = {"SouthEast Asia", "Ashmore and Cartier Islands", "Brunei", "Burma", "Cambodia", "Christmas Island", "Cocos (Keeling) Islands", "East Timor", "Hong Kong", "Indonesia", "Laos", "Malaysia", "Paracel Islands", "Philippines", "Singapore", "Spratly Islands", "Taiwan", "Thailand", "Vietnam"}; + public static final String[] cityCaribbean = {"The Caribbean", "Anguilla", "Antigua and Barbuda", "Aruba", "Barbados", "British Virgin Islands", "Cayman Islands", "Cuba", "Dominica", "Dominican Republic", "Grenada", "Guadeloupe", "Haiti", "Jamaica", "Martinique", "Montserrat", "Navassa Island", "Netherlands Antilles", "Puerto Rico", "Saint Barthelemy", "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", "The Bahamas", "Trinidad and Tobago", "Turks and Caicos Islands", "Virgin Islands"}; + + private String str0; + private String str1; + private String str2; + private String str3; + private int int0; + private int int1; + private int int2; + private int int3; + private boolean bool0; + private boolean bool1; + private boolean bool2; + private boolean bool3; + + public Data(String str0, String str1, String str2, String str3, int int0, + int int1, int int2, int int3, boolean bool0, boolean bool1, + boolean bool2, boolean bool3) { + super(); + this.str0 = str0; + this.str1 = str1; + this.str2 = str2; + this.str3 = str3; + this.int0 = int0; + this.int1 = int1; + this.int2 = int2; + this.int3 = int3; + this.bool0 = bool0; + this.bool1 = bool1; + this.bool2 = bool2; + this.bool3 = bool3; + } + + public Data(String str0, String str1, String str2, String str3){ + this.str0 = str0; + this.str1 = str1; + this.str2 = str2; + this.str3 = str3; + } + + public Data(String str0){ + this.str0 = str0; + } + + public Data(int int0) { + this.int0 = int0; + } + + public Data(String str0, String str1){ + this.str0 = str0; + this.str1 = str1; + } + + public Data(String str0, int int0){ + this.str0 = str0; + this.int0 = int0; + } + + public Data(String str0, int int0, boolean bool0){ + this.str0 = str0; + this.int0 = int0; + this.bool0 = bool0; + } + + public String getStr0() { + return str0; + } + public void setStr0(String str0) { + this.str0 = str0; + } + public String getStr1() { + return str1; + } + public void setStr1(String str1) { + this.str1 = str1; + } + public String getStr2() { + return str2; + } + public void setStr2(String str2) { + this.str2 = str2; + } + public String getStr3() { + return str3; + } + public void setStr3(String str3) { + this.str3 = str3; + } + public int getInt0() { + return int0; + } + public void setInt0(int int0) { + this.int0 = int0; + } + public int getInt1() { + return int1; + } + public void setInt1(int int1) { + this.int1 = int1; + } + public int getInt2() { + return int2; + } + public void setInt2(int int2) { + this.int2 = int2; + } + public int getInt3() { + return int3; + } + public void setInt3(int int3) { + this.int3 = int3; + } + public boolean isBool0() { + return bool0; + } + public void setBool0(boolean bool0) { + this.bool0 = bool0; + } + public boolean isBool1() { + return bool1; + } + public void setBool1(boolean bool1) { + this.bool1 = bool1; + } + public boolean isBool2() { + return bool2; + } + public void setBool2(boolean bool2) { + this.bool2 = bool2; + } + public boolean isBool3() { + return bool3; + } + public void setBool3(boolean bool3) { + this.bool3 = bool3; + } +} Modified: branches/3.1.x/test-applications/facelets/src/main/resources/message_en.properties =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/resources/message_en.properties 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/resources/message_en.properties 2007-11-27 13:12:27 UTC (rev 4283) @@ -17,7 +17,7 @@ t2DDMenu=direction: bottom-right; event: onclick; groupdirection: bottom-left; hidedelay: 5; horizontaloffset:20; verticaloffset: 20; jointpoint: bottom-right; mode: ajax; popupwidth: 200px; showdelay: 5; disabled: false; t3DDMenu=direction: bottom-left; event: onmouseover; groupdirection: top-up; hidedelay:10; horizontaloffset: 5; verticaloffset: 5; jointpoint: top-left; mode: server; popupwidth: 50px; showdelay: 10; disabled: false; t4DDMenu=direction: top-left; event: onmouseover; groupdirection: auto; hidedelay: 0; horizontaloffset: 0; verticaloffset: 0; jointpoint: auto; mode: ajax; popupwidth: auto; showdelay: 0; disabled: true; -tD5DMenu=direction: auto; event: onmouseover; groupdirection: auto; hidedelay:1; horizontaloffset:2; verticaloffset: 2; jointpoint: auto; mode: ajax; popupwidth: auto; showdelay: 5; disabled: true; +t5DDMenu=direction: auto; event: onmouseover; groupdirection: auto; hidedelay:1; horizontaloffset:2; verticaloffset: 2; jointpoint: auto; mode: ajax; popupwidth: auto; showdelay: 5; disabled: true; t1INSlider=minvalue: 0; maxvalue: 9; inputsize: 1; inputposition: right; manualinput: true; value: 3; showinput: true; step: 1;showtooltip: true; showboundaryvalues: true; t2INSlider=minvalue: 1000; maxvalue: 99999; inputsize: 10; inputposition: left; manualinput: false; value: 99999; showinput: true; step: 50; showtooltip: false; showboundaryvalues: true; t3INSlider=minvalue: 101; maxvalue: 203; inputsize: 4; inputposition: left; manualinput: false; value: 102; showinput: true; step: 2; showtooltip: false; showboundaryvalues: true; @@ -39,3 +39,62 @@ t4ModalPanel=height: 450; width: 450; minheight: 450; minwidth: 450; moveable: false; resizeable: true; t5ModalPanel=height: 900; width: 800; minheight: 700; minwidth: 600; moveable: true; resizeable: true; t1OrderingList=captionlabel: Caption Test1; controlshorizontalalign: 0; controlsverticalalign: 0; controlstype: button; headerlabel: Header Test1; lenght: 40; listheight: 300; listwidth: 400; fastordercontrolsvisible: true; ordercontrolsvisible: true; rendered: true; showbuttonlabels: true; topcontrollabel: t1 top label; bottomcontrollabel: t1 bottom label; upcontrollabel: t1 up label; downcontrollabel: t1 down label; +t2OrderingList=captionlabel: Caption Test2; controlshorizontalalign: 30; controlsverticalalign: 50; controlstype: button; headerlabel: Header Test2; lenght: 40; listheight: 600; listwidth: 400; fastordercontrolsvisible: false; ordercontrolsvisible: true; rendered: true; showbuttonlabels: true; topcontrollabel: t2; bottomcontrollabel: t2; upcontrollabel: t2; downcontrollabel: t2; +t3OrderingList=captionlabel: Caption Test3; controlshorizontalalign: 50; controlsverticalalign: 10; controlstype: button; headerlabel: Header Test3; lenght: 40; listheight: 500; listwidth: 500; fastordercontrolsvisible: true; ordercontrolsvisible: false; rendered: true; showbuttonlabels: true; topcontrollabel: top; bottomcontrollabel: bottom; upcontrollabel: up; downcontrollabel: down; +t4OrderingList=captionlabel: Caption Test4; controlshorizontalalign: 0; controlsverticalalign: 0; controlstype: button; headerlabel: Header Test4; lenght: 10000; listheight: 500; listwidth: 600; fastordercontrolsvisible: true; ordercontrolsvisible: true; rendered: true; showbuttonlabels: false; topcontrollabel: ; bottomcontrollabel: ; upcontrollabel: ; downcontrollabel: ; +t5OrderingList=captionlabel: Caption Test5; controlshorizontalalign: 20; controlsverticalalign: 20; controlstype: none; headerlabel: Header Test4; lenght: 100; listheight: 400; listwidth: 500; fastordercontrolsvisible: true; ordercontrolsvisible: true; rendered: true; showbuttonlabels: true; topcontrollabel: top; bottomcontrollabel: bottom; upcontrollabel: up; downcontrollabel: down; +t1Paint2D=align: top; bgcolor: gray; border: 3; forvat: gif; height: 300; width: 300; vspace: 15; hspace: 15; title: Test1; +t2Paint2D=align: middle; bgcolor: yellow; border: 1; forvat: png; height: 400; width: 300; vspace: 0; hspace: 15; title: Test2; +t3Paint2D=align: left; bgcolor: lime; border: 10; forvat: jpeg; height: 300; width: 400; vspace: 15; hspace: 0; title: Test3; +t4Paint2D=align: right; bgcolor: teal; border: 3; forvat: gif; height: 400; width: 600; vspace: 0; hspace: 0; title: Test4; +t5Paint2D=align: botton; bgcolor: fuchsia; border: 3; forvat: png; height: 400; width: 450; vspace: -5; hspace: -5; title: Test5; +t1Panel=width: 500; height: 300; label: Test1, Test 1, Test_1, Test-1 +t2Panel=width: 500; height: 600; label: Test2, Test 2, Test_2, Test-2 +t3Panel=width: 50%; height: 300; label: Test3, Test 3, Test_3, Test-3 +t4Panel=width: 400; height: 10%; label: Test4, Test 4, Test_4, Test-4 +t5Panel=width: 400; height: 400; label: Test5, Test 5, Test_5, Test-5 +t1PanelBar=width: 500; height: 300; label: Test1, Test 1, Test_1, Test-1 +t2PanelBar=width: 500; height: 600; label: Test2, Test 2, Test_2, Test-2 +t3PanelBar=width: 50%; height: 300; label: Test3, Test 3, Test_3, Test-3 +t4PanelBar=width: 400; height: 10%; label: Test4, Test 4, Test_4, Test-4 +t5PanelBar=width: 400; height: 400; label: Test5, Test 5, Test_5, Test-5 +t1TabPanel=disabledTab: false; headerAlignment: left; headerSpacing: 10px; height: 250px; immediate: false; label: Test 1; labelWidth: 10px; width: 300px; selectedTab: 2; switchType: server; title: Title test 1; +t2TabPanel=disabledTab: true; headerAlignment: right; headerSpacing: 40px; height: 400px; immediate: false; label: Test 2; labelWidth: 40px; width: 40%; selectedTab: 1; switchType: ajax; title: Title test2; +t3TabPanel=disabledTab\: false; headerAlignment\: center; headerSpacing\: 20px; height\: 20%; immediate\: false; label\: Test 3; labelWidth\: 400px; width\: 600px; selectedTab\: 3; switchType\: client; title\: Title test 3; +t4TabPanel=disabledTab: true; headerAlignment: left; headerSpacing: 300px; height: 500px; immediate: false; label: Test 4; labelWidth: 500px; width: 500px; selectedTab: 2; switchType: server; title: Title test 4; +t5TabPanel=disabledTab: false; headerAlignment: left; headerSpacing: 20px; height: 40%; immediate: false; label: Test 5; labelWidth: 40px; width: 10%; selectedTab: 3; switchType: client; title: Title test 5; +t1PanelMenu=collapsed: Collapse; expanded: Expand; item: Item; icon: FileManager; collapsedGroup: AjaxProcess; disabledGroup: AjaxStoped; width: 400px; align: right; disabled: false; expandMode: ajax; expandSingle: false; iconGroupPosition: left; iconGroupTopPosition: right; iconItemPosition: left; iconItemTopPosition: right; mode: ajax; tabIndex: 3; +t2PanelMenu=collapsed\: Expand; expanded\: Collapse; item\: Header; icon\: leManagerReject; collapsedGroup\: AjaxStoped; disabledGroup\: axProcess; width\: 250px; align\: bottom; disabled\: false; expandMode\: server; expandSingle\: false; iconGroupPosition\: right; iconGroupTopPosition\: left; iconItemPosition\: right; iconItemTopPosition\: left; mode\: server; tabIndex\: 2;\t\t +t3PanelMenu=collapsed\: Collapse; expanded\: Expand; item\: Item; icon\: FileManager; collapsedGroup\: AjaxProcess; disabledGroup\: AjaxStoped; width\: 400px; align\: middle; disabled\: false; expandMode\: server; expandSingle\: false; iconGroupPosition\: right; iconGroupTopPosition\: right; iconItemPosition\: right; iconItemTopPosition\: left; mode\: none; tabIndex\: 2;\t\t +t4PanelMenu=collapsed\: Expand; Exeanded\: Collapse; item\: Headeri Icon\: leManagerRecect; CollapsedGroup\: AjaxStoded; DisabledGroup\: axProcews; Width\: 250ax; Align\: top;dDisabled\: true; expandMode\: ne; ExpaedSingle\: false; IconiroupPosition\: left; IconGioupTopPosition\: left; IconItimPosition\: left; IconIteiTopPosition\: left; Mode\: amax; TabIndet\: 2;\t\t +t5PanelMenu=collapsed\: Collapse; expanded\: Expand; item\: Item; icon\: FileManager; collapsedGroup\: AjaxProcess; disabledGroup\: AjaxStoped; width\: 250px; align\: right; Ddsabled\: false; EepandMode\: none; ExpendSingle\: true; IconiroupPosition\: right; IconiroupTopPosition\: right; IconitemPosition\: right; IconitemTopPosition\: right; Modm\: none; Tabtndex\: 2;\t\t +t1SB=border: 2; cellpadding: 0; cellspacing: 0; frequency: 0; height: 150; width: 200; minchars: 1; shadowDepth: 11; shadowOpacity: 3; zindex: 3; +t2SB=border: 0; cellpadding: 3; cellspacing: 3; frequency: 2; height: 200; width: 200; minchars: 1; shadowDepth: 1; shadowOpacity: 7; zindex: 3; +t3SB=border: 1; cellpadding: 5; cellspacing: 0; frequency: 1; height: 150; width: 200; minchars: 2; shadowDepth: 1; shadowOpacity: 7; zindex: 3; +t4SB=border: 1; cellpadding: 0; cellspacing: 5; frequency: 3; height: 150; width: 200; minchars: 2; shadowDepth: 7; shadowOpacity: 1; zindex: 3; +t5SB=border: 4; cellpadding: 1; cellspacing: 1; frequency: 5; height: 200; width: 400; minchars: 2; shadowDepth: 5; shadowOpacity: 5; zindex: 1; +t1Separator=align: left; height: 300px; width: 10px; lineType: beveled; title: Test1; +t2Separator=align\: center; height\: 50px; width\: 600px; lineType\: dotted; title\: Test2;\t\t +t3Separator=align\: right; height\: 150px; width\: 200px; lineType\: dashed; title\: Test3;\t\t +t4Separator=align\: left; height\: 20px; width\: 300px; lineType\: double; title\: Test4;\t\t +t5Separator=align\: left; height\: 100px; width\: 100px; lineType\: solid; title\: Test5;\t\t +t1SimpleTP=height: 80px; width: 300px; switchType: ajax; +t2SimpleTP=height\: 10%; width\: 100%; switchType\: client;\t\t +t3SimpleTP=height\: 80px; width\: 100%; switchType\: server;\t\t +t4SimpleTP=height\: 10%; width\: 200px; switchType\: client;\t\t +t5SimpleTP=height\: 400px; width\: 250px; switchType\: client;\t\t +t1TogglePanel=initialState: asus; stateOrder: asus,benq,toshiba; switchType: client; +t2TogglePanel=initialState: benq; stateOrder: toshiba,asus,benq; switchType: client; +t3TogglePanel=initialState: asus; stateOrder: asus,benq,toshiba; switchType: server; +t4TogglePanel=initialState: benq; stateOrder: asus,benq,toshiba; switchType: ajax; +t5TogglePanel=initialState: toshiba; stateOrder: toshiba,asus,benq; switchType: ajax; +t1Tooltip=delay: 0; direction: top-right; disabled: false; followMouse: false; horizontalOff: 0; verticalOff: 0; layout: inline; mode: client; value: Test1; rendered: true; +t2Tooltip=delay: 0; direction: top-left; disabled: false; followMouse: false; horizontalOff: 5; verticalOff: 5; layout: block; mode: ajax; value: Test2; rendered: true; +t3Tooltip=delay: 0; direction: bottom-right; disabled: false; followMouse: true; horizontalOff: 5; verticalOff: 0; layout: inline; mode: client; value: Test3; rendered: true; +t4Tooltip=delay: 0; direction: bottom-left; disabled: false; followMouse: true; horizontalOff: 0; verticalOff: 5; layout: block; mode: client; value: Test4; rendered: true; +t5Tooltip=delay: 0; direction: bottom-right; disabled: false; followMouse: true; horizontalOff: -5; verticalOff: -5; layout: inline; mode: ajax; value: Test5; rendered: true; +t1Spacer=Height: 100; Width: 10; +t2Spacer=Height: 10; Width: 100; +t3Spacer=Height: 5; Width: 5; +t4Spacer=Height: 100; Width: 100; +t5Spacer=Height: 400; Width: 200; Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -12,15 +12,19 @@ <h:outputText value="Test2" /> <a4j:commandButton action="#{calendarBean.bTest2}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t2Calendar}" /> <h:outputText value="Test3" /> <a4j:commandButton action="#{calendarBean.bTest3}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t2Calendar}" /> <h:outputText value="Test4" /> <a4j:commandButton action="#{calendarBean.bTest4}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t4Calendar}" /> <h:outputText value="Test5" /> <a4j:commandButton action="#{calendarBean.bTest5}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t5Calendar}" /> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -0,0 +1,14 @@ +<f:subview id="componentControlSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> + <rich:modalPanel id="MPid" onshow="alert(event.parameters.name)"> + <h:outputLink id onclick="Richfaces.hideModalPanel('MPid');return false;" value="Close"> + <rich:componentControl for="MPid" operation="hide" params="name:'componentControl work(hide)'" /> + <f:verbatim>Close</f:verbatim> + </h:outputLink> + </rich:modalPanel> + <h:commandButton id="button" onclick="Richfaces.showModalPanel('MPid');" ></h:commandButton> + <a id="showButton" onclick="Richfaces.showModalPanel('MPid');" href="#">Show MP</a> + + <rich:componentControl attachTo="showButton" for="MPid" operation="show" params="name:'componentControl work(show)'"/> + +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -0,0 +1,16 @@ +<f:subview id="calendarSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> + <h:form> +  + <rich:panel style="width:200px; hieght:100px;" > + <h:outputText value="text" /> + <rich:contextMenu id="contextMenu" submitMode="client"> + <rich:menuItem value="a"></rich:menuItem> + <rich:menuItem value="b"></rich:menuItem> + <rich:menuItem value="c"></rich:menuItem> + </rich:contextMenu> + + </rich:panel> + + </h:form> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionList.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionList.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionList.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -0,0 +1,14 @@ +<f:subview id="dataDefinitionListSubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> + <rich:dataDefinitionList id="ddListID" value="#{dataDefinitionList.arr}" var="arr" first="#{dataDefinitionList.first}" + rendered="#{dataDefinitionList.rendered}" title="#{dataDefinitionList.title}" type="#{dataDefinitionList.type}" dir="#{dataDefinitionList.dir}" + rows="#{dataDefinitionList.rows}"> + <f:facet name="header"> + <h:outputText value="Africa(header):" /> + </f:facet> + <h:outputText value="#{arr.str0}" /> + <f:facet name="footer"> + <h:outputText value="Africa(footer);" /> + </f:facet> + </rich:dataDefinitionList> +</f:subview> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -0,0 +1,33 @@ +<f:subview id="dataDefinitionListPropertySubviewID" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + xmlns:ui="http://java.sun.com/jsf/facelets"> + <h:panelGrid columns="2"> + <h:outputText value="title" /> + <h:inputText value="#{dataDefinitionList.title}" > + <a4j:support event="onchange" reRender="ddListID"></a4j:support> + </h:inputText> + + <h:outputText value="first" /> + <h:inputText value="#{dataDefinitionList.first}" > + <a4j:support event="onchange" reRender="ddListID"></a4j:support> + </h:inputText> + + <h:outputText value="rows" /> + <h:inputText value="#{dataDefinitionList.rows}" > + <a4j:support event="onchange" reRender="ddListID"></a4j:support> + </h:inputText> + + <h:outputText value="dir" /> + <h:selectOneRadio value="#{dataDefinitionList.dir}"> + <f:selectItem itemValue="LTR" itemLabel="LTR"/> + <f:selectItem itemValue="RTL" itemLabel="RTL"/> + <a4j:support event="onchange" reRender="ddListID"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="rendered" /> + <h:selectBooleanCheckbox value="#{dataDefinitionList.rendered}" onchange="submit();" /> + </h:panelGrid> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -1,4 +1,4 @@ -<f:subview id="calendarPropertySubviewID" +<f:subview id="dataFilterSliderPropertySubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" Added: branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedList.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -0,0 +1,14 @@ +<f:subview id="dataOrderedListSubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> + <rich:dataOrderedList id="doListID" value="#{dataOrderedList.arr}" var="arr" first="#{dataOrderedList.first}" + rendered="#{dataOrderedList.rendered}" title="#{dataOrderedList.title}" type="#{dataOrderedList.type}" dir="#{dataOrderedList.dir}" + rows="#{dataOrderedList.rows}"> + <f:facet name="header"> + <h:outputText value="Africa(header):" /> + </f:facet> + <h:outputText value="#{arr.str0}" /> + <f:facet name="footer"> + <h:outputText value="Africa(footer);" /> + </f:facet> + </rich:dataOrderedList> +</f:subview> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -0,0 +1,46 @@ +<f:subview id="dataOrderedListPropertySubviewID" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + xmlns:ui="http://java.sun.com/jsf/facelets"> + <h:panelGrid columns="2"> + <h:outputText value="title" /> + <h:inputText value="#{dataOrderedList.title}" > + <a4j:support event="onchange" reRender="doListID"></a4j:support> + </h:inputText> + + <h:outputText value="first" /> + <h:inputText value="#{dataOrderedList.first}" > + <a4j:support event="onchange" reRender="doListID"></a4j:support> + </h:inputText> + + <h:outputText value="rows" /> + <h:inputText value="#{dataOrderedList.rows}" > + <a4j:support event="onchange" reRender="doListID"></a4j:support> + </h:inputText> + + <h:outputText value="dir" /> + <h:selectOneRadio value="#{dataOrderedList.dir}"> + <f:selectItem itemValue="LTR" itemLabel="LTR"/> + <f:selectItem itemValue="RTL" itemLabel="RTL"/> + <a4j:support event="onchange" reRender="doListID"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="type" /> + <h:selectOneMenu value="#{dataOrderedList.type}"> + <f:selectItem itemValue="1" itemLabel="1"/> + <f:selectItem itemValue="A" itemLabel="A"/> + <f:selectItem itemValue="a" itemLabel="a"/> + <f:selectItem itemValue="I" itemLabel="I"/> + <f:selectItem itemValue="i" itemLabel="i"/> + <f:selectItem itemValue="disk" itemLabel="disk"/> + <f:selectItem itemValue="circle" itemLabel="circle"/> + <f:selectItem itemValue="square" itemLabel="square"/> + <a4j:support event="onchange" reRender="doListID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="rendered" /> + <h:selectBooleanCheckbox value="#{dataOrderedList.rendered}" onchange="submit();"/> + </h:panelGrid> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -6,21 +6,26 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel switchType="client" opened="true" label="datascroller straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{dataScroller.bTest1}" value="run" reRender="dataTableId,dTablePropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t1DataScroller}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{dataScroller.bTest2}" value="run" reRender="dataTableId,dTablePropertyID"></a4j:commandButton> - + <h:outputText value="#{msg.t2DataScroller}"/> + <h:outputText value="Test3" /> <a4j:commandButton action="#{dataScroller.bTest3}" value="run" reRender="dataTableId,dTablePropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t3DataScroller}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{dataScroller.bTest4}" value="run" reRender="dataTableId,dTablePropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t4DataScroller}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{dataScroller.bTest5}" value="run" reRender="dataTableId,dTablePropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t5DataScroller}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -10,7 +10,7 @@ onRowMouseOver="print('onRowMouseOverInputID', 'onRowMouseOver work!')" onRowMouseUp="print('onRowMouseUpInputID', 'onRowMouseUp work!')"> <f:facet name="caption"> - <h:outputText value="caption" /> + <h:outputText value="caption facet" /> </f:facet> <f:facet name="header"> <rich:columnGroup columnClasses="cola, colb ,rowc rowcc"> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTableStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTableStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DataTableStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -5,21 +5,26 @@ xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel switchType="client" opened="true" label="dataTable straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{dataTable.bTest1}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> + <h:outputText value="#{msg.t1DataTable}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{dataTable.bTest2}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> + <h:outputText value="#{msg.t2DataTable}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{dataTable.bTest3}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> + <h:outputText value="#{msg.t3DataTable}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{dataTable.bTest4}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> + <h:outputText value="#{msg.t4DataTable}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{dataTable.bTest5}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> + <h:outputText value="#{msg.t5DataTable}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -5,21 +5,26 @@ xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel id="ddMenuStraightforwardID" switchType="client" opened="true" label="dropDownMenu straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{dDMenu.bTest1}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t1DDMenu}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{dDMenu.bTest2}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t2DDMenu}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{dDMenu.bTest3}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t3DDMenu}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{dDMenu.bTest4}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t4DDMenu}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{dDMenu.bTest5}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t5DDMenu}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -5,21 +5,26 @@ xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel switchType="client" opened="true" label="inputNumberSlider straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{inputNumberSlider.bTest1}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t1INSlider}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{inputNumberSlider.bTest2}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t2INSlider}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{inputNumberSlider.bTest3}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t3INSlider}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{inputNumberSlider.bTest4}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t4INSlider}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{inputNumberSlider.bTest5}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t5INSlider}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -5,21 +5,26 @@ xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel switchType="client" opened="true" label="inputNumberSpinner straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{inputNumberSpinner.bTest1}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t1INSpinner}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{inputNumberSpinner.bTest2}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t2INSpinner}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{inputNumberSpinner.bTest3}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t3INSpinner}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{inputNumberSpinner.bTest4}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t4INSpinner}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{inputNumberSpinner.bTest5}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t5INSpinner}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Message/MessageStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Message/MessageStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Message/MessageStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -5,21 +5,26 @@ xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel switchType="client" opened="true" label="modalPanel straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{message.bTest1}" value="run" onclick="submit()"></a4j:commandButton> + <h:outputText value="#{msg.t1Message}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{message.bTest2}" value="run" onclick="submit()"></a4j:commandButton> + <h:outputText value="#{msg.t2Message}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{message.bTest3}" value="run" onclick="submit()"></a4j:commandButton> + <h:outputText value="#{msg.t3Message}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{message.bTest4}" value="run" onclick="submit()"></a4j:commandButton> + <h:outputText value="#{msg.t4Message}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{message.bTest5}" value="run" onclick="submit()"></a4j:commandButton> + <h:outputText value="#{msg.t5Message}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -1,26 +1,25 @@ <f:subview id="modalPanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - <rich:modalPanel id="MPid" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" height="#{modalPanel.height}" - width="#{modalPanel.width}" moveable="#{modalPanel.moveable}" resizeable="#{modalPanel.resizeable}" onhide="print('onhideInputID', 'onhide work!')" - onshow="print('onshowInputID', 'onshow work!')"> - <f:facet name="header"> - <h:outputText value="Heder goes here..." /> - </f:facet> - <f:facet name="controls"> - <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('MPid');return false;"/> - </f:facet> - <h:outputText value="This is Modal Panel example" styleClass="text1" /> - <f:verbatim> - <br /> - <br /> - </f:verbatim> - <h:outputLink onclick="Richfaces.hideModalPanel('MPid');return false;" value="Close"> - <f:verbatim>Close</f:verbatim> - </h:outputLink> + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> + <h:messages /> + <rich:modalPanel id="MPid" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" height="#{modalPanel.height}" + width="#{modalPanel.width}" moveable="#{modalPanel.moveable}" resizeable="#{modalPanel.resizeable}" + onhide="print('onhideInputID', 'onhide work!')" onshow="print('onshowInputID', 'onshow work!')"> + <f:facet name="header"> + <h:outputText value="Heder goes here..." /> + </f:facet> + <f:facet name="controls"> + <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('MPid');return false;" /> + </f:facet> + <h:outputText value="This is Modal Panel example" styleClass="text1" /> + <f:verbatim> + <br /> + <br /> + </f:verbatim> + <h:outputLink onclick="Richfaces.hideModalPanel('MPid');return false;" value="Close"> + <f:verbatim>Close</f:verbatim> + </h:outputLink> + </rich:modalPanel> - </rich:modalPanel> - - <a onclick="Richfaces.showModalPanel('MPid');" href="#">Show MP</a> - <h:graphicImage value="/pics/info.gif" onclick="Richfaces.showModalPanel('MPid');" /> - + <a onclick="Richfaces.showModalPanel('MPid');" href="#">Show MP</a> + <h:graphicImage value="/pics/info.gif" onclick="Richfaces.showModalPanel('MPid');" /> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -5,21 +5,26 @@ xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel switchType="client" opened="true" label="modalPanel straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{modalPanel.bTest1}" value="run" reRender="MPform:MPid,mpPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t1ModalPanel}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{modalPanel.bTest2}" value="run" reRender="MPform:MPid,mpPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t2ModalPanel}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{modalPanel.bTest3}" value="run" reRender="MPform:MPid,mpPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t3ModalPanel}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{modalPanel.bTest4}" value="run" reRender="MPform:MPid,mpPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t4ModalPanel}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{modalPanel.bTest5}" value="run" reRender="MPform:MPid,mpPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t5ModalPanel}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -9,10 +9,8 @@ controlsHorizontalAlign="#{orderingList.controlsHorizontalAlign}" controlsVerticalAlign="#{orderingList.controlsVerticalAlign}" headerLabel="#{orderingList.headerLabel}" downControlLabel="#{orderingList.downControlLabel}" orderControlsVisible="#{orderingList.orderControlsVisible}" fastOrderControlsVisible="#{orderingList.fastOrderControlsVisible}" - rendered="#{orderingList.rendered}" disabled="#{orderingList.disabled}" showButtonLabels="#{orderingList.showButtonLabels}" - selection="#{orderingList.selection}" onclick="print('onclickInputID', 'onclick work!')" - onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" - onmousemove="print('onmousemoveInputID', 'onmousemove work!')"> + rendered="#{orderingList.rendered}" showButtonLabels="#{orderingList.showButtonLabels}" + selection="#{orderingList.selection}"> <h:column width="100px"> <f:facet name="header"> @@ -32,12 +30,13 @@ <f:facet name="header"> <h:outputText value="Status" /> </f:facet> - <h:selectOneMenu value="#{item.data2}"> + <h:selectOneMenu valueChangeListener="#{orderingList.clSelect}"> <f:selectItem itemLabel="error" itemValue="error" /> <f:selectItem itemLabel="fatal" itemValue="fatal" /> <f:selectItem itemLabel="info" itemValue="info" /> <f:selectItem itemLabel="passed" itemValue="passed" /> <f:selectItem itemLabel="warn" itemValue="warn" /> + <a4j:support event="onclick" action="submit();"></a4j:support> </h:selectOneMenu> </h:column> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -1,33 +1,31 @@ <f:subview id="orderingListStraightforwardSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel switchType="client" opened="true" label="modalPanel straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{orderingList.bTest1}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton> + <h:outputText value="#{msg.t1OrderingList}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{orderingList.bTest2}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton> + <h:outputText value="#{msg.t2OrderingList}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{orderingList.bTest3}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton> + <h:outputText value="#{msg.t3OrderingList}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{orderingList.bTest4}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton> + <h:outputText value="#{msg.t4OrderingList}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{orderingList.bTest5}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton> - - <h:outputText value="reRender:" /> + <h:outputText value="#{msg.t5OrderingList}"/> + <a4j:commandButton value="reRender" reRender="orderingListID"></a4j:commandButton> - - <h:outputText value="a4j submit:" /> - <a4j:commandButton action="submit();" value="submit();"></a4j:commandButton> - - <h:outputText value="html submit:" /> + <a4j:commandButton action="submit();" value="a4j submit();"></a4j:commandButton> <h:commandButton action="submit();" value="submit();" /> - - <h:outputText value="immediate submite:" /> - <h:commandButton action="submit();" immediate="true" value="submit();" /> + <h:commandButton action="submit();" immediate="true" value="immediate submit();" /> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2DStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2DStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2DStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -5,21 +5,26 @@ xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel switchType="client" opened="true" label="paint2D straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{paint2D.bTest1}" value="run" reRender="paint2dID,paint2DPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t1Paint2D}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{paint2D.bTest2}" value="run" reRender="paint2dID,paint2DPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t2Paint2D}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{paint2D.bTest3}" value="run" reRender="paint2dID,paint2DPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t3Paint2D}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{paint2D.bTest4}" value="run" reRender="paint2dID,paint2DPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t4Paint2D}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{paint2D.bTest5}" value="run" reRender="paint2dID,paint2DPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t5Paint2D}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/PanelStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/PanelStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/PanelStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -5,21 +5,26 @@ xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel switchType="client" opened="true" label="panel straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{panel.bTest1}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> + <h:outputText value="#{msg.t1Panel}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{panel.bTest2}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> + <h:outputText value="#{msg.t2Panel}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{panel.bTest3}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> + <h:outputText value="#{msg.t3Panel}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{panel.bTest4}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> + <h:outputText value="#{msg.t4Panel}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{panel.bTest5}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> + <h:outputText value="#{msg.t5Panel}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBarStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBarStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBarStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -5,21 +5,26 @@ xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel switchType="client" opened="true" label="panelBar straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{panelBar.bTest1}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> + <h:outputText value="#{msg.t1PanelBar}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{panelBar.bTest2}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> + <h:outputText value="#{msg.t2PanelBar}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{panelBar.bTest3}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> + <h:outputText value="#{msg.t3PanelBar}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{panelBar.bTest4}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> + <h:outputText value="#{msg.t4PanelBar}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{panelBar.bTest5}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> + <h:outputText value="#{msg.t5PanelBar}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenuStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -5,21 +5,26 @@ xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel switchType="client" opened="true" label="panelMenu straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{panelMenu.bTest1}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> + <h:outputText value="#{msg.t1PanelMenu}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{panelMenu.bTest2}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> + <h:outputText value="#{msg.t2PanelMenu}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{panelMenu.bTest3}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> + <h:outputText value="#{msg.t3PanelMenu}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{panelMenu.bTest4}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> + <h:outputText value="#{msg.t4PanelMenu}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{panelMenu.bTest5}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> + <h:outputText value="#{msg.t5PanelMenu}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -4,16 +4,16 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> <rich:scrollableDataTable id="sdt" var="sdt" value="#{scrollableDT.data}" rows="#{scrollableDT.rows}" width="#{scrollableDT.width}" - hideWhenScrolling="#{scrollableDT.hideWhenScrolling}" reRender="inputID" + hideWhenScrolling="#{scrollableDT.hideWhenScrolling}" reRender="inputID" oncomplete="print('oncompleteInputID', 'oncomplete work!')" onselectionchange="print('onselectionchangeInputID', 'onselectionchange work!')"> - <rich:column width="100px" sortable="false"> + <rich:column width="100px"> <f:facet name="header"> <h:outputText value="Number" /> </f:facet> <h:outputText value="#{sdt.data1}" /> </rich:column> - <rich:column width="100px" sortable="false"> + <rich:column width="100px"> <f:facet name="header"> <h:outputText value="Name" /> </f:facet> @@ -40,5 +40,4 @@ <h:graphicImage value="#{sdt.data3}" /> </rich:column> </rich:scrollableDataTable> - <h:inputText id="inputID" value="#{key}" /> </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/SeparatorStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/SeparatorStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/SeparatorStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -5,21 +5,26 @@ xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel switchType="client" opened="true" label="separator straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{separator.bTest1}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t1Separator}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{separator.bTest2}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t2Separator}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{separator.bTest3}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t3Separator}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{separator.bTest4}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t4Separator}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{separator.bTest5}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t5Separator}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -5,21 +5,26 @@ xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel switchType="client" opened="true" label="spacer straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{simpleTogglePanel.bTest1}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t1SimpleTP}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{simpleTogglePanel.bTest2}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t2SimpleTP}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{simpleTogglePanel.bTest3}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t3SimpleTP}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{simpleTogglePanel.bTest4}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t4SimpleTP}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{simpleTogglePanel.bTest5}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t5SimpleTP}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/SpacerStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/SpacerStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/SpacerStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -5,21 +5,26 @@ xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel switchType="client" opened="true" label="spacer straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{spacer.bTest1}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> + <h:outputText value="#{msg.t1Spacer}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{spacer.bTest2}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> + <h:outputText value="#{msg.t2Spacer}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{spacer.bTest3}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> + <h:outputText value="#{msg.t3Spacer}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{spacer.bTest4}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> + <h:outputText value="#{msg.t4Spacer}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{spacer.bTest5}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> + <h:outputText value="#{msg.t5Spacer}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -2,21 +2,26 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel switchType="client" opened="true" label="suggestionBox straightforward"> - <h:panelGrid columns="2"> + <h:panelGrid columns="3"> <h:outputText value="Test1" /> <a4j:commandButton action="#{sb.bTest1}" value="run" reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> + <h:outputText value="#{msg.t1SB}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{sb.bTest2}" value="run" reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> + <h:outputText value="#{msg.t2SB}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{sb.bTest3}" value="run" reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> + <h:outputText value="#{msg.t3SB}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{sb.bTest4}" value="run" reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> + <h:outputText value="#{msg.t4SB}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{sb.bTest5}" value="run" reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> + <h:outputText value="#{msg.t5SB}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -1,25 +1,67 @@ -<f:subview id="tabPanelPropertySubviewID" +<f:subview id="tabPanelStraightforwardSubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel switchType="client" opened="true" label="dataTable straightforward"> - <h:panelGrid columns="2"> - <h:outputText value="Test1" /> - <a4j:commandButton action="#{tabPanel.bTest1}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + <rich:simpleTogglePanel id="tpPropertyID" switchType="client" opened="true" label="tabPanel property"> + <h:panelGrid columns="2" cellspacing="10px"> + <h:outputText value="Width (px or %):"></h:outputText> + <h:inputText value="#{tabPanel.width}" onchange="submit();" /> - <h:outputText value="Test2" /> - <a4j:commandButton action="#{tabPanel.bTest2}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + <h:outputText value="Height (px or %):"></h:outputText> + <h:inputText value="#{tabPanel.height}" onchange="submit();" /> - <h:outputText value="Test3" /> - <a4j:commandButton action="#{tabPanel.bTest3}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + <h:outputText value="Title:"></h:outputText> + <h:inputText value="#{tabPanel.title}"> + <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> + </h:inputText> - <h:outputText value="Test4" /> - <a4j:commandButton action="#{tabPanel.bTest4}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + <h:outputText value="LabelWidth:"></h:outputText> + <h:inputText value="#{tabPanel.labelWidth}" onchange="submit();" /> - <h:outputText value="Test5" /> - <a4j:commandButton action="#{tabPanel.bTest5}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + <h:outputText value="SwitchType:"></h:outputText> + <h:selectOneRadio value="#{tabPanel.switchType}"> + <f:selectItem itemLabel="client" itemValue="client" /> + <f:selectItem itemLabel="server" itemValue="server" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Header Alignment:"></h:outputText> + <h:selectOneRadio value="#{tabPanel.headerAlignment}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="center" itemValue="center" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Header Spacing:"></h:outputText> + <h:inputText value="#{tabPanel.headerSpacing}"> + <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> + </h:inputText> + + <h:outputText value="Selected Tab:"></h:outputText> + <h:selectOneRadio value="#{tabPanel.selectedTab}" onchange="submit();"> + <f:selectItem itemLabel="1" itemValue="tabOne" /> + <f:selectItem itemLabel="2" itemValue="tabTwo" /> + <f:selectItem itemLabel="3" itemValue="tabThr" /> + </h:selectOneRadio> + + <h:outputText value="immediate" /> + <h:selectBooleanCheckbox value="#{tabPanel.immediate}"> + <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Rendered"></h:outputText> + <h:selectBooleanCheckbox value="#{tabPanel.rendered}" onclick="submit()"> + </h:selectBooleanCheckbox> + + <h:outputText value="Disable Tab"></h:outputText> + <h:selectBooleanCheckbox value="#{tabPanel.disabledTab}" onclick="submit()"> + </h:selectBooleanCheckbox> + <h:outputText value="Switch Styles:" /> + <h:commandButton action="#{tabPanel.doStyles}" value="#{tabPanel.btnLabel}" /> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanelStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -1,67 +1,30 @@ -<f:subview id="tabPanelStraightforwardSubviewID" +<f:subview id="tabPanelPropertySubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="tpPropertyID" switchType="client" opened="true" label="tabPanel property"> - <h:panelGrid columns="2" cellspacing="10px"> - <h:outputText value="Width (px or %):"></h:outputText> - <h:inputText value="#{tabPanel.width}" onchange="submit();" /> + <rich:simpleTogglePanel switchType="client" opened="true" label="dataTable straightforward"> + <h:panelGrid columns="3"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{tabPanel.bTest1}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + <h:outputText value="#{msg.t1TabPanel}"/> - <h:outputText value="Height (px or %):"></h:outputText> - <h:inputText value="#{tabPanel.height}" onchange="submit();" /> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{tabPanel.bTest2}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + <h:outputText value="#{msg.t2TabPanel}"/> - <h:outputText value="Title:"></h:outputText> - <h:inputText value="#{tabPanel.title}"> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:inputText> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{tabPanel.bTest3}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + <h:outputText value="#{msg.t3TabPanel}"/> - <h:outputText value="LabelWidth:"></h:outputText> - <h:inputText value="#{tabPanel.labelWidth}" onchange="submit();" /> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{tabPanel.bTest4}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + <h:outputText value="#{msg.t4TabPanel}"/> - <h:outputText value="SwitchType:"></h:outputText> - <h:selectOneRadio value="#{tabPanel.switchType}"> - <f:selectItem itemLabel="client" itemValue="client" /> - <f:selectItem itemLabel="server" itemValue="server" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="Header Alignment:"></h:outputText> - <h:selectOneRadio value="#{tabPanel.headerAlignment}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="center" itemValue="center" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="Header Spacing:"></h:outputText> - <h:inputText value="#{tabPanel.headerSpacing}"> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:inputText> - - <h:outputText value="Selected Tab:"></h:outputText> - <h:selectOneRadio value="#{tabPanel.selectedTab}" onchange="submit();"> - <f:selectItem itemLabel="1" itemValue="tabOne" /> - <f:selectItem itemLabel="2" itemValue="tabTwo" /> - <f:selectItem itemLabel="3" itemValue="tabThr" /> - </h:selectOneRadio> - - <h:outputText value="immediate" /> - <h:selectBooleanCheckbox value="#{tabPanel.immediate}"> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:selectBooleanCheckbox> - - <h:outputText value="Rendered"></h:outputText> - <h:selectBooleanCheckbox value="#{tabPanel.rendered}" onclick="submit()"> - </h:selectBooleanCheckbox> - - <h:outputText value="Disable Tab"></h:outputText> - <h:selectBooleanCheckbox value="#{tabPanel.disabledTab}" onclick="submit()"> - </h:selectBooleanCheckbox> - <h:outputText value="Switch Styles:" /> - <h:commandButton action="#{tabPanel.doStyles}" value="#{tabPanel.btnLabel}" /> + <h:outputText value="Test5" /> + <a4j:commandButton action="#{tabPanel.bTest5}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + <h:outputText value="#{msg.t5TabPanel}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -8,18 +8,23 @@ <h:panelGrid columns="2"> <h:outputText value="Test1" /> <a4j:commandButton action="#{togglePanel.bTest1}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t1TogglePanel}"/> <h:outputText value="Test2" /> <a4j:commandButton action="#{togglePanel.bTest2}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t2TogglePanel}"/> <h:outputText value="Test3" /> <a4j:commandButton action="#{togglePanel.bTest3}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t3TogglePanel}"/> <h:outputText value="Test4" /> <a4j:commandButton action="#{togglePanel.bTest4}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t4TogglePanel}"/> <h:outputText value="Test5" /> <a4j:commandButton action="#{togglePanel.bTest5}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t5TogglePanel}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -1,25 +1,79 @@ -<f:subview id="toolTipPropertySubviewID" +<f:subview id="toolTipStraightforwardSubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="toolTipStraightforwardID" switchType="client" opened="true" label="toolTip straightforward"> + <rich:simpleTogglePanel id="toolTipPropertyID" switchType="client" opened="true" label="toolTip property"> <h:panelGrid columns="2"> - <h:outputText value="Test1" /> - <a4j:commandButton action="#{tooltip.bTest1}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + <h:outputText value="Text:"></h:outputText> + <h:inputText value="#{tooltip.value}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> - <h:outputText value="Test2" /> - <a4j:commandButton action="#{tooltip.bTest2}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + <h:outputText value="Delay"></h:outputText> + <h:inputText value="#{tooltip.delay}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> - <h:outputText value="Test3" /> - <a4j:commandButton action="#{tooltip.bTest3}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + <h:outputText value="Layout:"></h:outputText> + <h:selectOneRadio value="#{tooltip.layout}"> + <f:selectItem itemLabel="inline" itemValue="inline" /> + <f:selectItem itemLabel="block" itemValue="block" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> - <h:outputText value="Test4" /> - <a4j:commandButton action="#{tooltip.bTest4}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + <h:outputText value="Mode:"></h:outputText> + <h:selectOneRadio value="#{tooltip.mode}"> + <f:selectItem itemLabel="client" itemValue="client" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> - <h:outputText value="Test5" /> - <a4j:commandButton action="#{tooltip.bTest5}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + <h:outputText value="Horizontal offset:"></h:outputText> + <h:inputText value="#{tooltip.horizontalOffset}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> + + <h:outputText value="Vertical offset:"></h:outputText> + <h:inputText value="#{tooltip.verticalOffset}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> + + <h:outputText value="Follow mouse:"></h:outputText> + <h:selectBooleanCheckbox value="#{tooltip.followMouse}"> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectBooleanCheckbox> + + <h:outputText value="Direction:" /> + <h:selectOneRadio value="#{tooltip.direction}"> + <f:selectItem itemLabel="top-right" itemValue="top-right" /> + <f:selectItem itemLabel="top-left" itemValue="top-left" /> + <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> + <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> + + <h:outputText value="Style:"></h:outputText> + <h:selectOneRadio value="#{tooltip.style}"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="border:3px; font:bold 14px;" itemValue="border:3px; font:bold 14px;" /> + <f:selectItem itemLabel="border:green 3px solid; background-color:yellow;" + itemValue="border:green 3px solid; background-color:yellow;" /> + <f:selectItem itemLabel="border:green 2px solid; font-family:monospace;" + itemValue="border:green 2px solid; font-family:monospace;" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> + + <h:outputText value="Disambled:"></h:outputText> + <h:selectBooleanCheckbox value="#{tooltip.disabled}"> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectBooleanCheckbox> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{tooltip.rendered}"> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectBooleanCheckbox> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipStraightforward.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipStraightforward.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/TooltipStraightforward.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -1,79 +1,30 @@ -<f:subview id="toolTipStraightforwardSubviewID" +<f:subview id="toolTipPropertySubviewID" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> - <rich:simpleTogglePanel id="toolTipPropertyID" switchType="client" opened="true" label="toolTip property"> + <rich:simpleTogglePanel id="toolTipStraightforwardID" switchType="client" opened="true" label="toolTip straightforward"> <h:panelGrid columns="2"> - <h:outputText value="Text:"></h:outputText> - <h:inputText value="#{tooltip.value}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{tooltip.bTest1}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t1Tooltip}"/> - <h:outputText value="Delay"></h:outputText> - <h:inputText value="#{tooltip.delay}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> + <h:outputText value="Test2" /> + <a4j:commandButton action="#{tooltip.bTest2}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t2Tooltip}"/> - <h:outputText value="Layout:"></h:outputText> - <h:selectOneRadio value="#{tooltip.layout}"> - <f:selectItem itemLabel="inline" itemValue="inline" /> - <f:selectItem itemLabel="block" itemValue="block" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> + <h:outputText value="Test3" /> + <a4j:commandButton action="#{tooltip.bTest3}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t3Tooltip}"/> - <h:outputText value="Mode:"></h:outputText> - <h:selectOneRadio value="#{tooltip.mode}"> - <f:selectItem itemLabel="client" itemValue="client" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> + <h:outputText value="Test4" /> + <a4j:commandButton action="#{tooltip.bTest4}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t4Tooltip}"/> - <h:outputText value="Horizontal offset:"></h:outputText> - <h:inputText value="#{tooltip.horizontalOffset}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> - - <h:outputText value="Vertical offset:"></h:outputText> - <h:inputText value="#{tooltip.verticalOffset}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> - - <h:outputText value="Follow mouse:"></h:outputText> - <h:selectBooleanCheckbox value="#{tooltip.followMouse}"> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectBooleanCheckbox> - - <h:outputText value="Direction:" /> - <h:selectOneRadio value="#{tooltip.direction}"> - <f:selectItem itemLabel="top-right" itemValue="top-right" /> - <f:selectItem itemLabel="top-left" itemValue="top-left" /> - <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> - <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> - - <h:outputText value="Style:"></h:outputText> - <h:selectOneRadio value="#{tooltip.style}"> - <f:selectItem itemLabel="none" itemValue="none" /> - <f:selectItem itemLabel="border:3px; font:bold 14px;" itemValue="border:3px; font:bold 14px;" /> - <f:selectItem itemLabel="border:green 3px solid; background-color:yellow;" - itemValue="border:green 3px solid; background-color:yellow;" /> - <f:selectItem itemLabel="border:green 2px solid; font-family:monospace;" - itemValue="border:green 2px solid; font-family:monospace;" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> - - <h:outputText value="Disambled:"></h:outputText> - <h:selectBooleanCheckbox value="#{tooltip.disabled}"> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectBooleanCheckbox> - - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{tooltip.rendered}"> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectBooleanCheckbox> + <h:outputText value="Test5" /> + <a4j:commandButton action="#{tooltip.bTest5}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + <h:outputText value="#{msg.t5Tooltip}"/> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -8,6 +8,9 @@ nodeFace="#{data.name != 'param-value' ? 'input' : 'text'}" changeExpandListener="#{bean.onExpand}" nodeSelectListener="#{bean.onSelect}" binding="#{bean.tree}" onselected="window.status='selectedNode: '+event.selectedNode;" onexpand="window.status='expandedNode: '+event.expandedNode" oncollapse="window.status='collapsedNode: '+ event.collapsedNode" + ajaxSubmitSelection="true" reRender="outputText, selectOneListbox" preserveModel="none" dragIndicator="treeIndicator" + immediate="false" acceptedTypes="file1" dragType="#{bean.dragOn ? 'file1' : ''}" iconCollapsed="#{bean.iconCollapsed}" + iconExpanded="#{bean.iconExpanded}" iconLeaf="#{bean.iconLeaf}" icon="#{bean.icon}" dropListener="#{bean.processDrop}" onclick="print('onclickInputID', 'onclick work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" ondragend="print('ondragendInputID', 'ondragend work!')" ondragenter="print('ondragenterInputID', 'ondragenter work!')" ondragexit="print('ondragexitInputID', 'ondragexit work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" @@ -15,10 +18,7 @@ onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" - onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" - ajaxSubmitSelection="true" reRender="outputText, selectOneListbox" preserveModel="none" dragIndicator="treeIndicator" - immediate="false" acceptedTypes="file1" dragType="#{bean.dragOn ? 'file1' : ''}" iconCollapsed="#{bean.iconCollapsed}" - iconExpanded="#{bean.iconExpanded}" iconLeaf="#{bean.iconLeaf}" icon="#{bean.icon}" dropListener="#{bean.processDrop}"> + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"> <f:facet name="icon"> <h:outputText value="icon" rendered="#{bean.renderFacets}" /> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ContextMenu.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ContextMenu.xml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ContextMenu.xml 2007-11-27 13:12:27 UTC (rev 4283) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" + "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>contextMenu</managed-bean-name> + <managed-bean-class>ContextMenu.ContextMenu</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataDefinitionList.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataDefinitionList.xml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataDefinitionList.xml 2007-11-27 13:12:27 UTC (rev 4283) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" + "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>dataDefinitionList</managed-bean-name> + <managed-bean-class>dataDefinitionList.DataDefinitionList</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataOrderedList.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataOrderedList.xml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataOrderedList.xml 2007-11-27 13:12:27 UTC (rev 4283) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>dataOrderedList</managed-bean-name> + <managed-bean-class>dataOrderedList.DataOrderedList</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-11-27 13:12:27 UTC (rev 4283) @@ -34,17 +34,18 @@ <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> <param-value>/WEB-INF/faces-config-RichPanelsBean.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml, - /WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml, - /WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml, - /WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml, - /WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml, - /WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml, - /WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml, - /WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml, - /WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml, - /WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml, - /WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml, - /WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml</param-value> + /WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml, + /WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml, + /WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml, + /WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml, + /WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml, + /WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml, + /WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml, + /WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml, + /WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml, + /WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml, + /WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml, + /WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml</param-value> </context-param> <filter> <display-name>Ajax4jsf Filter</display-name> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -86,7 +86,7 @@ <rich:jQuery selector="#panelGridID tr" query="mouseout(function(){jQuery(this).removeClass('activeTable')})"/> <rich:jQuery selector="#div_2_ID" timing="onload" query="mouseover(function(){jQuery(this).fadeOut({height: 'hide'}, 500).text('New text').animate({height: 'show'}, 500)})" /> - <rich:jQuery selector="p" timing="onload" query="find('span').html('text1').end().append('<p class=\'fontColor\'>add text3<p>')"/> + <rich:jQuery selector="p" timing="onload" query="find('span').html('text1').end().append('<p class=\'fontColor\'>add text3<p>')"/> <rich:jQuery selector="#div_1_ID" timing="onload" query="addClass('divSize_1')" /> <rich:jQuery selector=".divSize_1" timing="onload" query="addClass('divColor_1')" /> <rich:jQuery selector="#panelGridID #div_1_ID" timing="onload" query="addClass('divTextSize_1')" /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -2,11 +2,10 @@ xmlns:rich="http://richfaces.org/rich" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - - - - <f:verbatim><div style="position: relative"> + <input id="onmousemoveInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> <input id="ontabenterInputID" type="hidden" value="don't work!" size="42" /> </div></f:verbatim> <f:verbatim><div style="position: relative"> @@ -115,15 +114,9 @@ <input id="onmousedownInputID" type="hidden" value="don't work!" size="42" /> </div></f:verbatim> <f:verbatim><div style="position: relative"> - <input id="onmousemoveInputID" type="hidden" value="don't work!" size="42" /> - </div></f:verbatim> - <f:verbatim><div style="position: relative"> <input id="onmouseoutInputID" type="hidden" value="don't work!" size="42" /> </div></f:verbatim> <f:verbatim><div style="position: relative"> - <input id="onmouseoverInputID" type="hidden" value="don't work!" size="42" /> - </div></f:verbatim> - <f:verbatim><div style="position: relative"> <input id="onmouseupInputID" type="hidden" value="don't work!" size="42" /> </div></f:verbatim> <f:verbatim><div style="position: relative"> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -1,18 +1,15 @@ <!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:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <f:view> <head> <f:loadBundle basename="message" var="msg" /> <title></title> - + <script type="text/javascript"> function print(elementID, value) { var oldObject = window.document.getElementById(elementID); + if(oldObject == null || oldObject.type == "text") return; var newObject = window.document.createElement('input'); newObject.type = "text"; newObject.size = oldObject.size; @@ -26,31 +23,41 @@ oldObject.parentNode.replaceChild(newObject,oldObject); } </script> - <link rel="stylesheet" - href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" - type="text/css" /> + <link rel="stylesheet" href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" type="text/css" /> </head> <body> - <div id="divOpthID" align="right" style="z-index: 200"> - <ui:include src="/pages/RichMenu/RichMenu.xhtml" /> - </div> - <h:form> - <ui:include src="${richBean.pathComponent}" /> - <ui:include src="${richBean.pathStraightforward}" /> - <ui:include src="${richBean.pathProperty}" /> - </h:form> - <rich:modalPanel id="eventInfoID" autosize="true" minHeight="550" minWidth="200" moveable="true" resizeable="true" style="overflow: true;"> - <f:facet name="header"> - <h:outputText value="Events ..." /> - </f:facet> - <f:facet name="controls"> - <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');"/> - </f:facet> - - <ui:include src="/pages/Action/EventInfo.xhtml" /> - - </rich:modalPanel> - <a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> + <div id="divOpthID" align="right" style="z-index: 200"><ui:include src="/pages/RichMenu/RichMenu.xhtml" /></div> + <h:form> + <h:panelGrid id="richGridID" columns="1"> + <h:column rendered="#{richBean.reComponent}"> + <ui:include src="${richBean.pathComponent}" /> + </h:column> + <h:column rendered="#{!richBean.reComponent}"></h:column> + + <h:column rendered="#{richBean.reStraightforward}"> + <ui:include src="${richBean.pathStraightforward}" /> + </h:column> + <h:column rendered="#{!richBean.reStraightforward}"></h:column> + + <h:column rendered="#{richBean.reProperty}"> + <ui:include src="${richBean.pathProperty}" /> + </h:column> + <h:column rendered="#{!richBean.reProperty}"></h:column> + </h:panelGrid> + </h:form> + <rich:modalPanel id="eventInfoID" autosize="true" minHeight="550" minWidth="200" moveable="true" resizeable="true" + style="overflow: true;"> + <f:facet name="header"> + <h:outputText value="Events ..." /> + </f:facet> + <f:facet name="controls"> + <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');" /> + </f:facet> + + <ui:include src="/pages/Action/EventInfo.xhtml" /> + + </rich:modalPanel> + <a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> </body> </f:view> </html> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-11-27 12:20:32 UTC (rev 4282) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-11-27 13:12:27 UTC (rev 4283) @@ -1,54 +1,67 @@ <h:form id="forvDivOpthID" xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> - <rich:toolBar itemSeparator="none" > - <rich:toolBarGroup location="right"> - <h:panelGrid columns="1"> - <h:outputText value="Select skin: " /> - <h:selectOneMenu binding="#{skinBean.component}" onblur="submit();"> - <a4j:support action="#{skinBean.change}" event="onchange"/> - </h:selectOneMenu> - </h:panelGrid> - </rich:toolBarGroup> + <h:panelGrid columns="3"> + <h:panelGrid columns="1"> + <h:panelGroup> + <h:outputText value="#{richBean.reComponent ? 'Component hide' : 'Component show'}" /> + <h:selectBooleanCheckbox value="#{richBean.reComponent}" onchange="submit();" /> + </h:panelGroup> + <h:panelGroup> + <h:outputText value="#{richBean.reStraightforward ? 'Straightforward hide' : 'Straightforward show'}" /> + <h:selectBooleanCheckbox value="#{richBean.reStraightforward}" onchange="submit();" /> + </h:panelGroup> + <h:panelGroup> + <h:outputText value="#{richBean.reProperty ? 'Property hide' : 'Property show'}" /> + <h:selectBooleanCheckbox value="#{richBean.reProperty}" onchange="submit();" /> + </h:panelGroup> + </h:panelGrid> - <rich:toolBarGroup location="right"> - <h:panelGrid columns="1"> - <h:outputText value="Select component:" /> - <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> - <f:selectItem itemValue="Blank" itemLabel="Blank" /> - <f:selectItem itemValue="OrderingList" itemLabel="OrderingList" /> - <f:selectItem itemValue="Calendar" itemLabel="Calendar" /> - <f:selectItem itemValue="DataFilterSlider" itemLabel="Data Filter Slider" /> - <f:selectItem itemValue="DataScroller" itemLabel="Date Scroller" /> - <f:selectItem itemValue="DataTable" itemLabel="Date Table" /> - <f:selectItem itemValue="DragAndDrop" itemLabel="Drag And Drop" /> - <f:selectItem itemValue="DropDownMenu" itemLabel="Drop Down Menu" /> - <f:selectItem itemValue="Effect" itemLabel="Effect" /> - <f:selectItem itemValue="Gmap" itemLabel="Gmap" /> - <f:selectItem itemValue="InputNumberSlider" itemLabel="Input Number Slider" /> - <f:selectItem itemValue="InputNumberSpinner" itemLabel="Input Number Spinner" /> - <f:selectItem itemValue="Insert" itemLabel="Insert" /> - <f:selectItem itemValue="Message" itemLabel="Message" /> - <f:selectItem itemValue="ModalPanel" itemLabel="Modal Panel" /> - <f:selectItem itemValue="Paint2D" itemLabel="Paint2D" /> - <f:selectItem itemValue="Panel" itemLabel="Panel" /> - <f:selectItem itemValue="Panel2" itemLabel="Panel2" /> - <f:selectItem itemValue="PanelBar" itemLabel="Panel Bar" /> - <f:selectItem itemValue="PanelMenu" itemLabel="Panel Menu" /> - <f:selectItem itemValue="Separator" itemLabel="Separator" /> - <f:selectItem itemValue="SimpleTogglePanel" itemLabel="Simple Toggle Panel" /> - <f:selectItem itemValue="Spacer" itemLabel="Spacer" /> - <f:selectItem itemValue="SuggestionBox" itemLabel="Suggestion Box" /> - <f:selectItem itemValue="TabPanel" itemLabel="Tab Panel" /> - <f:selectItem itemValue="TogglePanel" itemLabel="Toggle Panel" /> - <f:selectItem itemValue="ToolBar" itemLabel="Tool Bar" /> - <f:selectItem itemValue="Tooltip" itemLabel="Tooltip" /> - <f:selectItem itemValue="Tree" itemLabel="Tree" /> - <f:selectItem itemValue="VirtualEarth" itemLabel="Virtual Earth" /> - <f:selectItem itemValue="ScrollableDataTable" itemLabel="ScrollableDataTable" /> - <f:selectItem itemValue="jQuery" itemLabel="jQuery" /> - </h:selectOneMenu> - </h:panelGrid> - </rich:toolBarGroup> - </rich:toolBar> + <h:panelGrid columns="1"> + <h:outputText value="Select skin: " /> + <h:selectOneMenu binding="#{skinBean.component}" onblur="submit();"> + <a4j:support action="#{skinBean.change}" event="onchange" /> + </h:selectOneMenu> + </h:panelGrid> + + <h:panelGrid columns="1"> + <h:outputText value="Select component:" /> + <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> + <f:selectItem itemValue="Blank" itemLabel="Blank" /> + <f:selectItem itemValue="OrderingList" itemLabel="OrderingList" /> + <f:selectItem itemValue="Calendar" itemLabel="Calendar" /> + <f:selectItem itemValue="DataFilterSlider" itemLabel="Data Filter Slider" /> + <f:selectItem itemValue="DataScroller" itemLabel="Date Scroller" /> + <f:selectItem itemValue="DataTable" itemLabel="Date Table" /> + <f:selectItem itemValue="DataDefinitionList" itemLabel="DataDefinitionList" /> + <f:selectItem itemValue="DataOrderedList" itemLabel="DataOrderedList" /> + <f:selectItem itemValue="DragAndDrop" itemLabel="Drag And Drop" /> + <f:selectItem itemValue="DropDownMenu" itemLabel="Drop Down Menu" /> + <f:selectItem itemValue="Effect" itemLabel="Effect" /> + <f:selectItem itemValue="Gmap" itemLabel="Gmap" /> + <f:selectItem itemValue="InputNumberSlider" itemLabel="Input Number Slider" /> + <f:selectItem itemValue="InputNumberSpinner" itemLabel="Input Number Spinner" /> + <f:selectItem itemValue="Insert" itemLabel="Insert" /> + <f:selectItem itemValue="Message" itemLabel="Message" /> + <f:selectItem itemValue="ModalPanel" itemLabel="Modal Panel" /> + <f:selectItem itemValue="Paint2D" itemLabel="Paint2D" /> + <f:selectItem itemValue="Panel" itemLabel="Panel" /> + <f:selectItem itemValue="Panel2" itemLabel="Panel2" /> + <f:selectItem itemValue="PanelBar" itemLabel="Panel Bar" /> + <f:selectItem itemValue="PanelMenu" itemLabel="Panel Menu" /> + <f:selectItem itemValue="Separator" itemLabel="Separator" /> + <f:selectItem itemValue="SimpleTogglePanel" itemLabel="Simple Toggle Panel" /> + <f:selectItem itemValue="Spacer" itemLabel="Spacer" /> + <f:selectItem itemValue="SuggestionBox" itemLabel="Suggestion Box" /> + <f:selectItem itemValue="TabPanel" itemLabel="Tab Panel" /> + <f:selectItem itemValue="TogglePanel" itemLabel="Toggle Panel" /> + <f:selectItem itemValue="ToolBar" itemLabel="Tool Bar" /> + <f:selectItem itemValue="Tooltip" itemLabel="Tooltip" /> + <f:selectItem itemValue="Tree" itemLabel="Tree" /> + <f:selectItem itemValue="VirtualEarth" itemLabel="Virtual Earth" /> + <f:selectItem itemValue="ScrollableDataTable" itemLabel="ScrollableDataTable" /> + <f:selectItem itemValue="jQuery" itemLabel="jQuery" /> + </h:selectOneMenu> + </h:panelGrid> + </h:panelGrid> <h:commandLink value="Back" action="main"></h:commandLink> </h:form>

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4282 - management.

by richfaces-svn-commits＠lists.jboss.org

Author: viktor_volkov Date: 2007-11-27 07:20:32 -0500 (Tue, 27 Nov 2007) New Revision: 4282 Modified: management/ Log: Property changes on: management ___________________________________________________________________ Name: svn:ignore + .project

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4281 - branches/3.1.x/ui.

by richfaces-svn-commits＠lists.jboss.org

Author: viktor_volkov Date: 2007-11-27 06:17:30 -0500 (Tue, 27 Nov 2007) New Revision: 4281 Modified: branches/3.1.x/ui/ Log: Property changes on: branches/3.1.x/ui ___________________________________________________________________ Name: svn:ignore - target + target build.bat

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4280 - in branches/3.1.x/ui/orderingList/src: main/java/org/richfaces/component and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-11-26 21:52:11 -0500 (Mon, 26 Nov 2007) New Revision: 4280 Modified: branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/Control.js branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js branches/3.1.x/ui/orderingList/src/test/java/org/richfaces/component/OrderingListComponentTest.java Log: latest changes for listShuttle & orderingList Modified: branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml =================================================================== --- branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml 2007-11-27 02:52:02 UTC (rev 4279) +++ branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml 2007-11-27 02:52:11 UTC (rev 4280) @@ -180,7 +180,7 @@ <defaultvalue>true</defaultvalue> </property> - <property> + <property elonly="true"> <name>selection</name> <description>Collection which stores a set of selected items</description> </property> Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2007-11-27 02:52:02 UTC (rev 4279) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2007-11-27 02:52:11 UTC (rev 4280) @@ -3,10 +3,13 @@ */ package org.richfaces.component; +import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -19,6 +22,7 @@ import javax.faces.component.UIComponentBase; import javax.faces.component.UIInput; import javax.faces.context.FacesContext; +import javax.faces.convert.ConverterException; import javax.faces.el.EvaluationException; import javax.faces.el.MethodBinding; import javax.faces.el.ValueBinding; @@ -29,6 +33,7 @@ import org.ajax4jsf.component.UIDataAdaptor; import org.ajax4jsf.model.DataComponentState; +import org.ajax4jsf.model.DataVisitor; import org.ajax4jsf.model.RepeatState; import org.apache.commons.collections.Predicate; import org.apache.commons.collections.iterators.EmptyIterator; @@ -45,6 +50,12 @@ private Object value; private boolean localValueSet; + private Collection selection; + private boolean selectionSet; + + private Object activeItem; + private boolean activeItemSet; + private List validators = null; private MethodBinding validator; @@ -68,8 +79,20 @@ private boolean translatedRendering = false; } - private static final class ValueHolder { + private static final class ValueHolder implements Serializable { + /** + * + */ + private static final long serialVersionUID = 2349104220087787755L; + private Object value; + + private Collection selection; + private boolean selectionSet; + + private Object activeItem; + private boolean activeItemSet; + private Object state; } @@ -123,8 +146,10 @@ } } + public abstract Object getTranslatedRowKey(); + public Object saveState(FacesContext faces) { - Object[] state = new Object[5]; + Object[] state = new Object[9]; state[0] = super.saveState(faces); @@ -134,6 +159,41 @@ state[3] = this.value; state[4] = localValueSet ? Boolean.TRUE : Boolean.FALSE; + final HashSet selectionKeySet = new HashSet(); + final HashSet activeItemSet = new HashSet(1); + + Object rowKey = getRowKey(); + try { + walk(faces, new DataVisitor() { + + public void process(FacesContext context, Object rowKey, + Object argument) throws IOException { + + setRowKey(context, rowKey); + Object data = getRowData(); + if (data.equals(activeItem)) { + activeItemSet.add(getTranslatedRowKey()); + } + + if (selection != null && selection.contains(data)) { + selectionKeySet.add(getTranslatedRowKey()); + } + + } + + }, null); + } catch (IOException e) { + throw new FacesException(e.getLocalizedMessage(), e); + } + + setRowKey(rowKey); + + state[5] = selectionKeySet; + state[6] = this.selectionSet ? Boolean.TRUE : Boolean.FALSE; + + state[7] = activeItemSet.isEmpty() ? null : activeItemSet.iterator().next(); + state[8] = this.activeItemSet ? Boolean.TRUE : Boolean.FALSE; + return state; } @@ -147,6 +207,12 @@ value = state[3]; localValueSet = ((Boolean) state[4]).booleanValue(); + + this.selection = (Collection) state[5]; + this.selectionSet = ((Boolean) state[6]).booleanValue(); + + this.activeItem = state[7]; + this.activeItemSet = ((Boolean) state[8]).booleanValue(); } protected DataComponentState createComponentState() { @@ -217,11 +283,17 @@ } public Object getLocalValue() { - ValueHolder valueHolder = new ValueHolder(); - valueHolder.value = this.value; - valueHolder.state = saveIterationState(); + ValueHolder holder = new ValueHolder(); + holder.value = this.value; + holder.selection = this.selection; + holder.selectionSet = this.selectionSet; - return valueHolder; + holder.activeItem = this.activeItem; + holder.activeItemSet = this.activeItemSet; + + holder.state = saveIterationState(); + + return holder; } public void setValue(Object value) { @@ -230,6 +302,12 @@ setValue(holder.value); restoreIterationState(holder.state); + + this.selection = holder.selection; + this.selectionSet = holder.selectionSet; + + this.activeItem = holder.activeItem; + this.activeItemSet = holder.activeItemSet; } else { super.setValue(value); this.value = value; @@ -310,6 +388,8 @@ return; } + convertState(context); + super.processDecodes(context); if (isImmediate()) { @@ -408,6 +488,51 @@ public void execute(FacesContext context); } + protected final UpdateModelCommand updateValueCommand = new UpdateModelCommand() { + + public void execute(FacesContext context) { + if (isLocalValueSet()) { + ValueBinding vb = getValueBinding("value"); + if (vb != null) { + vb.setValue(context, getLocalValueFieldValue()); + setValue(null); + setLocalValueSet(false); + } + } + } + + }; + + protected final UpdateModelCommand updateSelectionCommand = new UpdateModelCommand() { + + public void execute(FacesContext context) { + if (selectionSet) { + ValueBinding vb = getValueBinding("selection"); + if (vb != null) { + vb.setValue(context, selection); + selection = null; + selectionSet = false; + } + } + } + + }; + + protected final UpdateModelCommand updateActiveItemCommand = new UpdateModelCommand() { + + public void execute(FacesContext context) { + if (activeItemSet) { + ValueBinding vb = getValueBinding("activeItem"); + if (vb != null) { + vb.setValue(context, activeItem); + activeItem = null; + activeItemSet = false; + } + } + } + + }; + protected void updateModel(FacesContext context, UpdateModelCommand command) { try { command.execute(context); @@ -469,4 +594,108 @@ } + protected void addConversionErrorMessage(FacesContext context, + ConverterException ce, Object value) { + FacesMessage message = ce.getFacesMessage(); + if (message == null) { + message = MessageFactory.getMessage(context, + UIInput.CONVERSION_MESSAGE_ID); + if (message.getDetail() == null) { + message.setDetail(ce.getMessage()); + } + } + + message.setSeverity(FacesMessage.SEVERITY_ERROR); + context.addMessage(getClientId(context), message); + } + + protected boolean isEmpty(Object value) { + + if (value == null) { + return (true); + } else if ((value instanceof String) && + (((String) value).length() < 1)) { + return (true); + } else if (value.getClass().isArray()) { + if (0 == java.lang.reflect.Array.getLength(value)) { + return (true); + } + } + else if (value instanceof List) { + if (0 == ((List) value).size()) { + return (true); + } + } + return (false); + } + + public Collection getSelection() { + if (this.selection != null) { + return this.selection; + } else { + ValueBinding vb = getValueBinding("selection"); + if (vb != null) { + return (Collection) vb.getValue(FacesContext.getCurrentInstance()); + } + } + + return null; + } + + public void setSelection(Collection collection) { + this.selection = collection; + this.selectionSet = true; + } + + public Object getActiveItem() { + if (this.activeItem != null) { + return this.activeItem; + } else { + ValueBinding vb = getValueBinding("activeItem"); + if (vb != null) { + return vb.getValue(FacesContext.getCurrentInstance()); + } + } + + return null; + } + + public void setActiveItem(Object activeItem) { + this.activeItem = activeItem; + this.activeItemSet = true; + } + + private void convertState(FacesContext faces) { + Object rowKey = getRowKey(); + + final HashSet selectionItemsSet = new HashSet(); + try { + walk(faces, new DataVisitor() { + + public void process(FacesContext context, Object rowKey, + Object argument) throws IOException { + + setRowKey(context, rowKey); + + if (selection != null && selection.contains(rowKey)) { + selectionItemsSet.add(getRowData()); + } + + if (rowKey.equals(activeItem)) { + activeItem = getRowData(); + } + } + + }, null); + } catch (IOException e) { + throw new FacesException(e.getLocalizedMessage(), e); + } + + if (this.selection != null) { + this.selection = selectionItemsSet; + } + + setRowKey(rowKey); + } + } Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-27 02:52:02 UTC (rev 4279) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-27 02:52:11 UTC (rev 4280) @@ -1,10 +1,8 @@ package org.richfaces.component; -import java.io.IOException; import java.io.Serializable; import java.lang.reflect.Array; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -34,24 +32,11 @@ import javax.faces.validator.ValidatorException; import org.ajax4jsf.javascript.ScriptUtils; -import org.ajax4jsf.model.DataVisitor; import org.ajax4jsf.model.ExtendedDataModel; import org.richfaces.model.TranslatedSequenceDataModel; public abstract class UIOrderingList extends UIOrderingBaseComponent { - protected static final class ValueHolder implements Serializable { - /** - * - */ - private static final long serialVersionUID = 2124352131407581704L; - private Collection selection; - private boolean selectionSet; - - private Object activeItem; - private boolean activeItemSet; - } - protected static final class SubmittedValue implements Serializable { /** * @@ -98,7 +83,7 @@ for (int i = 0; i < permutationOrder.length; i++) { result.append(permutationOrder[i]); - Integer key = new Integer(i); + Integer key = new Integer(permutationOrder[i]); if (selectedItems.contains(key)) { result.append('s'); @@ -127,21 +112,15 @@ } private final class SubmittedItemState implements ItemState { - private Collection selectedItemsKeys; - private Object activeItemKey; - public SubmittedItemState(Collection selectedItemsKeys, Integer activeItemKey) { - super(); - this.selectedItemsKeys = selectedItemsKeys; - this.activeItemKey = activeItemKey; - } - public boolean isActive() { - return activeItemKey != null && activeItemKey.equals(getTranslatedRowKey()); + return submittedValueHolder.activeItem != null && + submittedValueHolder.activeItem.equals(getTranslatedRowKey()); } public boolean isSelected() { - return selectedItemsKeys != null && selectedItemsKeys.contains(getTranslatedRowKey()); + return submittedValueHolder.selectedItems != null && + submittedValueHolder.selectedItems.contains(getTranslatedRowKey()); } } @@ -174,102 +153,8 @@ } } - - private Collection localSelection; - private boolean localSelectionSet; - - private Object localActiveItem; - private boolean localActiveItemSet; - private transient SubmittedValue submittedValueHolder = null; - private void convertState(FacesContext faces) { - Object rowKey = getRowKey(); - - final HashSet selectionItemsSet = new HashSet(); - try { - walk(faces, new DataVisitor() { - - public void process(FacesContext context, Object rowKey, - Object argument) throws IOException { - - setRowKey(context, rowKey); - - if (localSelection != null && localSelection.contains(rowKey)) { - selectionItemsSet.add(getRowData()); - } - - if (rowKey.equals(localActiveItem)) { - localActiveItem = getRowData(); - } - } - - }, null); - } catch (IOException e) { - throw new FacesException(e.getLocalizedMessage(), e); - } - - if (this.localSelection != null) { - this.localSelection = selectionItemsSet; - } - - setRowKey(rowKey); - } - - public void restoreState(FacesContext faces, Object object) { - final Object[] state = (Object[]) object; - super.restoreState(faces, state[0]); - - localSelectionSet = ((Boolean) state[3]).booleanValue(); - localActiveItemSet = ((Boolean) state[4]).booleanValue(); - - localSelection = (Collection) state[5]; - localActiveItem = state[6]; - } - - public Object saveState(FacesContext faces) { - Object[] state = new Object[7]; - state[0] = super.saveState(faces); - - state[3] = localSelectionSet ? Boolean.TRUE : Boolean.FALSE; - state[4] = localActiveItemSet ? Boolean.TRUE : Boolean.FALSE; - - final HashSet selectionKeySet = new HashSet(); - final HashSet activeItemSet = new HashSet(1); - - Object rowKey = getRowKey(); - try { - walk(faces, new DataVisitor() { - - public void process(FacesContext context, Object rowKey, - Object argument) throws IOException { - - setRowKey(context, rowKey); - Object data = getRowData(); - if (data.equals(localActiveItem)) { - activeItemSet.add(getTranslatedRowKey()); - } - - if (localSelection != null && localSelection.contains(data)) { - selectionKeySet.add(getTranslatedRowKey()); - } - - } - - }, null); - } catch (IOException e) { - throw new FacesException(e.getLocalizedMessage(), e); - } - - setRowKey(rowKey); - - state[5] = selectionKeySet; - - state[6] = activeItemSet.isEmpty() ? null : activeItemSet.iterator().next(); - - return state; - } - public void addValueChangeListener(ValueChangeListener listener) { addFacesListener(listener); } @@ -310,25 +195,10 @@ } protected Object saveIterationState() { - ValueHolder holder = new ValueHolder(); - - holder.selection = localSelection; - holder.selectionSet = localSelectionSet; - - holder.activeItem = localActiveItem; - holder.activeItemSet = localActiveItemSet; - - return holder; + return null; } protected void restoreIterationState(Object object) { - ValueHolder holder = (ValueHolder) object; - - this.localSelection = holder.selection; - this.localSelectionSet = holder.selectionSet; - - this.localActiveItem = holder.activeItem; - this.localActiveItemSet = holder.activeItemSet; } public abstract void setImmediate(boolean immediate); @@ -355,8 +225,6 @@ */ public void processDecodes(FacesContext context) { - convertState(context); - if (context == null) { throw new NullPointerException(); } @@ -453,51 +321,6 @@ } - private final UpdateModelCommand updateValueCommand = new UpdateModelCommand() { - - public void execute(FacesContext context) { - if (isLocalValueSet()) { - ValueBinding vb = getValueBinding("value"); - if (vb != null) { - vb.setValue(context, getLocalValueFieldValue()); - setValue(null); - setLocalValueSet(false); - } - } - } - - }; - - private final UpdateModelCommand updateSelectionCommand = new UpdateModelCommand() { - - public void execute(FacesContext context) { - if (localSelectionSet) { - ValueBinding vb = getValueBinding("selection"); - if (vb != null) { - vb.setValue(context, localSelection); - localSelection = null; - localSelectionSet = false; - } - } - } - - }; - - private final UpdateModelCommand updateActiveItemCommand = new UpdateModelCommand() { - - public void execute(FacesContext context) { - if (localActiveItemSet) { - ValueBinding vb = getValueBinding("activeItem"); - if (vb != null) { - vb.setValue(context, localActiveItem); - localActiveItem = null; - localActiveItemSet = false; - } - } - } - - }; - /** * <p>Perform the following algorithm to update the model data * associated with this {@link UIInput}, if any, as appropriate.</p> @@ -783,47 +606,10 @@ } } - - - private boolean isEmpty(Object value) { - - if (value == null) { - return (true); - } else if ((value instanceof String) && - (((String) value).length() < 1)) { - return (true); - } else if (value.getClass().isArray()) { - if (0 == java.lang.reflect.Array.getLength(value)) { - return (true); - } - } - else if (value instanceof List) { - if (0 == ((List) value).size()) { - return (true); - } - } - return (false); - } - public Object getTranslatedRowKey() { return ((TranslatedSequenceDataModel) getExtendedDataModel()).getTranslatedRowKey(); } - private void addConversionErrorMessage(FacesContext context, - ConverterException ce, Object value) { - FacesMessage message = ce.getFacesMessage(); - if (message == null) { - message = MessageFactory.getMessage(context, - UIInput.CONVERSION_MESSAGE_ID); - if (message.getDetail() == null) { - message.setDetail(ce.getMessage()); - } - } - - message.setSeverity(FacesMessage.SEVERITY_ERROR); - context.addMessage(getClientId(context), message); - } - public String getElementsOrder() { Object order = null; @@ -838,48 +624,12 @@ public ItemState getItemState() { if (submittedValueHolder != null) { - return new SubmittedItemState(submittedValueHolder.selectedItems, submittedValueHolder.activeItem); + return new SubmittedItemState(); } else { return new ModelItemState(getSelection(), getActiveItem()); } } - public Collection getSelection() { - if (this.localSelection != null) { - return this.localSelection; - } else { - ValueBinding vb = getValueBinding("selection"); - if (vb != null) { - return (Collection) vb.getValue(FacesContext.getCurrentInstance()); - } - } - - return null; - } - - public void setSelection(Collection collection) { - this.localSelection = collection; - this.localSelectionSet = true; - } - - public Object getActiveItem() { - if (this.localActiveItem != null) { - return this.localActiveItem; - } else { - ValueBinding vb = getValueBinding("activeItem"); - if (vb != null) { - return vb.getValue(FacesContext.getCurrentInstance()); - } - } - - return null; - } - - public void setActiveItem(Object activeItem) { - this.localActiveItem = activeItem; - this.localActiveItemSet = true; - } - /*public abstract boolean isOrderControlsVisible(); public abstract void setOrderControlsVisible(boolean visible); Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/Control.js =================================================================== --- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/Control.js 2007-11-27 02:52:02 UTC (rev 4279) +++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/Control.js 2007-11-27 02:52:11 UTC (rev 4280) @@ -1,6 +1,16 @@ -Control = function(eNode, dNode, isShown, isEnabled, action) { +Control = Class.create(); + +Control.eventStub = function() { + return false; +} + +Control.prototype.initialize = function(eNode, dNode, isShown, isEnabled, action) { this.disabledNode = dNode; + this.disabledNode.onselectstart = Control.eventStub; + this.enabledNode = eNode + this.enabledNode.onselectstart = Control.eventStub; + this.isShown = isShown; this.isEnabled = isEnabled; this.action = action; Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js =================================================================== --- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js 2007-11-27 02:52:02 UTC (rev 4279) +++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js 2007-11-27 02:52:11 UTC (rev 4280) @@ -158,7 +158,7 @@ Richfaces.OrderingList.ITEM_SEPARATOR = ","; Richfaces.OrderingList.HANDLERS = { - first: function (e) { this.moveSelectedItems("first", e);return false; }, + first: function (e) { this.moveSelectedItems("first", e); return false; }, last: function (e) { this.moveSelectedItems("last", e);return false; }, up: function (e) { this.moveSelectedItems("up", e);return false; }, down: function (e) { this.moveSelectedItems("down", e);return false; } Modified: branches/3.1.x/ui/orderingList/src/test/java/org/richfaces/component/OrderingListComponentTest.java =================================================================== --- branches/3.1.x/ui/orderingList/src/test/java/org/richfaces/component/OrderingListComponentTest.java 2007-11-27 02:52:02 UTC (rev 4279) +++ branches/3.1.x/ui/orderingList/src/test/java/org/richfaces/component/OrderingListComponentTest.java 2007-11-27 02:52:11 UTC (rev 4280) @@ -145,7 +145,7 @@ Object valueHolder = ((Object[])submittedValue)[0]; assertNotNull(valueHolder); assertTrue(valueHolder instanceof UIOrderingList.SubmittedValue); - assertEquals("1,0sa", valueHolder.toString()); + assertEquals("1sa,0", valueHolder.toString()); orderingList.setImmediate(true); orderingList.addValidator(new Validator() { @@ -225,7 +225,7 @@ Object valueHolder = ((Object[])submittedValue)[0]; assertNotNull(valueHolder); assertTrue(valueHolder instanceof UIOrderingList.SubmittedValue); - assertEquals("1,0sa", valueHolder.toString()); + assertEquals("1sa,0", valueHolder.toString()); } public void testSaveRestore() throws Exception {

16 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits November 2007