JBoss Rich Faces SVN: r4177 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2007-11-22 07:30:58 -0500 (Thu, 22 Nov 2007)
New Revision: 4177
Modified:
trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
Log:
RF-391- fix the description of 'selection' attribute
Modified: trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2007-11-22 12:07:03 UTC (rev 4176)
+++ trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2007-11-22 12:30:58 UTC (rev 4177)
@@ -132,10 +132,8 @@
</rich:scrollableDataTable>
...
]]></programlisting>
- <para>
- When using <property>one and multi-selection rows mode</property>you may need to access the selected rows in your script.
- In this case you can use the <emphasis><property>"selection"</property></emphasis> attribute. Simple code is placed below.
- </para>
+ <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. Simple code is placed below.</para>
<programlisting role="XML"><![CDATA[...
<rich:scrollableDataTable value="#{bean.property1}" var="cur" selection="#{bean.selection}">
<rich:column width="100px">
18 years, 5 months
JBoss Rich Faces SVN: r4176 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2007-11-22 07:07:03 -0500 (Thu, 22 Nov 2007)
New Revision: 4176
Modified:
trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
Log:
RF-391- edit the description of 'selection' attribute
Modified: trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2007-11-22 11:50:23 UTC (rev 4175)
+++ trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2007-11-22 12:07:03 UTC (rev 4176)
@@ -133,9 +133,8 @@
...
]]></programlisting>
<para>
- In order to access the selected rows in <emphasis role="bold">
- <property><rich:scrollableDataTable></property>
- </emphasis> component you can use the <emphasis><property>"selection"</property></emphasis> attribute. Simple code is placed below.
+ When using <property>one and multi-selection rows mode</property>you may need to access the selected rows in your script.
+ In this case you can use the <emphasis><property>"selection"</property></emphasis> attribute. Simple code is placed below.
</para>
<programlisting role="XML"><![CDATA[...
<rich:scrollableDataTable value="#{bean.property1}" var="cur" selection="#{bean.selection}">
@@ -148,7 +147,6 @@
<h:outputText value="State"/>
</f:facet>
</rich:column>
- <!--...//Set of columns and header/footer facets-->
</rich:scrollableDataTable>
...
]]></programlisting>
18 years, 5 months
JBoss Rich Faces SVN: r4175 - in branches/3.1.x/test-applications/jsp/src/main: java/rich and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-11-22 06:50:23 -0500 (Thu, 22 Nov 2007)
New Revision: 4175
Added:
branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-OrderingList.xml
Modified:
branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarBean.java
branches/3.1.x/test-applications/jsp/src/main/java/rich/MapComponent.java
branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java
branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/
branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/pages/main.jsp
Log:
add orderingList
Modified: branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarBean.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-11-22 10:07:27 UTC (rev 4174)
+++ branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-11-22 11:50:23 UTC (rev 4175)
@@ -29,7 +29,6 @@
import java.util.StringTokenizer;
import java.util.TimeZone;
-import javax.el.ValueExpression;
import javax.faces.event.ValueChangeEvent;
import org.richfaces.event.CurrentDateChangeEvent;
Modified: branches/3.1.x/test-applications/jsp/src/main/java/rich/MapComponent.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/rich/MapComponent.java 2007-11-22 10:07:27 UTC (rev 4174)
+++ branches/3.1.x/test-applications/jsp/src/main/java/rich/MapComponent.java 2007-11-22 11:50:23 UTC (rev 4175)
@@ -16,6 +16,6 @@
}
public ArrayList<String> get(String key){
- return m.get(key);
+ return m.get(key);
}
}
Modified: branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java 2007-11-22 10:07:27 UTC (rev 4174)
+++ branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java 2007-11-22 11:50:23 UTC (rev 4175)
@@ -41,6 +41,7 @@
map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {true, true}));
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}));
}
public String getSrc() {
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2007-11-22 10:07:27 UTC (rev 4174)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2007-11-22 11:50:23 UTC (rev 4175)
@@ -9,7 +9,7 @@
<f:verbatim>Suggestion Box will suggest you Town's names if it's started with the "a" or "A" letter
<br />
</f:verbatim>
- <h:inputText id="text" />
+ <h:inputText value="#{sb.property}" id="text" />
<rich:suggestionbox id="suggestionBoxId" for="text"
zindex="#{sb.zindex}" rules="#{sb.rules}" styleClass="styleClass"
suggestionAction="#{sb.autocomplete}" var="result"
Property changes on: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF
___________________________________________________________________
Name: svn:ignore
- *.jsfdia
lib
+ *.jsfdia
lib
classes
Added: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-OrderingList.xml
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-OrderingList.xml (rev 0)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-OrderingList.xml 2007-11-22 11:50:23 UTC (rev 4175)
@@ -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>orderingList</managed-bean-name>
+ <managed-bean-class>orderingList.OrderingList</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-11-22 10:07:27 UTC (rev 4174)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-11-22 11:50:23 UTC (rev 4175)
@@ -12,18 +12,18 @@
</context-param>
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/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-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-DragAndDrop.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-jQuery.xml,/WEB-INF/faces-config-Icon.xml</param-value>
+ <param-value>/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-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-DragAndDrop.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-jQuery.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-OrderingList.xml</param-value>
</context-param>
<context-param>
<param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2007-11-22 10:07:27 UTC (rev 4174)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2007-11-22 11:50:23 UTC (rev 4175)
@@ -19,6 +19,7 @@
<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" />
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/main.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-11-22 10:07:27 UTC (rev 4174)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-11-22 11:50:23 UTC (rev 4175)
@@ -12,7 +12,7 @@
<h:form id="mainFormID">
<rich:panel>
<f:verbatim>
- <div align="center"><font size="4" color="#191970">RichFaces Test Application (JSF 1.1RI(1.2RI) with Facelets)</font></div>
+ <div align="center"><font size="4" color="#191970">RichFaces Test Application (JSF 1.1RI(1.2RI))</font></div>
</f:verbatim>
</rich:panel>
<rich:spacer></rich:spacer>
18 years, 5 months
JBoss Rich Faces SVN: r4174 - in branches/3.1.x: framework and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: viktor_volkov
Date: 2007-11-22 05:07:27 -0500 (Thu, 22 Nov 2007)
New Revision: 4174
Modified:
branches/3.1.x/cdk/
branches/3.1.x/framework/
branches/3.1.x/test-applications/facelets/
Log:
Property changes on: branches/3.1.x/cdk
___________________________________________________________________
Name: svn:ignore
- target
+ target
*.bat
Property changes on: branches/3.1.x/framework
___________________________________________________________________
Name: svn:ignore
- target
+ target
build.bat
Property changes on: branches/3.1.x/test-applications/facelets
___________________________________________________________________
Name: svn:ignore
- target
.classpath
.project
.settings
+ target
.classpath
.project
.settings
build.bat
18 years, 5 months
JBoss Rich Faces SVN: r4173 - in branches/3.1.x/ui/tabPanel/src/main: resources/org/richfaces/renderkit/html/css and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-11-22 04:49:18 -0500 (Thu, 22 Nov 2007)
New Revision: 4173
Modified:
branches/3.1.x/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
branches/3.1.x/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss
Log:
RF-1376
Modified: branches/3.1.x/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
===================================================================
--- branches/3.1.x/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-11-22 09:22:18 UTC (rev 4172)
+++ branches/3.1.x/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-11-22 09:49:18 UTC (rev 4173)
@@ -147,7 +147,7 @@
String style = styleAttrValue != null ? styleAttrValue : "";
if (!parameterPresent(styleAttrValue, HTML.width_ATTRIBUTE)) {
- String width = (widthAttrValue != null && widthAttrValue.length() > 0) ? HtmlUtil.qualifySize(widthAttrValue) : "100%";
+ String width = (widthAttrValue != null && widthAttrValue.length() > 0) ? HtmlUtil.qualifySize(widthAttrValue) : "";
style = addParameter(style, HTML.width_ATTRIBUTE + ":" + width);
}
Modified: branches/3.1.x/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss
===================================================================
--- branches/3.1.x/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss 2007-11-22 09:22:18 UTC (rev 4172)
+++ branches/3.1.x/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss 2007-11-22 09:49:18 UTC (rev 4173)
@@ -58,6 +58,10 @@
<f:verbatim>
+.rich-tabpanel{
+ width:100%;
+}
+
.dr-tbpnl-cntnt {
border-bottom-width: 1px;
border-bottom-style: solid;
@@ -132,6 +136,11 @@
background-position: top;
cursor : default;
}
+
+.dr-tbpnl-tb-dsbl {
+ background-repeat: repeat-x;
+ background-position: center top;
+}
.dr-tbpnl-cntnt-pstn {
height:100%;
18 years, 5 months
JBoss Rich Faces SVN: r4172 - in trunk/ui/tabPanel/src/main: resources/org/richfaces/renderkit/html/css and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-11-22 04:22:18 -0500 (Thu, 22 Nov 2007)
New Revision: 4172
Modified:
trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss
Log:
RF-1376
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-11-22 09:11:26 UTC (rev 4171)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-11-22 09:22:18 UTC (rev 4172)
@@ -164,7 +164,7 @@
String style = styleAttrValue != null ? styleAttrValue : "";
if (!parameterPresent(styleAttrValue, HTML.width_ATTRIBUTE)) {
- String width = (widthAttrValue != null && widthAttrValue.length() > 0) ? HtmlUtil.qualifySize(widthAttrValue) : "100%";
+ String width = (widthAttrValue != null && widthAttrValue.length() > 0) ? HtmlUtil.qualifySize(widthAttrValue) : "";
style = addParameter(style, HTML.width_ATTRIBUTE + ":" + width);
}
Modified: trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss
===================================================================
--- trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss 2007-11-22 09:11:26 UTC (rev 4171)
+++ trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss 2007-11-22 09:22:18 UTC (rev 4172)
@@ -58,6 +58,10 @@
<f:verbatim>
+.rich-tabpanel{
+ width:100%;
+}
+
.dr-tbpnl-cntnt {
border-bottom-width: 1px;
border-bottom-style: solid;
18 years, 5 months
JBoss Rich Faces SVN: r4171 - in branches/3.1.x/test-applications/facelets/src/main: java/inputNumberSlider and 8 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-11-22 04:11:26 -0500 (Thu, 22 Nov 2007)
New Revision: 4171
Added:
branches/3.1.x/test-applications/facelets/src/main/resources/message_en.properties
branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml
Removed:
branches/3.1.x/test-applications/facelets/src/main/java/util/resources.properties
Modified:
branches/3.1.x/test-applications/facelets/src/main/java/ddMenu/DDMenu.java
branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java
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/webapp/Calendar/CalendarStraightforward.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/OrderingListProperty.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
Log:
Modified: branches/3.1.x/test-applications/facelets/src/main/java/ddMenu/DDMenu.java
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/java/ddMenu/DDMenu.java 2007-11-22 02:22:16 UTC (rev 4170)
+++ branches/3.1.x/test-applications/facelets/src/main/java/ddMenu/DDMenu.java 2007-11-22 09:11:26 UTC (rev 4171)
@@ -185,9 +185,8 @@
setGroupDirection("top-up");
setHideDelay(5);
setHorizontalOffset(1);
- setHorizontalOffset(1);
setVerticalOffset(1);
- setJointPoint("1px");
+ setJointPoint("top-left");
setMode("none");
setPopupWidth("300px");
setShowDelay(1);
@@ -201,7 +200,6 @@
setHideDelay(5);
setShowDelay(5);
setHorizontalOffset(20);
- setHorizontalOffset(20);
setVerticalOffset(20);
setJointPoint("bottom-right");
setMode("ajax");
@@ -216,7 +214,6 @@
setHideDelay(10);
setShowDelay(10);
setHorizontalOffset(5);
- setHorizontalOffset(5);
setVerticalOffset(5);
setJointPoint("top-left");
setMode("server");
@@ -231,9 +228,8 @@
setHideDelay(0);
setShowDelay(0);
setHorizontalOffset(0);
- setHorizontalOffset(0);
setVerticalOffset(0);
- setJointPoint("0px");
+ setJointPoint("auto");
setMode("ajax");
setPopupWidth("auto");
setDisabled(true);
@@ -246,7 +242,6 @@
setHideDelay(1);
setShowDelay(5);
setHorizontalOffset(2);
- setHorizontalOffset(2);
setVerticalOffset(2);
setJointPoint("auto");
setMode("ajax");
Modified: branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java 2007-11-22 02:22:16 UTC (rev 4170)
+++ branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java 2007-11-22 09:11:26 UTC (rev 4171)
@@ -299,7 +299,6 @@
setStep("50");
setShowToolTip(false);
setShowBoundaryValues(true);
- setShowInput(true);
}
public void bTest3(){
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-22 02:22:16 UTC (rev 4170)
+++ branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java 2007-11-22 09:11:26 UTC (rev 4171)
@@ -9,11 +9,10 @@
public class OrderingList{
private ArrayList<Data> list;
+ private Collection<Data> selection;
private String [] status = {"error", "fatal", "info", "passed", "warn"};
private String [] statusIcon = {"/pics/error.gif", "/pics/fatal.gif", "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif"};
private String captionLabel;
- private String listHeight;
- private String listWidth;
private String controlsType;
private String controlsVerticalAlign;
private String controlsHorizontalAlign;
@@ -22,13 +21,23 @@
private String upControlLabel;
private String topControlLabel;
private String downControlLabel;
- private Object componentState;
+ private int lenght;
+ private int listHeight;
+ private int listWidth;
private boolean orderControlsVisible;
private boolean fastOrderControlsVisible;
private boolean rendered;
private boolean showButtonLabels;
- private Collection<Data> selection;
+ private boolean facet;
+ public boolean isFacet() {
+ return facet;
+ }
+
+ public void setFacet(boolean facet) {
+ this.facet = facet;
+ }
+
public Collection<Data> getSelection() {
return selection;
}
@@ -46,12 +55,22 @@
this.list = list;
}
+ public void addNewItem() {
+ if(lenght < 0) lenght = 0;
+ if(list.size() > lenght)
+ for(int i = lenght; i < list.size(); )
+ list.remove(i);
+ else
+ for(int i = list.size() + 1; i <= lenght; i++)
+ list.add(new Data("Bug " + new Random().nextInt(10 + i), i,status[new Random().nextInt(5)], statusIcon[new Random().nextInt(5)]));
+ }
+
public OrderingList() {
captionLabel = "captionLabel";
- componentState = null;
- listHeight = "300";
- listWidth = "400";
- controlsType = "none";
+ lenght = 10;
+ listHeight = 300;
+ listWidth = 400;
+ controlsType = "button";
controlsHorizontalAlign = "0";
controlsVerticalAlign = "0";
headerLabel = "headerLabel";
@@ -59,29 +78,28 @@
upControlLabel = "up label";
downControlLabel = "down label";
topControlLabel = "top label";
- orderControlsVisible = false;
- fastOrderControlsVisible = false;
+ orderControlsVisible = true;
+ fastOrderControlsVisible = true;
rendered = true;
- showButtonLabels = false;
+ showButtonLabels = true;
list = new ArrayList<Data>();
- for(int i = 0; i < 10; i++) {
+ for(int i = 1; i <= lenght; i++)
list.add(new Data("Bug " + new Random().nextInt(10 + i), i,status[new Random().nextInt(5)], statusIcon[new Random().nextInt(5)]));
- }
}
- public String getListHeight() {
+ public int getListHeight() {
return listHeight;
}
- public void setListHeight(String listHeight) {
+ public void setListHeight(int listHeight) {
this.listHeight = listHeight;
}
- public String getListWidth() {
+ public int getListWidth() {
return listWidth;
}
- public void setListWidth(String listWidth) {
+ public void setListWidth(int listWidth) {
this.listWidth = listWidth;
}
@@ -125,14 +143,6 @@
this.topControlLabel = topControlLabel;
}
- public Object getComponentState() {
- return componentState;
- }
-
- public void setComponentState(boolean componentState) {
- this.componentState = componentState;
- }
-
public String getControlsVerticalAlign() {
return controlsVerticalAlign;
}
@@ -196,4 +206,112 @@
public void setShowButtonLabels(boolean showButtonLabels) {
this.showButtonLabels = showButtonLabels;
}
+
+ public int getLenght() {
+ return lenght;
+ }
+
+ public void setLenght(int lenght) {
+ this.lenght = lenght;
+ }
+
+ public void bTest1(){
+ setCaptionLabel("Caption Test1");
+ setControlsHorizontalAlign("0");
+ setControlsVerticalAlign("0");
+ setControlsType("button");
+ setHeaderLabel("Header Test1");
+ setLenght(40);
+ setListHeight(300);
+ setListWidth(400);
+ setFastOrderControlsVisible(true);
+ setOrderControlsVisible(true);
+ setRendered(true);
+ setShowButtonLabels(true);
+ setTopControlLabel("t1 top label");
+ setBottomControlLabel("t1 bottom label");
+ setUpControlLabel("t1 up label");
+ setDownControlLabel("t1 down label");
+ addNewItem();
+ }
+
+ public void bTest2(){
+ setCaptionLabel("Caption Test2");
+ setControlsHorizontalAlign("30");
+ setControlsVerticalAlign("50");
+ setControlsType("button");
+ setHeaderLabel("Header Test2");
+ setLenght(40);
+ setListHeight(600);
+ setListWidth(400);
+ setFastOrderControlsVisible(false);
+ setOrderControlsVisible(true);
+ setRendered(true);
+ setShowButtonLabels(true);
+ setTopControlLabel("t2");
+ setBottomControlLabel("t2");
+ setUpControlLabel("t2");
+ setDownControlLabel("t2");
+ addNewItem();
+ }
+
+ public void bTest3(){
+ setCaptionLabel("Caption Test3");
+ setControlsHorizontalAlign("50");
+ setControlsVerticalAlign("10");
+ setControlsType("button");
+ setHeaderLabel("Header Test3");
+ setLenght(40);
+ setListHeight(500);
+ setListWidth(500);
+ setFastOrderControlsVisible(true);
+ setOrderControlsVisible(false);
+ setRendered(true);
+ setShowButtonLabels(true);
+ setTopControlLabel("top");
+ setBottomControlLabel("bottom");
+ setUpControlLabel("up");
+ setDownControlLabel("down");
+ addNewItem();
+ }
+
+ public void bTest4(){
+ setCaptionLabel("Caption Test1");
+ setControlsHorizontalAlign("0");
+ setControlsVerticalAlign("0");
+ setControlsType("button");
+ setHeaderLabel("Header Test1");
+ setLenght(10000);
+ setListHeight(500);
+ setListWidth(600);
+ setFastOrderControlsVisible(true);
+ setOrderControlsVisible(true);
+ setRendered(true);
+ setShowButtonLabels(false);
+ setTopControlLabel("");
+ setBottomControlLabel("");
+ setUpControlLabel("");
+ setDownControlLabel("");
+ addNewItem();
+ }
+
+ public void bTest5(){
+ setCaptionLabel("Caption Test5");
+ setControlsHorizontalAlign("20");
+ setControlsVerticalAlign("20");
+ setControlsType("none");
+ setHeaderLabel("Header Test5");
+ setLenght(100);
+ setListHeight(400);
+ setListWidth(500);
+ setFastOrderControlsVisible(true);
+ setOrderControlsVisible(true);
+ setRendered(true);
+ setShowButtonLabels(true);
+ setTopControlLabel("top");
+ setBottomControlLabel("bottom");
+ setUpControlLabel("up");
+ setDownControlLabel("down");
+ addNewItem();
+ }
}
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-22 02:22:16 UTC (rev 4170)
+++ branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2007-11-22 09:11:26 UTC (rev 4171)
@@ -41,7 +41,7 @@
map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {true, true}));
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, false}));
+ map.add("OrderingList", add("/OrderingList/OrderingList", new boolean [] {true, true}));
}
public String getSrc() {
Deleted: branches/3.1.x/test-applications/facelets/src/main/java/util/resources.properties
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/java/util/resources.properties 2007-11-22 02:22:16 UTC (rev 4170)
+++ branches/3.1.x/test-applications/facelets/src/main/java/util/resources.properties 2007-11-22 09:11:26 UTC (rev 4171)
@@ -1,2 +0,0 @@
-prompt=Your Name\:
-greeting=Hello
Added: 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 (rev 0)
+++ branches/3.1.x/test-applications/facelets/src/main/resources/message_en.properties 2007-11-22 09:11:26 UTC (rev 4171)
@@ -0,0 +1,41 @@
+t1Calendar=change: Icon/Button; header facet: Test 1; locale: de; direction: bottom-left; manual input: false; disabled: false; jointPoint: top-right; mounth: long; pattern: dd-MM-yyyy; popup: true; preloadDateRangeBegin(client only): 10.09.2007; preloadDateRangeEnd(client only): 11.01.2008; readonly: true; required: true; showinput: false; tooltipmode: single; weekday: long; z-index: 3;
+t2Calendar=change: Icon/Button; header facet: Test 2; locale: fr; direction: top-right; manual input: true; disabled: false; jointPoint: bottom-left; mounth: none; pattern: dd.MM.yyyy; popup: true; preloadDateRangeBegin(client only): 10.09.2007; preloadDateRangeEnd(client only): 11.01.2008; readonly: true; required: true; showinput: true; tooltipmode: single; weekday: none; z-index: 3;
+t3Calendar=change: Icon/Button; header facet: Test 3; locale: ru; direction: bottom-left; manual input: false; disabled: false; jointPoint: top-right; mounth: long; pattern: dd-MM-yyyy; popup: false; preloadDateRangeBegin(client only): 10.09.2007; preloadDateRangeEnd(client only): 11.01.2008; readonly: false; required: false; showinput: false; tooltipmode: single; weekday: long; z-index: 3;
+t4Calendar=change: Icon/Button; header facet: Test 4; locale: de; direction: bottom-left; manual input: false; disabled: true; jointPoint: top-right; mounth: long; pattern: dd-MM-yyyy; popup: false; preloadDateRangeBegin(client only): 10.09.2007; preloadDateRangeEnd(client only): 11.01.2008; readonly: false; required: false; showinput: false; tooltipmode: single; weekday: none; z-index: 3;
+t5Calendar=change: Icon/Button; header facet: Test 5; locale: de; direction: bottom-right; manual input: false; disabled: false; jointPoint: bottom-left; mounth: none; pattern: d/M/yy; popup: true; preloadDateRangeBegin(client only): 09.09.2007; preloadDateRangeEnd(client only): 10.01.2008; readonly: false; required: true; showinput: true; tooltipmode: none; weekday: short; z-index: 1;
+t1DataScroller=align: left; fastcontrols: auto; limittolist: false; maxpages: 20; renderifsinglepage: true;
+t2DataScroller=align: right; fastcontrols: show; limittolist: false; maxpages: 30; renderifsinglepage: false;
+t3DataScroller=align: center; fastcontrols: hide; limittolist: false; maxpages: 10; renderifsinglepage: true;
+t4DataScroller=align: center; fastcontrols: auto; limittolist: true; maxpages: 30; renderifsinglepage: false;
+t5DataScroller=align: left; fastcontrols: show; limittolist: false; maxpages: 40; renderifsinglepage: true;
+t1DataTable=align: center; border: 4px; columns rendered: false; columswidth: 300px; width: 500px;
+t2DataTable=align: left; border: 0px; columns rendered: true; columswidth: 500px; width: 300px;
+t3DataTable=align: right; border: 5px; columns rendered: true; columswidth: 100px; width: 200px;
+t4DataTable=align: center; border: 4px; columns rendered: false; columswidth: 500px; width: 500px;
+t5DataTable=align: center; border: 4px; columns rendered: false; columswidth: 400px; width: 800px;
+t1DDMenu=direction: top-right; event: onmouseover; groupdirection: top-up; hidedelay:5; horizontaloffset:1; verticaloffset: 1; jointpoint: top-left; mode: none; popupwidth: 300px; showdelay: 1; disabled: false;
+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;
+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;
+t4INSlider=minvalue: 10; maxvalue: 12; inputsize: 2; inputposition: left; manualinput: false; value: 102; showinput: false; step: 2; showtooltip: false; showboundaryvalues: true;
+t5INSlider=minvalue: -99999; maxvalue: 99999; inputsize: 15; inputposition: right; manualinput: true; value: 103; showinput: true; step: 2;showtooltip: false; showboundaryvalues: false;
+t1INSpinner=cycled: true; manualinput: true; inputsize: 5; min: 0; max: 20; step: 1; tabindex: 2; value: 1;
+t2INSpinner=cycled: false; manualinput: false; inputsize: 10; min: 1000; max: 99999; step: 255; tabindex: 5; value: 5555;
+t3INSpinner=cycled: true; manualinput: false; inputsize: 3; min: 101; max: 202; step: 2; tabindex: 2; value: 102;
+t4INSpinner=cycled: false; manualinput: true; inputsize: 4; min: 33; max: 66; step: 11; tabindex: 3; value: 55;
+t5INSpinner=cycled: true; manualinput: true; inputsize: 15; min: -99999; max: 99999; step: 33; tabindex: 5; value: 101;
+t1Message=layout: table; msg: fatal; showdetail: true; showsummary: true; title: Test1; tooltip: true; select1: error; select2: fatal; select3: warn; select4: info; select5: passed;
+t2Message=layout: table; msg: error; showdetail: false; showsummary: true; title: Test2; tooltip: true; select1: error; select2: fatal; select3: fatal; select4: passed; select5: passed;
+t3Message=layout: table; msg: passed; showdetail: true; showsummary: false; title: Test3; tooltip: true; select1: error; select2: error; select3: passed; select4: error; select5: passed;
+t4Message=layout: table; msg: passed; showdetail: true; showsummary: true; title: Test4; tooltip: false; select1: warn; select2: warn; select3: warn; select4: warn; select5: warn;
+t5Message=layout: table; msg: warn; showdetail: false; showsummary: false; title: Test5; tooltip: false; select1: passed; select2: fatal; select3: error; select4: passed; select5: warn;
+t1ModalPanel=height: 300; width: 450; minheight: 250; minwidth: 400; moveable: false; resizeable: false;
+t2ModalPanel=height: 350; width: 400; minheight: 400; minwidth: 450; moveable: true; resizeable: false;
+t3ModalPanel=height: 400; width: 300; minheight: 400; minwidth: 300; moveable: true; resizeable: true;
+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;
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-22 02:22:16 UTC (rev 4170)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarStraightforward.xhtml 2007-11-22 09:11:26 UTC (rev 4171)
@@ -5,10 +5,11 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:ui="http://java.sun.com/jsf/facelets">
<rich:simpleTogglePanel switchType="client" opened="true" label="calendar straightforward">
- <h:panelGrid columns="2">
+ <h:panelGrid columns="3">
<h:outputText value="Test1" />
<a4j:commandButton action="#{calendarBean.bTest1}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton>
-
+ <h:outputText value="#{msg.t1Calendar}" />
+
<h:outputText value="Test2" />
<a4j:commandButton action="#{calendarBean.bTest2}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton>
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-22 02:22:16 UTC (rev 4170)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2007-11-22 09:11:26 UTC (rev 4171)
@@ -1,57 +1,51 @@
<f:subview id="orderingListSubviewID" 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">
+ xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets">
- <h:messages showDetail="true" />
+ <h:messages showDetail="true" />
+ <rich:orderingList id="orderingListID" value="#{orderingList.list}" var="item" listHeight="#{orderingList.listHeight}"
+ listWidth="#{orderingList.listWidth}" controlsType="#{orderingList.controlsType}"
+ bottomControlLabel="#{orderingList.bottomControlLabel}" captionLabel="#{orderingList.captionLabel}"
+ topControlLabel="#{orderingList.topControlLabel}" upControlLabel="#{orderingList.upControlLabel}"
+ 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!')">
- <rich:orderingList id="orderingListID" value="#{orderingList.list}" var="item" listHeight="#{orderingList.listHeight}"
- listWidth="#{orderingList.listWidth}" controlsType="#{orderingList.controlsType}"
- bottomControlLabel="#{orderingList.bottomControlLabel}" captionLabel="#{orderingList.captionLabel}"
- topControlLabel="#{orderingList.topControlLabel}" upControlLabel="#{orderingList.upControlLabel}"
- controlsHorizontalAlign="#{orderingList.controlsHorizontalAlign}" controlsVerticalAlign="#{orderingList.controlsVerticalAlign}"
- headerLabel="#{orderingList.headerLabel}" downControlLabel="#{orderingList.downControlLabel}"
- orderControlsVisible="#{orderingList.orderControlsVisible}" fastOrderControlsVisible="#{orderingList.fastOrderControlsVisible}"
- rendered="#{orderingList.rendered}" showButtonLabels="#{orderingList.showButtonLabels}" componentState="#{orderingList.componentState}"
- selection="#{orderingList.selection}">
+ <h:column width="100px">
+ <f:facet name="header">
+ <h:outputText value="Number" />
+ </f:facet>
+ <h:outputText value="#{item.data1}" />
+ </h:column>
- <h:column width="100px">
- <f:facet name="header">
- <h:outputText value="Number" />
- </f:facet>
- <h:outputText value="#{item.data1}" />
- </h:column>
+ <h:column width="100px">
+ <f:facet name="header">
+ <h:outputText value="Name" />
+ </f:facet>
+ <h:outputText value="#{item.data0}" />
+ </h:column>
- <h:column width="100px">
- <f:facet name="header">
- <h:outputText value="Name" />
- </f:facet>
- <h:outputText value="#{item.data0}" />
- </h:column>
+ <h:column width="100px">
+ <f:facet name="header">
+ <h:outputText value="Status" />
+ </f:facet>
+ <h:selectOneMenu value="#{item.data2}">
+ <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" />
+ </h:selectOneMenu>
+ </h:column>
- <h:column width="100px">
- <f:facet name="header">
- <h:outputText value="Status" />
- </f:facet>
- <h:selectOneMenu value="#{item.data2}">
- <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" />
- </h:selectOneMenu>
- </h:column>
-
- <h:column width="30px">
- <f:facet name="header">
- <h:outputText value="Icon" />
- </f:facet>
- <h:graphicImage value="#{item.data3}" />
- </h:column>
- </rich:orderingList>
-
- <rich:spacer></rich:spacer>
- <a4j:commandButton value="reRender" reRender="orderingListID"></a4j:commandButton>
- <h:commandButton action="submit();" value="submit();" />
-
-
+ <h:column width="30px">
+ <f:facet name="header">
+ <h:outputText value="Icon" />
+ </f:facet>
+ <h:graphicImage value="#{item.data3}" />
+ </h:column>
+ </rich:orderingList>
</f:subview>
\ No newline at end of file
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml 2007-11-22 02:22:16 UTC (rev 4170)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml 2007-11-22 09:11:26 UTC (rev 4171)
@@ -1,86 +1,87 @@
<f:subview id="orderingListPropertySubviewID" 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:panelGrid columns="2">
- <h:outputText value="controlsType" />
- <h:selectOneRadio value="#{orderingList.controlsType}">
- <f:selectItem itemLabel="none" itemValue="none" />
- <f:selectItem itemLabel="button" itemValue="button" />
- <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:selectOneRadio>
+ <rich:simpleTogglePanel id="orderingListPropertyID" switchType="client" opened="true" label="modalPanel property">
+ <h:panelGrid columns="2">
+ <h:outputText value="Enter quantity of lines" />
+ <h:inputText value="#{orderingList.lenght}">
+ <a4j:support event="onchange" action="#{orderingList.addNewItem}" reRender="orderingListID"></a4j:support>
+ </h:inputText>
- <h:outputText value="captionLabel" />
- <h:inputText value="#{orderingList.captionLabel}">
- <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:inputText>
+ <h:outputText value="controlsType" />
+ <h:selectOneRadio value="#{orderingList.controlsType}">
+ <f:selectItem itemLabel="none" itemValue="none" />
+ <f:selectItem itemLabel="button" itemValue="button" />
+ <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
+ </h:selectOneRadio>
- <h:outputText value="headerLabel" />
- <h:inputText value="#{orderingList.headerLabel}">
- <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:inputText>
+ <h:outputText value="captionLabel" />
+ <h:inputText value="#{orderingList.captionLabel}">
+ <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
+ </h:inputText>
- <h:outputText value="listHeight:" />
- <h:inputText value="#{orderingList.listHeight}">
- <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:inputText>
+ <h:outputText value="headerLabel" />
+ <h:inputText value="#{orderingList.headerLabel}">
+ <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
+ </h:inputText>
- <h:outputText value="listWidth" />
- <h:inputText value="#{orderingList.listWidth}">
- <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:inputText>
+ <h:outputText value="listHeight:" />
+ <h:inputText value="#{orderingList.listHeight}">
+ <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
+ </h:inputText>
- <h:outputText value="controlsVerticalAlign" />
- <h:inputText value="#{orderingList.controlsVerticalAlign}">
- <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:inputText>
+ <h:outputText value="listWidth" />
+ <h:inputText value="#{orderingList.listWidth}">
+ <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
+ </h:inputText>
- <h:outputText value="controlsHorizontalAlign" />
- <h:inputText value="#{orderingList.controlsHorizontalAlign}">
- <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:inputText>
+ <h:outputText value="controlsVerticalAlign" />
+ <h:inputText value="#{orderingList.controlsVerticalAlign}">
+ <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
+ </h:inputText>
- <h:outputText value="upControlLabel" />
- <h:inputText value="#{orderingList.upControlLabel}">
- <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:inputText>
+ <h:outputText value="controlsHorizontalAlign" />
+ <h:inputText value="#{orderingList.controlsHorizontalAlign}">
+ <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
+ </h:inputText>
- <h:outputText value="bottomControlLabel" />
- <h:inputText value="#{orderingList.bottomControlLabel}">
- <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:inputText>
+ <h:outputText value="upControlLabel" />
+ <h:inputText value="#{orderingList.upControlLabel}">
+ <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
+ </h:inputText>
- <h:outputText value="topControlLabel" />
- <h:inputText value="#{orderingList.topControlLabel}">
- <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:inputText>
+ <h:outputText value="bottomControlLabel" />
+ <h:inputText value="#{orderingList.bottomControlLabel}">
+ <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
+ </h:inputText>
- <h:outputText value="downControlLabel" />
- <h:inputText value="#{orderingList.downControlLabel}">
- <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:inputText>
-
- <h:outputText value="componentState" />
- <h:selectBooleanCheckbox value="#{orderingList.componentState}" >
- <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:selectBooleanCheckbox>
+ <h:outputText value="topControlLabel" />
+ <h:inputText value="#{orderingList.topControlLabel}">
+ <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
+ </h:inputText>
- <h:outputText value="showButtonLabels" />
- <h:selectBooleanCheckbox value="#{orderingList.showButtonLabels}">
- <a4j:support event="onclick" reRender="orderingListID"></a4j:support>
- </h:selectBooleanCheckbox>
+ <h:outputText value="downControlLabel" />
+ <h:inputText value="#{orderingList.downControlLabel}">
+ <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
+ </h:inputText>
- <h:outputText value="fastOrderControlsVisible" />
- <h:selectBooleanCheckbox value="#{orderingList.fastOrderControlsVisible}">
- <a4j:support event="onclick" reRender="orderingListID"></a4j:support>
- </h:selectBooleanCheckbox>
+ <h:outputText value="showButtonLabels" />
+ <h:selectBooleanCheckbox value="#{orderingList.showButtonLabels}">
+ <a4j:support event="onclick" reRender="orderingListID"></a4j:support>
+ </h:selectBooleanCheckbox>
- <h:outputText value="orderControlsVisible" />
- <h:selectBooleanCheckbox value="#{orderingList.orderControlsVisible}">
- <a4j:support event="onclick" reRender="orderingListID"></a4j:support>
- </h:selectBooleanCheckbox>
+ <h:outputText value="fastOrderControlsVisible" />
+ <h:selectBooleanCheckbox value="#{orderingList.fastOrderControlsVisible}">
+ <a4j:support event="onclick" reRender="orderingListID"></a4j:support>
+ </h:selectBooleanCheckbox>
- <h:outputText value="rendered" />
- <h:selectBooleanCheckbox value="#{orderingList.rendered}" onclick="submit();">
+ <h:outputText value="orderControlsVisible" />
+ <h:selectBooleanCheckbox value="#{orderingList.orderControlsVisible}">
+ <a4j:support event="onclick" reRender="orderingListID"></a4j:support>
+ </h:selectBooleanCheckbox>
- </h:selectBooleanCheckbox>
- </h:panelGrid>
+ <h:outputText value="rendered" />
+ <h:selectBooleanCheckbox value="#{orderingList.rendered}" onclick="submit();">
+ </h:selectBooleanCheckbox>
+ </h:panelGrid>
+ </rich:simpleTogglePanel>
</f:subview>
\ No newline at end of file
Added: 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 (rev 0)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml 2007-11-22 09:11:26 UTC (rev 4171)
@@ -0,0 +1,33 @@
+<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:outputText value="Test1" />
+ <a4j:commandButton action="#{orderingList.bTest1}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton>
+
+ <h:outputText value="Test2" />
+ <a4j:commandButton action="#{orderingList.bTest2}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton>
+
+ <h:outputText value="Test3" />
+ <a4j:commandButton action="#{orderingList.bTest3}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton>
+
+ <h:outputText value="Test4" />
+ <a4j:commandButton action="#{orderingList.bTest4}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton>
+
+ <h:outputText value="Test5" />
+ <a4j:commandButton action="#{orderingList.bTest5}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton>
+
+ <h:outputText value="reRender:" />
+ <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:" />
+ <h:commandButton action="submit();" value="submit();" />
+
+ <h:outputText value="immediate submite:" />
+ <h:commandButton action="submit();" immediate="true" value="submit();" />
+ </h:panelGrid>
+ </rich:simpleTogglePanel>
+</f:subview>
\ No newline at end of file
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-22 02:22:16 UTC (rev 4170)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Action/EventInfo.xhtml 2007-11-22 09:11:26 UTC (rev 4171)
@@ -2,6 +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="ontabenterInputID" type="hidden" value="don't work!" size="42" />
</div></f:verbatim>
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-22 02:22:16 UTC (rev 4170)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2007-11-22 09:11:26 UTC (rev 4171)
@@ -7,6 +7,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets">
<f:view>
<head>
+ <f:loadBundle basename="message" var="msg" />
<title></title>
<script type="text/javascript">
18 years, 5 months
JBoss Rich Faces SVN: r4170 - branches/3.1.x/samples/orderingListDemo/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-11-21 21:22:16 -0500 (Wed, 21 Nov 2007)
New Revision: 4170
Modified:
branches/3.1.x/samples/orderingListDemo/src/main/webapp/pages/index.jsp
Log:
garbage inputText removed
Modified: branches/3.1.x/samples/orderingListDemo/src/main/webapp/pages/index.jsp
===================================================================
--- branches/3.1.x/samples/orderingListDemo/src/main/webapp/pages/index.jsp 2007-11-22 02:13:02 UTC (rev 4169)
+++ branches/3.1.x/samples/orderingListDemo/src/main/webapp/pages/index.jsp 2007-11-22 02:22:16 UTC (rev 4170)
@@ -213,8 +213,6 @@
<h:commandLink value="Server Action" action="#{item.action}" />
</h:column>
</ol:orderingList>
-
- <h:inputText value="123"/>
</a4j:repeat>
</h:panelGrid>
</h:form>
18 years, 5 months
JBoss Rich Faces SVN: r4169 - trunk/framework/impl/src/main/java/org/ajax4jsf/resource.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-11-21 21:13:02 -0500 (Wed, 21 Nov 2007)
New Revision: 4169
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/TemplateCSSRenderer.java
Log:
TODOs added
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/resource/TemplateCSSRenderer.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/resource/TemplateCSSRenderer.java 2007-11-22 01:47:49 UTC (rev 4168)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/resource/TemplateCSSRenderer.java 2007-11-22 02:13:02 UTC (rev 4169)
@@ -74,7 +74,10 @@
RenderKitFactory renderKitFactory = (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
RenderKit renderKit = renderKitFactory.getRenderKit(facesContext,defaultRenderKitId);
// TODO - handle response encoding
-
+
+ //TODO nick - andrei
+ //make compressor switchable off
+ //use Boolean.valueOf(facesContext.getExternalContext().getInitParameter("org.ajax4jsf.COMPRESS_STYLE")) as criteria
ResponseWriter responseWriter = renderKit.createResponseWriter(countingOutputWriter,null,"UTF-8");
facesContext.setResponseWriter(responseWriter);
responseWriter.startDocument();
@@ -86,6 +89,9 @@
responseWriter.flush();
responseWriter.close();
+ //TODO nick - andrei
+ //we should return length of already compressed script, not the original one
+
// Compressing css document and printing result in response stream
CssCompressor compressor = new CssCompressor(countingOutputWriter.getContent());
Writer writer = context.getWriter();
18 years, 5 months
JBoss Rich Faces SVN: r4168 - in branches/3.1.x/ui/orderingList/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-11-21 20:47:49 -0500 (Wed, 21 Nov 2007)
New Revision: 4168
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/UIOrderingList.java
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js
Log:
Model handling corrected in UIOrderingList
Value holders made Serializable
OrderingList.js updated to be compatible with TEXTAREA tags
a4j:repeat resurrected for orderingListDemo
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-22 01:47:39 UTC (rev 4167)
+++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2007-11-22 01:47:49 UTC (rev 4168)
@@ -3,6 +3,7 @@
*/
package org.richfaces.component;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -49,7 +50,12 @@
};
- private static class EditableState {
+ private static class EditableState implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3276243811945890889L;
+
private boolean translated = false;
//setting this flag to true means we should reorder elements
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-22 01:47:39 UTC (rev 4167)
+++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-22 01:47:49 UTC (rev 4168)
@@ -1,6 +1,7 @@
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;
@@ -41,7 +42,11 @@
public abstract class UIOrderingList extends UIOrderingBaseComponent {
- protected static final class ValueHolder {
+ protected static final class ValueHolder implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2124352131407581704L;
private Collection selection;
private boolean selectionSet;
@@ -49,7 +54,11 @@
private boolean activeItemSet;
}
- protected static final class SubmittedValue {
+ protected static final class SubmittedValue implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 5860506816451180551L;
private int[] permutationOrder;
private Set selectedItems = new HashSet();
private Integer activeItem;
@@ -81,7 +90,7 @@
}
} catch (NumberFormatException e) {
- // TODO: handle exception
+ throw new FacesException(e.getLocalizedMessage(), e);
}
}
}
@@ -177,15 +186,16 @@
private transient SubmittedValue submittedValueHolder = null;
private void convertState(FacesContext faces) {
+ Object rowKey = getRowKey();
+
final HashSet selectionItemsSet = new HashSet();
- final ExtendedDataModel dataModel = getExtendedDataModel();
try {
- dataModel.walk(faces, new DataVisitor() {
+ walk(faces, new DataVisitor() {
public void process(FacesContext context, Object rowKey,
Object argument) throws IOException {
- dataModel.setRowKey(rowKey);
+ setRowKey(context, rowKey);
if (localSelection != null && localSelection.contains(rowKey)) {
selectionItemsSet.add(getRowData());
@@ -196,15 +206,16 @@
}
}
- }, null, null);
+ }, null);
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ throw new FacesException(e.getLocalizedMessage(), e);
}
if (this.localSelection != null) {
this.localSelection = selectionItemsSet;
}
+
+ setRowKey(rowKey);
}
public void restoreState(FacesContext faces, Object object) {
@@ -228,15 +239,15 @@
final HashSet selectionKeySet = new HashSet();
final HashSet activeItemSet = new HashSet(1);
- final ExtendedDataModel dataModel = getExtendedDataModel();
+ Object rowKey = getRowKey();
try {
- dataModel.walk(faces, new DataVisitor() {
+ walk(faces, new DataVisitor() {
public void process(FacesContext context, Object rowKey,
Object argument) throws IOException {
- dataModel.setRowKey(rowKey);
- Object data = dataModel.getRowData();
+ setRowKey(context, rowKey);
+ Object data = getRowData();
if (data.equals(localActiveItem)) {
activeItemSet.add(getTranslatedRowKey());
}
@@ -247,12 +258,13 @@
}
- }, null, null);
+ }, null);
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ throw new FacesException(e.getLocalizedMessage(), e);
}
+ setRowKey(rowKey);
+
state[5] = selectionKeySet;
state[6] = activeItemSet.isEmpty() ? null : activeItemSet.iterator().next();
@@ -674,13 +686,14 @@
// If our value is valid, store the new value, erase the
// "submitted" value, and emit a ValueChangeEvent if appropriate
if (isValid()) {
+ Object rowKey = getRowKey();
+
Set selectionSet = new HashSet();
- ExtendedDataModel dataModel = getExtendedDataModel();
Set selectedItems = submittedValueHolder.selectedItems;
for (Iterator iterator = selectedItems.iterator(); iterator
.hasNext();) {
- dataModel.setRowKey(iterator.next());
- Object selectionItem = dataModel.getRowData();
+ setRowKey(context, iterator.next());
+ Object selectionItem = getRowData();
selectionSet.add(selectionItem);
}
@@ -688,8 +701,8 @@
setSelection(selectionSet);
if (submittedValueHolder.activeItem != null) {
- dataModel.setRowKey(submittedValueHolder.activeItem);
- Object activeItem = dataModel.getRowData();
+ setRowKey(context, submittedValueHolder.activeItem);
+ Object activeItem = getRowData();
setActiveItem(activeItem);
} else {
@@ -705,6 +718,8 @@
}
this.submittedValueHolder = null;
+
+ setRowKey(rowKey);
}
}
@@ -936,10 +951,6 @@
return ScriptUtils.toScript(order);
}
- public int getModelSize() {
- return getExtendedDataModel().getRowCount();
- }
-
public ItemState getItemState() {
if (submittedValueHolder != null) {
return new SubmittedItemState(submittedValueHolder.selectedItems, submittedValueHolder.activeItem);
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-22 01:47:39 UTC (rev 4167)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js 2007-11-22 01:47:49 UTC (rev 4168)
@@ -2,8 +2,15 @@
Richfaces.disableSelectionText = function(target) {
target.onselectstart = function(e) {
e = window.event||e;
- if (e.srcElement.tagName != "INPUT")
- return false;
+ if (e.srcElement) {
+ if (e.srcElement.tagName) {
+ var tagName = e.srcElement.tagName.toUpperCase();
+
+ if (tagName != "INPUT" && tagName != "TEXTAREA" /* any items more? */) {
+ return false;
+ }
+ }
+ }
}
}
18 years, 5 months