richfaces-svn-commits
December 2007
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 715 discussions
JBoss Rich Faces SVN: r4704 - branches/3.1.x/ui/componentControl/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2007-12-11 08:54:00 -0500 (Tue, 11 Dec 2007)
New Revision: 4704
Modified:
branches/3.1.x/ui/componentControl/src/main/config/component/componentControl.xml
Log:
http://jira.jboss.com/jira/browse/RF-696 - add attributes for componentControl
Modified: branches/3.1.x/ui/componentControl/src/main/config/component/componentControl.xml
===================================================================
--- branches/3.1.x/ui/componentControl/src/main/config/component/componentControl.xml 2007-12-11 13:39:38 UTC (rev 4703)
+++ branches/3.1.x/ui/componentControl/src/main/config/component/componentControl.xml 2007-12-11 13:54:00 UTC (rev 4704)
@@ -27,8 +27,14 @@
</taghandler>
-->
&ui_component_attributes;
-
<property>
+ <name>disableDefault</name>
+ <classname>boolean</classname>
+ <description>
+ If "true", it is used to avoid a problem with form submit and modalPanel showing
+ </description>
+ </property>
+ <property>
<name>event</name>
<classname>java.lang.String</classname>
<description>
@@ -57,8 +63,8 @@
<classname>java.lang.String</classname>
<description>
The function of Javascript API that will be invoked. The API method
- is attached to the 'component' property of the root DOM element that represents
- the target component. The function has two parameters - event and params. See: 'params'
+ is attached to the 'component' property of the root DOM element that represents
+ the target component. The function has two parameters - event and params. See: 'params'
attribute for details.
</description>
<defaultvalue>""</defaultvalue>
@@ -92,6 +98,7 @@
<name>attachTiming</name>
<classname>java.lang.String</classname>
<description>
+ Defines an Id of a component or HTML element listened by the control component
</description>
<defaultvalue>"immediate"</defaultvalue>
</property>
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4703 - trunk/ui/modal-panel/src/main/config/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-11 08:39:38 -0500 (Tue, 11 Dec 2007)
New Revision: 4703
Modified:
branches/3.1.x/ui/modal-panel/src/main/config/component/modalPanel.xml
trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
Log:
http://jira.jboss.com/jira/browse/RF-1595
Modified: branches/3.1.x/ui/modal-panel/src/main/config/component/modalPanel.xml
===================================================================
--- branches/3.1.x/ui/modal-panel/src/main/config/component/modalPanel.xml 2007-12-11 13:26:55 UTC (rev 4702)
+++ branches/3.1.x/ui/modal-panel/src/main/config/component/modalPanel.xml 2007-12-11 13:39:38 UTC (rev 4703)
@@ -167,13 +167,23 @@
<description> If 'true' modalPanel should be autosizeable </description>
<defaultvalue>false</defaultvalue>
</property>
- <property>
+ <property hidden="true" >
<name>requiredMessage</name>
<classname>java.lang.String</classname>
<description> A ValueExpression enabled attribute that, if present, will be used as the
text of the validation message for the "required" facility, if the "required"
facility is used </description>
</property>
+ <property hidden="true" >
+ <name>required</name>
+ <classname>boolean</classname>
+ <defaultvalue>false</defaultvalue>
+ </property>
+ <property hidden="true" >
+ <name>immediate</name>
+ <classname>boolean</classname>
+ <defaultvalue>false</defaultvalue>
+ </property>
<property>
<name>validatorMessage</name>
<classname>java.lang.String</classname>
Modified: trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
===================================================================
--- trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2007-12-11 13:26:55 UTC (rev 4702)
+++ trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2007-12-11 13:39:38 UTC (rev 4703)
@@ -23,25 +23,13 @@
<classname>org.richfaces.taglib.ModalPanelTag</classname>
<superclass> org.ajax4jsf.webapp.taglib.HtmlComponentTagBase </superclass>
</tag>
- <!--
- <taghandler>
- <classname>org.ajax4jsf.tag.TestHandler</classname>
- </taghandler>
- -->
- &ui_component_attributes; &ui_input_attributes; &ui_output_attributes; &html_style_attributes;
- <!--
+
+ &ui_component_attributes;
+ &ui_input_attributes;
+ &ui_output_attributes;
+ &html_style_attributes;
+
<property>
- <name>param</name>
- <classname>java.lang.String</classname>
- <description>
- </description>
- <defaultvalue>"default"</defaultvalue>
- </property>
- -->
-
-
-
- <property>
<name>headerClass</name>
<classname>java.lang.String</classname>
<description>CSS style(s) is/are to be applied to component header when this component
@@ -183,12 +171,22 @@
<description> If 'true' modalPanel should be autosizeable </description>
<defaultvalue>false</defaultvalue>
</property>
- <property>
+ <property hidden="true" >
<name>requiredMessage</name>
<classname>java.lang.String</classname>
<description> A ValueExpression enabled attribute that, if present, will be used as the
text of the validation message for the "required" facility, if the "required"
facility is used </description>
+ </property>
+ <property hidden="true" >
+ <name>required</name>
+ <classname>boolean</classname>
+ <defaultvalue>false</defaultvalue>
+ </property>
+ <property hidden="true" >
+ <name>immediate</name>
+ <classname>boolean</classname>
+ <defaultvalue>false</defaultvalue>
</property>
<property>
<name>validatorMessage</name>
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4702 - trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2007-12-11 08:26:55 -0500 (Tue, 11 Dec 2007)
New Revision: 4702
Modified:
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js
Log:
RF-1453
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-12-11 13:26:33 UTC (rev 4701)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-12-11 13:26:55 UTC (rev 4702)
@@ -267,7 +267,9 @@
this.container.setHeight(height - fixH);
this.defaultRowHeight = this._calcDefaultRowHeight();
+ this.sizeBox.hide();
this.sizeBox.setHeight(this.defaultRowHeight * this.grid.dataModel.getCount() + fixH);
+ this.sizeBox.show();
this.helpObject1.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5);
this.helpObject2.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5);
@@ -308,6 +310,9 @@
}
else if(to == this.grid.dataModel.getCount()) {
from = to - this.rowsCount;
+ if (from < 0) {
+ from = 0;
+ }
}
var range = $R(from, to);
@@ -798,14 +803,14 @@
},
restoreScrollState: function() {
+ this.scrollInput = $(this.gridId + ":si");
var value = this.scrollInput.value
if(value !=''){
var values = value.split(',');
+ this.currentPos = values[0];
this.scrollBox.getElement().scrollTop = values[0];
- this.currentPos = values[0];
this.currRange.start = values[1];
this.currRange.end = values[2];
- this._onContentVScroll(values[0]);
var visibleRowPos = this.currRange.start * this.defaultRowHeight;
this.templFrozen.moveToY(visibleRowPos);
this.templNormal.moveToY(visibleRowPos);
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js 2007-12-11 13:26:33 UTC (rev 4701)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js 2007-12-11 13:26:55 UTC (rev 4702)
@@ -77,6 +77,7 @@
},
onSortComplete : function(request, event, data){
+ this.dataModel.count = $(this.client_id + "_rows_input").value;
var options = request.getJSON("options");
Utils.AJAX.updateRows(options,request,
this,this.client_id,
@@ -86,8 +87,10 @@
this.eventOnPostSort.fire(options.column, options.order);
}]);
this.updateLayout();
+ this.getBody().restoreScrollState();
},
onScrollComplete : function(request, event, data){
+ this.dataModel.count = $(this.client_id + "_rows_input").value;
var options = this.dataModel.getCurrentOptions();
window.loadingServerTime = (new Date()).getTime();
Utils.AJAX.updateRows(options,request,
@@ -98,6 +101,8 @@
this.eventOnPostScroll.fire(this.getBody().currRange.start);
}]);
+ this.updateLayout();
+ this.getBody().restoreScrollState();
window.loadingEndTime = (new Date()).getTime();
// TODO: remove this time statistic logging
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4701 - in branches/3.1.x/test-applications/facelets/src/main: java/inputNumberSlider and 20 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-12-11 08:26:33 -0500 (Tue, 11 Dec 2007)
New Revision: 4701
Modified:
branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarBean.java
branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java
branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java
branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java
branches/3.1.x/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java
branches/3.1.x/test-applications/facelets/src/main/java/sb/Sb.java
branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java
branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionList.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.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/OrderingList/OrderingListStraightforward.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml
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/pages/Rich/Rich.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/pages/main.xhtml
Log:
-update add or remove attribute
-fix calendar (delete |> <|)
Modified: branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarBean.java
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-12-11 13:26:33 UTC (rev 4701)
@@ -35,17 +35,16 @@
public class CalendarBean {
- private static final String [] WEEK_DAY_SHORT = new String[] { "|>Sun*<|",
- "|>Mon +<|", "|>Tue +<|", "|>Wed +<|", "|>Thu +<|", "|>Fri +<|", "|>Sat*<|" };
- private static final String [] WEEK_DAY = new String[] { "|>Saturday*<|", "|>Monday+<|",
- "|>Tuesday+<|", "|>Wednesday+<|", "|>Thursday+<|", "|>Friday+<|", "|>Sunday*<|"};
- private static final String [] MOUNT_LABELS = new String[] { "January +",
- "February +", "March +", "April +", "May +", "June +", "July +", "August +",
+ private static final String [] WEEK_DAY_SHORT = new String[] { "Sun*",
+ "Mon +", "Tue +", "Wed +", "Thu +", "Fri +", "Sat*" };
+ private static final String [] WEEK_DAY = new String[] { "*Saturday*", "+Monday+",
+ "+Tuesday+", "+Wednesday+", "+Thursday+", "+Friday+", "*Sunday*"};
+ private static final String [] MOUNT_LABELS = new String[] { "January+",
+ "February+", "March+", "April+", "May +", "June +", "July +", "August +",
"September +", "October +", "November +", "December +" };
- private static final String [] MOUNT_LABELS_SHORT = new String[] { "Jan +",
- "Feb +", "Mar +", "Apr +", "May +", "Jun +", "Jul +", "Aug +",
- "Sep +", "Oct +", "Nov +", "Dec +" };
-
+ private static final String [] MOUNT_LABELS_SHORT = new String[] { "+Jan+",
+ "+Feb+", "+Mar+", "+Apr+", "+May+", "+Jun+", "+Jul+", "+Aug+",
+ "+Sep+", "+Oct+", "+Nov+", "+Dec+" };
private Locale locale;
private TimeZone tZone;
private boolean popup;
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-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java 2007-12-11 13:26:33 UTC (rev 4701)
@@ -1,7 +1,6 @@
package inputNumberSlider;
import javax.faces.event.ValueChangeEvent;
-import javax.faces.event.ValueChangeListener;
public class InputNumberSlider {
Modified: branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2007-12-11 13:26:33 UTC (rev 4701)
@@ -7,10 +7,10 @@
private String left;
private String top;
private boolean rendered;
- private int shadowDepth;
- private int shadowOpacity;
+ private String shadowDepth;
+ private String shadowOpacity;
private boolean showWhenRendered;
- private String zindex;
+ private int zindex;
private int minHeight;
private int minWidth;
private int height;
@@ -51,9 +51,9 @@
this.left = "100";
this.top = "100";
this.rendered = true;
- this.shadowDepth = 3;
- this.shadowOpacity = 3;
- this.zindex = "3";
+ this.shadowDepth = "3";
+ this.shadowOpacity = "3";
+ this.zindex = 3;
this.showWhenRendered = false;
}
@@ -191,19 +191,19 @@
this.rendered = rendered;
}
- public int getShadowDepth() {
+ public String getShadowDepth() {
return shadowDepth;
}
- public void setShadowDepth(int shadowDepth) {
+ public void setShadowDepth(String shadowDepth) {
this.shadowDepth = shadowDepth;
}
- public int getShadowOpacity() {
+ public String getShadowOpacity() {
return shadowOpacity;
}
- public void setShadowOpacity(int shadowOpacity) {
+ public void setShadowOpacity(String shadowOpacity) {
this.shadowOpacity = shadowOpacity;
}
@@ -215,11 +215,11 @@
this.showWhenRendered = showWhenRendered;
}
- public String getZindex() {
+ public int getZindex() {
return zindex;
}
- public void setZindex(String zindex) {
+ public void setZindex(int zindex) {
this.zindex = zindex;
}
}
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-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java 2007-12-11 13:26:33 UTC (rev 4701)
@@ -17,7 +17,6 @@
private String controlsType;
private String controlsVerticalAlign;
private String controlsHorizontalAlign;
- private String headerLabel;
private String bottomControlLabel;
private String upControlLabel;
private String topControlLabel;
@@ -79,7 +78,6 @@
this.controlsType = "button";
this.controlsHorizontalAlign = "right";
this.controlsVerticalAlign = "center";
- this.headerLabel = "headerLabel";
this.bottomControlLabel = "bottom label";
this.upControlLabel = "up label";
this.downControlLabel = "down label";
@@ -166,14 +164,6 @@
this.controlsHorizontalAlign = controlsHorizontalAlign;
}
- public String getHeaderLabel() {
- return headerLabel;
- }
-
- public void setHeaderLabel(String headerLabel) {
- this.headerLabel = headerLabel;
- }
-
public String getDownControlLabel() {
return downControlLabel;
}
@@ -239,7 +229,6 @@
setControlsHorizontalAlign("0");
setControlsVerticalAlign("0");
setControlsType("button");
- setHeaderLabel("Header Test1");
setLenght(40);
setListHeight("300");
setListWidth("400");
@@ -259,7 +248,6 @@
setControlsHorizontalAlign("30");
setControlsVerticalAlign("50");
setControlsType("button");
- setHeaderLabel("Header Test2");
setLenght(40);
setListHeight("600");
setListWidth("400");
@@ -279,7 +267,6 @@
setControlsHorizontalAlign("50");
setControlsVerticalAlign("10");
setControlsType("button");
- setHeaderLabel("Header Test3");
setLenght(40);
setListHeight("500");
setListWidth("500");
@@ -299,7 +286,6 @@
setControlsHorizontalAlign("0");
setControlsVerticalAlign("0");
setControlsType("button");
- setHeaderLabel("Header Test4");
setLenght(10000);
setListHeight("500");
setListWidth("600");
@@ -319,7 +305,6 @@
setControlsHorizontalAlign("20");
setControlsVerticalAlign("20");
setControlsType("none");
- setHeaderLabel("Header Test5");
setLenght(100);
setListHeight("400");
setListWidth("500");
Modified: branches/3.1.x/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java 2007-12-11 13:26:33 UTC (rev 4701)
@@ -27,14 +27,17 @@
rendered = "true";
disabled = false;
tabIndex = "1";
+ iconGroupPosition = "left";
+ iconGroupTopPosition = "left";
+ iconItemPosition = "left";
+ iconGroupTopPosition = "left";
icon = new Icon();
-/* icon.setCollapsed(icon.iconCollapse);
+ icon.setCollapsed(icon.iconCollapse);
icon.setExpanded(icon.iconExpand);
icon.setItem(icon.iconItem);
icon.setIcon(icon.iconFileManager);
icon.setCollapsedGroup(icon.iconAjaxProcess);
icon.setDisabledGroup(icon.iconAjaxStoped);
-*/
}
public boolean isDisabled() {
@@ -237,4 +240,4 @@
setTabIndex("2");
}
-}
+}
\ No newline at end of file
Modified: branches/3.1.x/test-applications/facelets/src/main/java/sb/Sb.java
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/java/sb/Sb.java 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/java/sb/Sb.java 2007-12-11 13:26:33 UTC (rev 4701)
@@ -9,277 +9,276 @@
public class Sb implements Serializable {
- private ArrayList cities;
- private ArrayList data;
- private ArrayList tokens;
- private int first;
- private String zindex;
- private String property;
- private String rows;
- private String cellspacing;
- private String cellpadding;
- private String minchars;
- private String frequency;
- private String rules;
- private String border;
- private String width;
- private String height;
- private String shadowOpacity;
- private String bgColor;
- private String shadowDepth;
- private boolean focus;
+ private ArrayList cities;
+ private ArrayList data;
+ private ArrayList tokens;
+ private int first;
+ private int zindex;
+ private String property;
+ private String rows;
+ private String cellspacing;
+ private String cellpadding;
+ private String minchars;
+ private String frequency;
+ private String rules;
+ private String border;
+ private String width;
+ private String height;
+ private String shadowOpacity;
+ private String bgColor;
+ private String shadowDepth;
+ private boolean focus;
-/*
- private static final String[] cit = { "Abba", "Abbeville", "Acworth",
- "Adairsville", "Adel", "Adrian", "Ailey", "Alamo", "Alapaha",
- "Albany", "Allenhurst", "Alma", "Alma", "Alpharetta", "Alston",
- "Amboy", "Ambrose", "Americus", "Appling", "Arlington", "Ashburn",
- "Athens", "Athens-Clarke County", "Atkinson", "Atlanta",
- "Attapulgus", "Auburn", "Augusta", "Augusta-Richmond County",
- "Austell", "Avondale Estates", "Axson" };
-*/
-
- private 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"};
- private 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"};
- private static final String[] cityCAmerica = {"Central America", "Belize", "Costa Rica", "El Salvador", "Guatemala", "Honduras", "Nicaragua", "Panama"};
- private 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"};
- private 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"};
- private static final String[] cityNAmerica = {"North America", "Bermuda", "Canada", "Greenland", "Mexico", "Saint Pierre and Miquelon", "United States of America"};
- private 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"};
- private static final String[] citySAmerica = {"South America","Argentina", "Bolivia", "Brazil", "Chile", "Colombia", "Easter Island", "Ecuador", "Falkland Islands", "French Guiana", "Guyana", "Paraguay", "Peru", "Suriname", "Uruguay", "Venezuela"};
- private 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"};
- private static final String[] cityCaribbean = {"The Caribbean", "Anguilla", "Antigua and Barbuda", "Aruba", "Barbados", "British Virgin Islands", "Cayman Islands", "Cuba", "Dominica", "Dominican Republic", "Grenada", "Guadeloupe", "Haiti", "Jamaica", "Martinique", "Montserrat", "Navassa Island", "Netherlands Antilles", "Puerto Rico", "Saint Barthelemy", "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", "The Bahamas", "Trinidad and Tobago", "Turks and Caicos Islands", "Virgin Islands"};
+ /*
+ * private static final String[] cit = { "Abba", "Abbeville", "Acworth",
+ * "Adairsville", "Adel", "Adrian", "Ailey", "Alamo", "Alapaha", "Albany",
+ * "Allenhurst", "Alma", "Alma", "Alpharetta", "Alston", "Amboy", "Ambrose",
+ * "Americus", "Appling", "Arlington", "Ashburn", "Athens", "Athens-Clarke
+ * County", "Atkinson", "Atlanta", "Attapulgus", "Auburn", "Augusta",
+ * "Augusta-Richmond County", "Austell", "Avondale Estates", "Axson" };
+ */
+ private 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"};
+ private 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"};
+ private static final String[] cityCAmerica = {"Central America", "Belize", "Costa Rica", "El Salvador", "Guatemala", "Honduras", "Nicaragua", "Panama"};
+ private 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"};
+ private 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"};
+ private static final String[] cityNAmerica = {"North America", "Bermuda", "Canada", "Greenland", "Mexico", "Saint Pierre and Miquelon", "United States of America"};
+ private 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"};
+ private static final String[] citySAmerica = {"South America","Argentina", "Bolivia", "Brazil", "Chile", "Colombia", "Easter Island", "Ecuador", "Falkland Islands", "French Guiana", "Guyana", "Paraguay", "Peru", "Suriname", "Uruguay", "Venezuela"};
+ private 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"};
+ private static final String[] cityCaribbean = {"The Caribbean", "Anguilla", "Antigua and Barbuda", "Aruba", "Barbados", "British Virgin Islands", "Cayman Islands", "Cuba", "Dominica", "Dominican Republic", "Grenada", "Guadeloupe", "Haiti", "Jamaica", "Martinique", "Montserrat", "Navassa Island", "Netherlands Antilles", "Puerto Rico", "Saint Barthelemy", "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", "The Bahamas", "Trinidad and Tobago", "Turks and Caicos Islands", "Virgin Islands"};
- public Sb() {
- border = "1";
- width = "200";
- height = "150";
- shadowOpacity = "1";
- shadowDepth = Integer.toString(SuggestionBoxRenderer.SHADOW_DEPTH);
- zindex = "3";
- focus = true;
- rows = "0";
- first = 0;
- cellspacing = "2";
- cellpadding = "2";
- minchars = "1";
- frequency = "0";
- rules = "none";
- setCities(getAllData());
- }
- public List autocomplete(Object event) {
- String pref = event.toString();
- ArrayList result = new ArrayList();
+ public Sb() {
+ border = "1";
+ width = "200";
+ height = "150";
+ shadowOpacity = "1";
+ shadowDepth = Integer.toString(SuggestionBoxRenderer.SHADOW_DEPTH);
+ zindex = 3;
+ focus = true;
+ rows = "0";
+ first = 0;
+ cellspacing = "2";
+ cellpadding = "2";
+ minchars = "1";
+ frequency = "0";
+ rules = "none";
+ setCities(getAllData());
+ }
- Iterator iterator = getAllData().iterator();
- while (iterator.hasNext()) {
- Data elem = (Data) iterator.next();
- if ((elem != null && elem.getCity().toLowerCase().indexOf(
- pref.toLowerCase()) == 0)
- || "".equals(pref)) {
- result.add(elem);
- }
+ public List autocomplete(Object event) {
+ String pref = event.toString();
+ ArrayList result = new ArrayList();
+
+ Iterator iterator = getAllData().iterator();
+ while (iterator.hasNext()) {
+ Data elem = (Data) iterator.next();
+ if ((elem != null && elem.getCity().toLowerCase().indexOf(
+ pref.toLowerCase()) == 0)
+ || "".equals(pref)) {
+ result.add(elem);
+ }
+ }
+ return result;
}
- return result;
- }
- public ArrayList getCities() {
- return cities;
- }
+ public ArrayList getCities() {
+ return cities;
+ }
- public void setCities(ArrayList cities) {
- this.cities = cities;
- }
+ public void setCities(ArrayList cities) {
+ this.cities = cities;
+ }
- private ArrayList<Data> addData(String [] mStr, ArrayList<Data> arr) {
- for(int i = 1; i < mStr.length; i++) {
+ private ArrayList<Data> addData(String[] mStr, ArrayList<Data> arr) {
+ for (int i = 1; i < mStr.length; i++) {
Data data = new Data(mStr[i], mStr[0], false);
arr.add(data);
}
return arr;
- }
-
- public ArrayList getAllData() {
-/* for (int i = 0; i < cit.length; i++) {
- Data data = new Data(cit[i], String.valueOf(i + 1));
- result.add(data);
- }*/
- ArrayList<Data> result = new ArrayList<Data>();
- result = addData(cityAfrica, result);
- result = addData(cityAsia, result);
- result = addData(cityCAmerica ,result);
- result = addData(cityCaribbean ,result);
- result = addData(cityEurope ,result);
- result = addData(cityMEast ,result);
- result = addData(cityNAmerica ,result);
- result = addData(cityOceania ,result);
- result = addData(citySAmerica ,result);
- result = addData(citySEAsia ,result);
- return result;
- }
+ }
- public ArrayList getData() {
- return data;
- }
+ public ArrayList getAllData() {
+ /*
+ * for (int i = 0; i < cit.length; i++) { Data data = new Data(cit[i],
+ * String.valueOf(i + 1)); result.add(data); }
+ */
+ ArrayList<Data> result = new ArrayList<Data>();
+ result = addData(cityAfrica, result);
+ result = addData(cityAsia, result);
+ result = addData(cityCAmerica, result);
+ result = addData(cityCaribbean, result);
+ result = addData(cityEurope, result);
+ result = addData(cityMEast, result);
+ result = addData(cityNAmerica, result);
+ result = addData(cityOceania, result);
+ result = addData(citySAmerica, result);
+ result = addData(citySEAsia, result);
+ return result;
+ }
- public void setData(ArrayList data) {
- this.data = data;
- }
+ public ArrayList getData() {
+ return data;
+ }
- public String getProperty() {
- return property;
- }
+ public void setData(ArrayList data) {
+ this.data = data;
+ }
- public void setProperty(String property) {
- this.property = property;
- }
+ public String getProperty() {
+ return property;
+ }
- public String getCellpadding() {
- return cellpadding;
- }
+ public void setProperty(String property) {
+ this.property = property;
+ }
- public void setCellpadding(String cellpadding) {
- this.cellpadding = cellpadding;
- }
+ public String getCellpadding() {
+ return cellpadding;
+ }
- public String getCellspacing() {
- return cellspacing;
- }
+ public void setCellpadding(String cellpadding) {
+ this.cellpadding = cellpadding;
+ }
- public void setCellspacing(String cellspacing) {
- this.cellspacing = cellspacing;
- }
+ public String getCellspacing() {
+ return cellspacing;
+ }
- public int getFirst() {
- return first;
- }
+ public void setCellspacing(String cellspacing) {
+ this.cellspacing = cellspacing;
+ }
- public int getIntFirst() {
- return first;
- }
+ public int getFirst() {
+ return first;
+ }
- public void setFirst(int first) {
- this.first = first;
- }
+ public int getIntFirst() {
+ return first;
+ }
- public String getFrequency() {
- return frequency;
- }
+ public void setFirst(int first) {
+ this.first = first;
+ }
- public double getDoubleFrequency() {
- return Double.parseDouble(getFrequency());
- }
+ public String getFrequency() {
+ return frequency;
+ }
- public void setFrequency(String frequency) {
- this.frequency = frequency;
- }
+ public double getDoubleFrequency() {
+ return Double.parseDouble(getFrequency());
+ }
- public String getMinchars() {
- return minchars;
- }
+ public void setFrequency(String frequency) {
+ this.frequency = frequency;
+ }
- public void setMinchars(String minchars) {
- this.minchars = minchars;
- }
+ public String getMinchars() {
+ return minchars;
+ }
- public String getRows() {
- return rows;
- }
+ public void setMinchars(String minchars) {
+ this.minchars = minchars;
+ }
- public int getIntRows() {
- return Integer.parseInt(getRows());
- }
+ public String getRows() {
+ return rows;
+ }
- public void setRows(String rows) {
- this.rows = rows;
- }
+ public int getIntRows() {
+ return Integer.parseInt(getRows());
+ }
- public String getRules() {
- return rules;
- }
+ public void setRows(String rows) {
+ this.rows = rows;
+ }
- public void setRules(String rules) {
- this.rules = rules;
- }
+ public String getRules() {
+ return rules;
+ }
- public ArrayList getTokens() {
- return tokens;
- }
+ public void setRules(String rules) {
+ this.rules = rules;
+ }
- public void setTokens(ArrayList tokens) {
- this.tokens = tokens;
- }
+ public ArrayList getTokens() {
+ return tokens;
+ }
- public void OnSelect() {
- System.out.print("Onselect works!!!");
- }
+ public void setTokens(ArrayList tokens) {
+ this.tokens = tokens;
+ }
- public String getBorder() {
- return border;
- }
+ public void OnSelect() {
+ System.out.print("Onselect works!!!");
+ }
- public void setBorder(String border) {
- this.border = border;
- }
+ public String getBorder() {
+ return border;
+ }
- public String getHeight() {
- return height;
- }
+ public void setBorder(String border) {
+ this.border = border;
+ }
- public void setHeight(String height) {
- this.height = height;
- }
+ public String getHeight() {
+ return height;
+ }
- public String getShadowOpacity() {
- return shadowOpacity;
- }
+ public void setHeight(String height) {
+ this.height = height;
+ }
- public void setShadowOpacity(String shadowOpacity) {
- this.shadowOpacity = shadowOpacity;
- }
+ public String getShadowOpacity() {
+ return shadowOpacity;
+ }
- public String getWidth() {
- return width;
- }
+ public void setShadowOpacity(String shadowOpacity) {
+ this.shadowOpacity = shadowOpacity;
+ }
- public void setWidth(String width) {
- this.width = width;
- }
+ public String getWidth() {
+ return width;
+ }
- public String getBgColor() {
- return bgColor;
- }
+ public void setWidth(String width) {
+ this.width = width;
+ }
- public void setBgColor(String bgColor) {
- this.bgColor = bgColor;
- }
+ public String getBgColor() {
+ return bgColor;
+ }
- public boolean isFocus() {
- return focus;
- }
+ public void setBgColor(String bgColor) {
+ this.bgColor = bgColor;
+ }
- public void setFocus(boolean focus) {
- this.focus = focus;
- }
+ public boolean isFocus() {
+ return focus;
+ }
- public String getZindex() {
- return zindex;
- }
+ public void setFocus(boolean focus) {
+ this.focus = focus;
+ }
- public void setZindex(String zindex) {
- this.zindex = zindex;
- }
+ public int getZindex() {
+ return zindex;
+ }
- public String getShadowDepth() {
- return shadowDepth;
- }
+ public void setZindex(int zindex) {
+ this.zindex = zindex;
+ }
- public void setShadowDepth(String shadowDepth) {
- this.shadowDepth = shadowDepth;
- }
+ public String getShadowDepth() {
+ return shadowDepth;
+ }
- public void bTest1(){
+ public void setShadowDepth(String shadowDepth) {
+ this.shadowDepth = shadowDepth;
+ }
+
+ public void bTest1() {
setBorder("2");
setCellpadding("0");
setCellspacing("0");
@@ -289,10 +288,10 @@
setMinchars("1");
setShadowDepth("11");
setShadowOpacity("3");
- setZindex("3");
+ setZindex(3);
}
- public void bTest2(){
+ public void bTest2() {
setBorder("0");
setCellpadding("3");
setCellspacing("3");
@@ -302,10 +301,10 @@
setMinchars("1");
setShadowDepth("1");
setShadowOpacity("7");
- setZindex("3");
+ setZindex(3);
}
-
- public void bTest3(){
+
+ public void bTest3() {
setBorder("1");
setCellpadding("5");
setCellspacing("0");
@@ -315,10 +314,10 @@
setMinchars("2");
setShadowDepth("1");
setShadowOpacity("7");
- setZindex("3");
+ setZindex(3);
}
-
- public void bTest4(){
+
+ public void bTest4() {
setBorder("1");
setCellpadding("0");
setCellspacing("5");
@@ -328,10 +327,10 @@
setMinchars("2");
setShadowDepth("7");
setShadowOpacity("1");
- setZindex("3");
+ setZindex(3);
}
-
- public void bTest5(){
+
+ public void bTest5() {
setBorder("4");
setCellpadding("1");
setCellspacing("1");
@@ -341,6 +340,6 @@
setMinchars("2");
setShadowDepth("5");
setShadowOpacity("5");
- setZindex("1");
+ setZindex(1);
}
}
Modified: branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java 2007-12-11 13:26:33 UTC (rev 4701)
@@ -11,7 +11,7 @@
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 width;
- private String rows;
+ private int rows;
private String key;
private boolean hideWhenScrolling;
@@ -25,7 +25,7 @@
public ScrollableDataTable() {
width = "400px";
- rows = "30";
+ rows = 30;
hideWhenScrolling = false;
data = new ArrayList<Data>();
@@ -52,11 +52,11 @@
this.width = width;
}
- public String getRows() {
+ public int getRows() {
return rows;
}
- public void setRows(String rows) {
+ public void setRows(int rows) {
this.rows = rows;
}
Modified: 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 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenu.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -3,7 +3,7 @@
<h:panelGrid columns="2">
<rich:panel style="width: 130px; height: 50px; background-color: #98FB98;">
<h:outputText value="panel with contextMenu(DEFAULT)" />
- <rich:contextMenu id="contextMenuDefaultID" submitMode="ajax">
+ <rich:contextMenu id="contextMenuDefaultID" submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}">
<rich:menuItem icon="/pics/header.png" value="abc" reRender="cmInfoID">
<f:param name="cmdParam" value="abc" />
</rich:menuItem>
@@ -93,13 +93,13 @@
</rich:contextMenu>
</rich:panel>
</h:panelGrid>
- <h:panelGrid id="cmInfoID" olumns="2">
+
+ <a4j:commandButton value="reRender" reRender="cmInfoID"></a4j:commandButton>
+
+ <h:panelGrid id="cmInfoID" columns="2">
<h:outputText value="Select items: " />
<h:outputText value="#{contextMenu.info}" style="color: red" />
</h:panelGrid>
- <a4j:commandButton value="abc" reRender="cmInfoID">
-
- </a4j:commandButton>
<h:panelGrid id="pgcmTestID" columns="3">
<h:selectOneMenu value="#{contextMenu.selectOneMenu}">
@@ -147,7 +147,7 @@
<rich:tabPanel id="tpcmTestID" switchType="client">
<rich:tab id="t1cmTestID" label="tab1">
- <rich:contextMenu submitMode="ajax">
+ <rich:contextMenu submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}">
<rich:menuItem icon="/pics/header.png" value="tab1" reRender="cmInfoID">
<f:param name="cmdParam" value="tab1" />
</rich:menuItem>
@@ -165,7 +165,7 @@
<h:outputText value="text1" />
</rich:tab>
<rich:tab id="t2cmTestID" label="tab2">
- <rich:contextMenu submitMode="ajax">
+ <rich:contextMenu submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}">
<rich:menuItem icon="/pics/header.png" value="tab2" reRender="cmInfoID">
<f:param name="cmdParam" value="tab2" />
</rich:menuItem>
@@ -183,7 +183,7 @@
<h:outputText value="text2" />
</rich:tab>
<rich:tab id="t3cmTestID" label="tab3">
- <rich:contextMenu submitMode="ajax">
+ <rich:contextMenu submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}">
<rich:menuItem icon="/pics/header.png" value="tab3" reRender="cmInfoID">
<f:param name="cmdParam" value="tab3" />
</rich:menuItem>
@@ -239,9 +239,7 @@
</rich:menuItem>
</rich:contextMenu>
</rich:tabPanel>
- <a4j:commandButton value="abc" reRender="cmInfoID">
- </a4j:commandButton>
-
+
<h:graphicImage id="gicmID" value="/pics/asus.jpg" height="125px" width="150px">
<rich:contextMenu attached="#{contextMenu.attached}" submitMode="#{contextMenu.submitMode}" event="#{contextMenu.event}"
disableDefaultMenu="#{contextMenu.disableDefaultMenu}" rendered="#{contextMenu.rendered}" hideDelay="#{contextMenu.hideDelay}"
@@ -324,49 +322,6 @@
</rich:contextMenu>
</h:inputText>
- <h:panelGroup>
- <div id="divcmTestID" style="width: 80px; height: 45px; background-color: #008080;">
- <rich:contextMenu attached="#{contextMenu.attached}" submitMode="#{contextMenu.submitMode}" event="#{contextMenu.event}"
- disableDefaultMenu="#{contextMenu.disableDefaultMenu}" rendered="#{contextMenu.rendered}" hideDelay="#{contextMenu.hideDelay}"
- showDelay="#{contextMenu.showDelay}" popupWidth="#{contextMenu.popupWidth}">
- <rich:menuItem icon="/pics/header.png" value="div" reRender="cmInfoID">
- <f:param name="cmdParam" value="div" />
- </rich:menuItem>
- <rich:menuSeparator />
- <rich:menuItem icon="/pics/info.gif" value="action" action="alert('action work')" reRender="cmInfoID">
- <f:param name="cmdParam" value="action" />
- </rich:menuItem>
- <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{contextMenu.actionListener}" reRender="cmInfoID">
- </rich:menuItem>
- <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" action="submit()" reRender="cmInfoID">
- <f:param name="cmdParam" value="ajaxSingle" />
- </rich:menuItem>
- <rich:menuItem icon="/pics/fatal.gif" value="disabled" disabled="true" reRender="cmInfoID">
- <f:param name="cmdParam" value="disabled" />
- </rich:menuItem>
- <rich:menuItem icon="/pics/fatal.gif" value="immediate" immediate="true" action="submit();">
- <f:param name="cmdParam" value="immedeate" />
- <h:inputText value="#{contextMenu.inputText}" />
- </rich:menuItem>
- <rich:menuItem icon="/pics/fatal.gif" value="submitMode: none" submitMode="none" reRender="cmInfoID">
- <f:param name="cmdParam" value="none" />
- </rich:menuItem>
- <rich:menuItem icon="/pics/fatal.gif" value="submitMode: server" submitMode="server" reRender="cmInfoID">
- <f:param name="cmdParam" value="server" />
- </rich:menuItem>
- <rich:menuItem icon="/pics/fatal.gif" value="submitMode: ajax" submitMode="ajax" reRender="cmInfoID">
- <f:param name="cmdParam" value="ajax" />
- </rich:menuItem>
- <rich:menuItem value="select">
- <h:selectOneMenu value="#{contextMenu.selectOneMenu}" onchange="submit();">
- <f:selectItem itemLabel="item1" itemValue="item1" />
- <f:selectItem itemLabel="item2" itemValue="item2" />
- </h:selectOneMenu>
- </rich:menuItem>
- </rich:contextMenu>
- </div>
-</h:panelGroup>
-
<h:panelGrid id="pgTestID" columns="1" border="5" cellpadding="2" cellspacing="2">
<h:outputText value="panelGrid" />
<h:outputText value="" />
Modified: 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 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataDefinitionList/DataDefinitionList.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -1,7 +1,7 @@
<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}"
+ rendered="#{dataDefinitionList.rendered}" title="#{dataDefinitionList.title}" dir="#{dataDefinitionList.dir}"
rows="#{dataDefinitionList.rows}">
<f:facet name="header">
<h:outputText value="Africa(header):" />
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -1,6 +1,10 @@
<f:subview id="DtadAndDropSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core"
xmlns:rich="http://richfaces.org/rich" xmlns:h="http://java.sun.com/jsf/html">
-
+
+ <script type="text/javascript">
+ DnD.CLIENT_VALIDATION_OFF = false;
+ </script>
+
<h:panelGroup id="dragValueText">
<h:outputText value="#{dndBean.dragValue}" />
</h:panelGroup>
@@ -24,8 +28,8 @@
<h:outputText value="#{type} - drop" />
<rich:dropSupport reRender="dragValueText" ondragenter="print('InputID', ' work!')" ondragexit="print('InputID', ' work!')"
ondrop="print('InputID', ' work!')" ondropend="print('InputID', ' work!')"
- oncomplete="print('oncompleteInputID', 'oncomplete work!')" ondragend="print('ondragendInputID', 'ondragend work!')"
- ondragstart="print('ondragstartInputID', 'ondragstart work!')" onsubmit="print('onsubmitInputID', 'onsubmit work!')"
+ oncomplete="print('oncompleteInputID', 'oncomplete work!')"
+ onsubmit="print('onsubmitInputID', 'onsubmit work!')"
action="#{dndBean.dropAction}" acceptedTypes="#{type}" dropListener="#{dndBean.processDrop}" dropValue="#{type} - value">
</rich:dropSupport>
</h:panelGrid>
@@ -68,10 +72,10 @@
<h:panelGrid styleClass="dropzoneDecoration" id="grid1">
<f:verbatim>Accepts file and folder... Customizes</f:verbatim>
<rich:dropSupport id="zone1"
- oncomplete="print('oncompleteInputID', 'oncomplete work!')" ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')"
+ oncomplete="print('oncompleteInputID', 'oncomplete work!')"
onsubmit="print('onsubmitInputID', 'onsubmit work!')" ondragenter="print('ondragenterInputID', 'ondragenter work!')"
ondragexit="print('ondragexitInputID', 'ondragexit work!')" ondropend="print('ondropendInputID', 'ondropend work!')"
- ondrop="print('ondropInputID', 'ondrop work!');var zone = $('DtadAndDropSubviewID:form:grid1'); zone.style.borderColor= 'red'; setTimeout( function() { this.style.borderColor= 'navy'; }.bind(zone), 300);"
+ ondrop="print('ondropInputID', 'ondrop work!')"
acceptedTypes="file, folder" typeMapping="{file: testDrop}">
<rich:dndParam name="testDrop">
<h:graphicImage height="16" width="16"
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenu.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -3,7 +3,7 @@
<h:panelGrid columns="2">
<rich:spacer width="400px" height="400px"></rich:spacer>
<rich:panel>
- <rich:dropDownMenu id="ddmId" value="" submitMode="#{dDMenu.mode}" hideDelay="#{dDMenu.hideDelay}"
+ <rich:dropDownMenu id="ddmId" value="dropDownMenu" submitMode="#{dDMenu.mode}" hideDelay="#{dDMenu.hideDelay}"
direction="#{dDMenu.direction}" horizontalOffset="#{dDMenu.horizontalOffset}" jointPoint="#{dDMenu.jointPoint}"
popupWidth="#{dDMenu.popupWidth}" showDelay="#{dDMenu.showDelay}" rendered="#{dDMenu.rendered}"
verticalOffset="#{dDMenu.verticalOffset}" styleClass="panelpos" event="#{dDMenu.event}"
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -49,14 +49,6 @@
</f:verbatim>
</h:panelGroup>
- <a4j:outputPanel id="zoomer">
- <script>
- function zoomIt() {
- map.setZoom(#{gmap.zoom});
- }
- </script>
- </a4j:outputPanel>
-
<a4j:outputPanel>
<script>
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/InputNumberSlider/InputNumberSlider.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -1,9 +1,9 @@
<f:subview id="inputNumberSliderSubviewID" 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="1">
- <rich:inputNumberSlider id="SliderId" immediate="#{inputNumberSlider.immediate}"
+ <rich:inputNumberSlider id="SliderId" immediate="#{inputNumberSlider.immediate}"
inputPosition="#{inputNumberSlider.inputPosition}" showToolTip="#{inputNumberSlider.showToolTip}"
- tabindex="#{inputNumberSlider.tabindex}" value="#{inputNumberSlider.value}" valueChangeListener="{key}"
+ tabindex="#{inputNumberSlider.tabindex}" value="#{inputNumberSlider.value}" valueChangeListener="#{inputNumberSlider.valueChangeListener}"
required="#{inputNumberSlider.rendered}" requiredMessage="#{inputNumberSlider.requiredMessage}"
disabled="#{inputNumberSlider.disabled}" enableManualInput="#{inputNumberSlider.enableManualInput}"
inputSize="#{inputNumberSlider.inputSize}" maxValue="#{inputNumberSlider.maxValue}" minValue="#{inputNumberSlider.minValue}"
@@ -11,9 +11,12 @@
step="#{inputNumberSlider.step}" showInput="#{inputNumberSlider.showInput}" width="#{inputNumberSlider.width}"
barClass="#{inputNumberSlider.barStyle}" tipClass="#{inputNumberSlider.tipStyle}" inputClass="#{inputNumberSlider.inputStyle}"
handleClass="#{inputNumberSlider.handleStyle}" styleClass="#{inputNumberSlider.tipStyle}"
- maxlength="#{inputNumberSlider.maxlength}" onmousedown="print('onmousedownInputID', 'onmousedown work!')"
- >
+ maxlength="#{inputNumberSlider.maxlength}" onmousedown="print('onmousedownInputID', 'onmousedown work!')" >
</rich:inputNumberSlider>
+ <h:panelGroup>
+ <a4j:commandButton value="valueChangeListener (show)" reRender="valueCLID" />
+ <h:outputText id="valueCLID" value=" #{inputNumberSlider.valueChangeListener}" />
+ </h:panelGroup>
</h:panelGrid>
<rich:spacer height="20px"></rich:spacer>
</f:subview>
\ No newline at end of file
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -14,7 +14,7 @@
targetCaptionLabel="#{listShuttle.targetCaptionLabel}"
topControlLabel="#{listShuttle.topControlLabel}" upControlLabel="#{listShuttle.upControlLabel}">
- <h:column width="100px">
+ <h:column>
<f:facet name="header">
<h:outputText value="Number" />
</f:facet>
@@ -28,7 +28,7 @@
<h:inputText value="#{item.str0}" />
</h:column>
- <h:column width="100px">
+ <h:column>
<f:facet name="header">
<h:outputText value="Button" />
</f:facet>
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -19,7 +19,7 @@
</h:column>
<h:column>
<h:dataTable id="allInfoLSSourceID" value="#{listShuttle.sourceValue}" var="allInfo" rendered="#{listShuttle.showAllSourceData}" border="1">
- <h:column width="100px">
+ <h:column>
<f:facet name="header">
<h:outputText value="Number" />
</f:facet>
@@ -97,7 +97,7 @@
<h:outputText value="#{allInfo.str0}" />
</h:column>
- <h:column width="100px">
+ <h:column>
<f:facet name="header">
<h:outputText value="Button" />
</f:facet>
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -40,7 +40,7 @@
showSummary="#{message.showSummary}" passedLabel="No Error" errorLabelClass="errorLabel" fatalLabelClass="warnLabel"
infoLabelClass="infoLabel" warnLabelClass="fatalLabel" warnMarkerClass="markerWarn" infoMarkerClass="markerInfo"
errorMarkerClass="markerError" fatalMarkerClass="markerFatal" errorClass="errorClass" fatalClass="fatalClass"
- warnClass="warnClass" infoClass="infoClass" labelClass="labelClass" var="messages" styleClass="class" title="#{message.title}">
+ warnClass="warnClass" infoClass="infoClass" labelClass="labelClass" styleClass="class" title="#{message.title}">
<f:facet name="errorMarker">
<h:graphicImage url="/pics/error.gif" />
</f:facet>
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -82,21 +82,6 @@
<h:selectBooleanCheckbox value="#{modalPanel.moveable}">
<a4j:support event="onclick" reRender="modalPanelID"></a4j:support>
</h:selectBooleanCheckbox>
-
- <h:outputText value="immediate" />
- <h:selectBooleanCheckbox value="#{modalPanel.immediate}" >
- <a4j:support event="onchange" action="submit();"></a4j:support>
- </h:selectBooleanCheckbox>
-
- <h:outputText value="required" />
- <h:selectBooleanCheckbox value="#{modalPanel.required}" >
- <a4j:support event="onchange" action="suport();"></a4j:support>
- </h:selectBooleanCheckbox>
-
- <h:outputText value="requiredMessage" />
- <h:inputText value="#{modalPanel.requiredMessage}" >
- <a4j:support event="onchange" action="submit();"></a4j:support>
- </h:inputText>
</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-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -10,7 +10,7 @@
bottomControlLabel="#{orderingList.bottomControlLabel}" captionLabel="#{orderingList.captionLabel}"
topControlLabel="#{orderingList.topControlLabel}" upControlLabel="#{orderingList.upControlLabel}"
controlsHorizontalAlign="#{orderingList.controlsHorizontalAlign}" controlsVerticalAlign="#{orderingList.controlsVerticalAlign}"
- headerLabel="#{orderingList.headerLabel}" downControlLabel="#{orderingList.downControlLabel}"
+ downControlLabel="#{orderingList.downControlLabel}"
orderControlsVisible="#{orderingList.orderControlsVisible}" fastOrderControlsVisible="#{orderingList.fastOrderControlsVisible}"
rendered="#{orderingList.rendered}" showButtonLabels="#{orderingList.showButtonLabels}" selection="#{orderingList.selection}"
onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onclick="print('onclickInputID', 'onclick work!')"
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-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -19,11 +19,6 @@
<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="listHeight:" />
<h:inputText value="#{orderingList.listHeight}">
<a4j:support event="onchange" reRender="orderingListID"></a4j:support>
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-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -40,7 +40,7 @@
</h:column>
<h:column>
<h:dataTable id="allInfoPanelID" value="#{orderingList.list}" var="allInfo" rendered="#{orderingList.showAllData}" border="1">
- <h:column width="100px">
+ <h:column>
<f:facet name="header">
<h:outputText value="Number" />
</f:facet>
@@ -54,7 +54,7 @@
<h:outputText value="#{allInfo.str0}" />
</h:column>
- <h:column width="100px">
+ <h:column>
<f:facet name="header">
<h:outputText value="Button" />
</f:facet>
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -48,7 +48,7 @@
</f:verbatim>
<rich:panel style="width:50px; height:50px; background-color: gray">
- <rich:toolTip id="tooltipID" value="#{tooltip.value}" mode="#{tooltip.mode}" delay="#{tooltip.delay}"
+ <rich:toolTip id="tooltipID" value="#{tooltip.value}" mode="#{tooltip.mode}"
layout="#{tooltip.layout}" horizontalOffset="#{tooltip.horizontalOffset}" verticalOffset="#{tooltip.verticalOffset}"
followMouse="#{tooltip.followMouse}" direction="#{tooltip.direction}" style="#{tooltip.style}" disabled="#{tooltip.disabled}"
rendered="#{tooltip.rendered}" onclick="print('onclickInputID', 'onclick work!')"
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -11,13 +11,7 @@
onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"/>
</h:panelGrid>
- <a4j:outputPanel id="zoomer">
- <script>
- function zoomIt() {
- map.setZoom(#{virtualEarth.zoom});
- }
- </script>
- </a4j:outputPanel>
+
<a4j:outputPanel>
<script>
function createMarker(point,html) {
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-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -117,7 +117,7 @@
<to-view-id>/ScrollableDataTable/ScrollableDataTable.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>Test</from-outcome>
+ <from-outcome>RichFaces</from-outcome>
<to-view-id>/pages/Rich/Rich.xhtml</to-view-id>
</navigation-case>
<navigation-case>
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-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -1,7 +1,7 @@
<!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">
-<f:view id="view">
+<f:view>
<head>
<f:loadBundle basename="message" var="msg" />
<title></title>
@@ -40,8 +40,7 @@
<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;">
+ <rich:modalPanel id="eventInfoID" autosized="true" minHeight="550" minWidth="200" moveable="true" style="overflow: true;">
<f:facet name="header">
<h:outputText value="Events ..." />
</f:facet>
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/main.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/main.xhtml 2007-12-11 13:25:46 UTC (rev 4700)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/main.xhtml 2007-12-11 13:26:33 UTC (rev 4701)
@@ -16,7 +16,7 @@
<rich:spacer></rich:spacer>
<rich:panel>
<h:panelGrid columns="2" cellpadding="5px" cellspacing="5px">
- <h:commandLink value="RichFaces" action="Test"></h:commandLink>
+ <h:commandLink value="RichFaces" action="RichFaces"></h:commandLink>
<h:commandLink value="Div" action="TestDiv"></h:commandLink>
<h:commandLink value="Select" action="Map"></h:commandLink>
<h:commandLink value="Customize page" action="CustomizePage"></h:commandLink>
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4700 - trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2007-12-11 08:25:46 -0500 (Tue, 11 Dec 2007)
New Revision: 4700
Modified:
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
Log:
RF-1453
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-12-11 13:24:56 UTC (rev 4699)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-12-11 13:25:46 UTC (rev 4700)
@@ -706,10 +706,29 @@
writer.startElement("tbody", grid);
grid.walk(context, ajaxRowsRenderer, state);
+ int fakeRowsCount = grid.getRows() - grid.getRowCount();
+ state.setFake(true);
+ for (int i = 0; i < fakeRowsCount; i++) {
+ ajaxRowsRenderer.process(context, null, state);
+ }
+ state.setFake(false);
+
writer.endElement("tbody");
writer.endElement("table");
+ String id = client_id+"_rows_input";
+ writer.startElement(HTML.INPUT_ELEM, grid);
+ writer.writeAttribute(HTML.TYPE_ATTR, "hidden", null);
+ writer.writeAttribute(HTML.id_ATTRIBUTE, id, null);
+ writer.writeAttribute(HTML.NAME_ATTRIBUTE, id, null);
+ writer.writeAttribute(HTML.value_ATTRIBUTE, grid.getRowCount(), null);
+ writer.endElement(HTML.INPUT_ELEM);
+ ajaxContext.addRenderedArea(id);
+
+ renderHiddenScrollInput(context, grid);
+ ajaxContext.addRenderedArea(client_id+":si");
+
ScrollableDataTableRendererState.restoreState(context);
grid.setRowKey(null);
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4699 - trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2007-12-11 08:24:56 -0500 (Tue, 11 Dec 2007)
New Revision: 4699
Modified:
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java
Log:
RF-1453
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java 2007-12-11 13:24:41 UTC (rev 4698)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java 2007-12-11 13:24:56 UTC (rev 4699)
@@ -129,6 +129,7 @@
if (log.isTraceEnabled()) {
log.trace("UIScrollableDataTable.processDecodes(faces)");
}
+ checkRange();
super.processDecodes(faces);
}
@@ -158,6 +159,7 @@
}
useSavedRanges = false;
+ checkRange();
super.encodeBegin(context);
}
@@ -386,4 +388,12 @@
public void resetReqRowsCount() {
this.reqRowsCount = -1;
}
+
+ private void checkRange() {
+ int rows = getRows();
+ if (getRowCount() <= getFirst() + getRows()) {
+ setFirst(0);
+ setScrollPos("0,0," + rows);
+ }
+ }
}
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4698 - in branches/3.1.x/test-applications/jsp/src/main: java/calendar and 60 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-12-11 08:24:41 -0500 (Tue, 11 Dec 2007)
New Revision: 4698
Added:
branches/3.1.x/test-applications/jsp/src/main/java/componentControl/
branches/3.1.x/test-applications/jsp/src/main/java/componentControl/ComponentControl.java
branches/3.1.x/test-applications/jsp/src/main/java/orderingList/
branches/3.1.x/test-applications/jsp/src/main/java/orderingList/OrderingList.java
branches/3.1.x/test-applications/jsp/src/main/java/util/converter/
branches/3.1.x/test-applications/jsp/src/main/java/util/converter/ListShuttleConverter.java
branches/3.1.x/test-applications/jsp/src/main/java/util/converter/OrderingListConverter.java
branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ComponentControl.xml
branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml
Removed:
branches/3.1.x/test-applications/jsp/src/main/java/tree/CachingTreeDataLocator.java
branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Sb.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Sb.xhtml
Modified:
branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarBean.java
branches/3.1.x/test-applications/jsp/src/main/java/dataScroller/Data.java
branches/3.1.x/test-applications/jsp/src/main/java/ddMenu/DDMenu.java
branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java
branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java
branches/3.1.x/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java
branches/3.1.x/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java
branches/3.1.x/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java
branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java
branches/3.1.x/test-applications/jsp/src/main/java/sb/Data.java
branches/3.1.x/test-applications/jsp/src/main/java/sb/Sb.java
branches/3.1.x/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java
branches/3.1.x/test-applications/jsp/src/main/java/tooltip/Tooltip.java
branches/3.1.x/test-applications/jsp/src/main/java/tree/Bean.java
branches/3.1.x/test-applications/jsp/src/main/java/tree/Library.java
branches/3.1.x/test-applications/jsp/src/main/java/tree/test.xml
branches/3.1.x/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java
branches/3.1.x/test-applications/jsp/src/main/java/util/data/Data.java
branches/3.1.x/test-applications/jsp/src/main/java/util/phaseTracker/PhaseTracker.java
branches/3.1.x/test-applications/jsp/src/main/java/virtualEarth/VirtualEarth.java
branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenuProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionList.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedListProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Effect/Effect.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Insert/Insert.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Insert/InsertProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Message/Message.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/OrderingList/OrderingListProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/OrderingList/OrderingListStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/Separator.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanelStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/ToolBar/ToolBarProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipStraightforward.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Tree/Tree.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp
branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataOrderedList.xml
branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml
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/Rich/Rich.jsp
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:
update add or delete attribute
-add contextMenu
-add componentControl
-add listShuttle
-add orderingList
-fix calendar
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-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -33,21 +33,18 @@
import org.richfaces.event.CurrentDateChangeEvent;
-import util.componentInfo.ComponentInfo;
-
public class CalendarBean {
- private static final String [] WEEK_DAY_SHORT = new String[] { "|>Sun*<|",
- "|>Mon +<|", "|>Tue +<|", "|>Wed +<|", "|>Thu +<|", "|>Fri +<|", "|>Sat*<|" };
- private static final String [] WEEK_DAY = new String[] { "|>Saturday*<|", "|>Monday+<|",
- "|>Tuesday+<|", "|>Wednesday+<|", "|>Thursday+<|", "|>Friday+<|", "|>Sunday*<|"};
- private static final String [] MOUNT_LABELS = new String[] { "January +",
- "February +", "March +", "April +", "May +", "June +", "July +", "August +",
- "September +", "October +", "November +", "December +" };
- private static final String [] MOUNT_LABELS_SHORT = new String[] { "Jan +",
- "Feb +", "Mar +", "Apr +", "May +", "Jun +", "Jul +", "Aug +",
- "Sep +", "Oct +", "Nov +", "Dec +" };
-
+ private static final String [] WEEK_DAY_SHORT = new String[] { "Sun*",
+ "Mon +", "Tue +", "Wed +", "Thu +", "Fri +", "Sat*" };
+ private static final String [] WEEK_DAY = new String[] { "*Saturday*", "+Monday+",
+ "+Tuesday+", "+Wednesday+", "+Thursday+", "+Friday+", "*Sunday*"};
+ private static final String [] MOUNT_LABELS = new String[] { "January+",
+ "February+", "March+", "April+", "May +", "June +", "July +", "August +",
+ "September +", "October +", "November +", "December +" };
+ private static final String [] MOUNT_LABELS_SHORT = new String[] { "+Jan+",
+ "+Feb+", "+Mar+", "+Apr+", "+May+", "+Jun+", "+Jul+", "+Aug+",
+ "+Sep+", "+Oct+", "+Nov+", "+Dec+" };
private Locale locale;
private TimeZone tZone;
private boolean popup;
@@ -77,8 +74,7 @@
private String timeZone;
private int zindex;
private int counter;
- private ComponentInfo info;
-
+
public CalendarBean() {
mode = "client";
label = "Button label";
Added: branches/3.1.x/test-applications/jsp/src/main/java/componentControl/ComponentControl.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/componentControl/ComponentControl.java (rev 0)
+++ branches/3.1.x/test-applications/jsp/src/main/java/componentControl/ComponentControl.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -0,0 +1,17 @@
+package componentControl;
+
+public class ComponentControl {
+ private boolean calendarPopup;
+
+ public ComponentControl() {
+ calendarPopup = false;
+ }
+
+ public boolean isCalendarPopup() {
+ return calendarPopup;
+ }
+
+ public void setCalendarPopup(boolean calendarPopup) {
+ this.calendarPopup = calendarPopup;
+ }
+}
Modified: branches/3.1.x/test-applications/jsp/src/main/java/dataScroller/Data.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/dataScroller/Data.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/dataScroller/Data.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -31,7 +31,7 @@
public int getData1() {
return data1;
}
-
+
public String getData2() {
return data2;
}
Modified: branches/3.1.x/test-applications/jsp/src/main/java/ddMenu/DDMenu.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/ddMenu/DDMenu.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/ddMenu/DDMenu.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -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/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,6 @@
package inputNumberSlider;
import javax.faces.event.ValueChangeEvent;
-import javax.faces.event.ValueChangeListener;
public class InputNumberSlider {
@@ -20,6 +19,7 @@
private String inputStyle;
private String tipStyle;
private String handleStyle;
+ private String valueChangeListener;
private boolean immediate;
private boolean required;
private boolean showToolTip;
@@ -274,6 +274,11 @@
this.value = value;
}
+ public void valueChangeListener(ValueChangeEvent event) {
+ valueChangeListener = (String)event.getNewValue();
+ System.out.println("valueChangeListener: " + valueChangeListener);
+ }
+
public void bTest1(){
setMinValue("0");
setMaxValue("9");
@@ -286,6 +291,7 @@
setShowToolTip(true);
setShowBoundaryValues(true);
setShowInput(true);
+ setMaxlength(2);
}
public void bTest2(){
@@ -299,7 +305,7 @@
setStep("50");
setShowToolTip(false);
setShowBoundaryValues(true);
- setShowInput(true);
+ setMaxlength(5);
}
public void bTest3(){
@@ -313,6 +319,7 @@
setStep("2");
setShowToolTip(false);
setShowBoundaryValues(true);
+ setMaxlength(6);
}
public void bTest4(){
@@ -326,6 +333,7 @@
setStep("2");
setShowToolTip(false);
setShowBoundaryValues(true);
+ setMaxlength(2);
}
public void bTest5(){
@@ -339,5 +347,10 @@
setStep("2");
setShowToolTip(false);
setShowBoundaryValues(false);
+ setMaxlength(8);
}
+
+ public String getValueChangeListener() {
+ return valueChangeListener;
+ }
}
Modified: branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -5,7 +5,7 @@
// private String size;
// private String controlPosition;
private int inputSize;
- private String tabindex;
+ private int tabindex;
private String max;
private String min;
private String value;
@@ -156,11 +156,11 @@
this.inputSize = inputSize;
}
- public String getTabindex() {
+ public int getTabindex() {
return tabindex;
}
- public void setTabindex(String tabindex) {
+ public void setTabindex(int tabindex) {
this.tabindex = tabindex;
}
@@ -171,7 +171,7 @@
setMin("0");
setMax("20");
setStep("1");
- setTabindex("2");
+ setTabindex(2);
setValue("1");
}
@@ -182,7 +182,7 @@
setMin("1000");
setMax("99999");
setStep("255");
- setTabindex("5");
+ setTabindex(5);
setValue("5555");
}
@@ -193,7 +193,7 @@
setMin("101");
setMax("202");
setStep("2");
- setTabindex("2");
+ setTabindex(2);
setValue("102");
}
@@ -204,7 +204,7 @@
setMin("33");
setMax("66");
setStep("11");
- setTabindex("3");
+ setTabindex(3);
setValue("55");
}
@@ -215,7 +215,7 @@
setMin("-99999");
setMax("99999");
setStep("33");
- setTabindex("5");
+ setTabindex(5);
setValue("101");
}
}
Modified: branches/3.1.x/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -20,10 +20,12 @@
private boolean showSelect;
private boolean showAllSourceData;
private boolean showAllTargetData;
+ private boolean switchByClick;
private ArrayList<Data> sourceValue;
private ArrayList<Data> targetValue;
private ArrayList<String> info;
- private Collection selection;
+ private Collection sourceSelection;
+ private Collection targetSelection;
private String bottomControlLabel;
private String copyAllControlLabel;
private String copyControlLabel;
@@ -32,7 +34,11 @@
private String removeControlLabel;
private String topControlLabel;
private String upControlLabel;
-
+ private String targetListWidth;
+ private String sourceListWidth;
+ private String listsHeight;
+ private String sourceCaptionLabel;
+ private String targetCaptionLabel;
public ListShuttle() {
this.first = 1;
@@ -54,10 +60,15 @@
this.topControlLabel = "top";
this.upControlLabel = "up";
this.info = new ArrayList<String>();
+ this.switchByClick = false;
+ this.targetListWidth = "300";
+ this.sourceListWidth = "300";
+ this.listsHeight = "400";
+ this.sourceCaptionLabel = "sourceCaptionLabel";
+ this.targetCaptionLabel = "targetCaptionLabel";
this.targetValue = new ArrayList<Data>();
this.sourceValue = new ArrayList<Data>();
- for(int i = 0; i < lenght; i++)
- sourceValue.add(new Data(i, "Button " + i, "Link " + i, "select" +(i % 5), statusIcon[i % 5]));
+ addNewItem();
}
public int getFirst() {
@@ -120,17 +131,6 @@
return targetValue;
}
- public Collection getSelection() {
- System.out.println("Selection.out: " + selection);
- return selection;
- }
-
- public void setSelection(Collection selection) {
- info.clear();
- addSelection(selection);
- this.selection = selection;
- }
-
public String getBottomControlLabel() {
return bottomControlLabel;
}
@@ -204,16 +204,6 @@
for(int i = sourceValue.size() + 1; i <= lenght; i++)
sourceValue.add(new Data(i, "Button " + i, "Link " + i, "select" +(i % 5), statusIcon[i % 5]));
}
-
- private void addSelection(Collection<Data> selection) {
- if(selection == null) return;
- Iterator<Data> inter = selection.iterator();
- Data data = new Data();
- while (inter.hasNext()) {
- data = inter.next();
- info.add(data.getInt0() + "; " + data.getStr0() + "; " + data.getStr1() + "; " + data.getStr2() + "; " + data.getStr3());
- }
- }
public int getLenght() {
return lenght;
@@ -224,6 +214,9 @@
}
public ArrayList<String> getInfo() {
+ info.clear();
+ addSelection(getSourceSelection(), "1. sourceSelection");
+ addSelection(getTargetSelection(), "2. targetSelection");
return info;
}
@@ -238,13 +231,11 @@
public void cbAction() {
info.clear();
info.add("commandButton submit();");
- addSelection(getSelection());
}
public void clAction() {
info.clear();
info.add("commandLink submit();");
- addSelection(getSelection());
}
public boolean isShowSelect() {
@@ -270,4 +261,78 @@
public void setShowAllTargetData(boolean showAllTargetData) {
this.showAllTargetData = showAllTargetData;
}
+
+ public Collection getSourceSelection() {
+ return sourceSelection;
+ }
+
+ public void setSourceSelection(Collection sourceSelection) {
+ this.sourceSelection = sourceSelection;
+ }
+
+ public Collection getTargetSelection() {
+ return targetSelection;
+ }
+
+ public void setTargetSelection(Collection targetSelection) {
+ this.targetSelection = targetSelection;
+ }
+
+ public boolean isSwitchByClick() {
+ return switchByClick;
+ }
+
+ public void setSwitchByClick(boolean switchByClick) {
+ this.switchByClick = switchByClick;
+ }
+
+ public String getTargetListWidth() {
+ return targetListWidth;
+ }
+
+ public void setTargetListWidth(String targetListWidth) {
+ this.targetListWidth = targetListWidth;
+ }
+
+ public String getSourceListWidth() {
+ return sourceListWidth;
+ }
+
+ public void setSourceListWidth(String sourceListWidth) {
+ this.sourceListWidth = sourceListWidth;
+ }
+
+ public String getListsHeight() {
+ return listsHeight;
+ }
+
+ public void setListsHeight(String listsHeight) {
+ this.listsHeight = listsHeight;
+ }
+
+ public String getSourceCaptionLabel() {
+ return sourceCaptionLabel;
+ }
+
+ public void setSourceCaptionLabel(String sourceCaptionLabel) {
+ this.sourceCaptionLabel = sourceCaptionLabel;
+ }
+
+ public String getTargetCaptionLabel() {
+ return targetCaptionLabel;
+ }
+
+ public void setTargetCaptionLabel(String targetCaptionLabel) {
+ this.targetCaptionLabel = targetCaptionLabel;
+ }
+
+ private void addSelection(Collection<Data> selection, String description) {
+ if(selection == null) return;
+ Iterator<Data> inter = selection.iterator();
+ Data data = new Data();
+ while (inter.hasNext()) {
+ data = inter.next();
+ info.add(description + ": " + data.getInt0() + "; " + data.getStr0() + "; " + data.getStr0() + "submit(); " + data.getStr1() + "; " + data.getStr1() + "submit(); " + data.getStr2() + "; " + data.getStr3());
+ }
+ }
}
Modified: branches/3.1.x/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -2,28 +2,61 @@
public class ModalPanel {
-
+ private boolean autosized;
+ private boolean keepVisualState;
+ private String left;
+ private String top;
+ private boolean rendered;
+ private String shadowDepth;
+ private String shadowOpacity;
+ private boolean showWhenRendered;
+ private int zindex;
private int minHeight;
private int minWidth;
private int height;
private int width;
-
private boolean moveable;
private boolean resizeable;
+ private String inputTextTest;
+ private String selectOneListboxTest;
- public ModalPanel() {
-
- minHeight = 100;
- minWidth = 100;
- height = 300;
- width = 300;
-
- moveable=true;
- resizeable=true;
-
+
+ public String getInputTextTest() {
+ return inputTextTest;
+ }
+ public void setInputTextTest(String inputTextTest) {
+ this.inputTextTest = inputTextTest;
}
+ public String getSelectOneListboxTest() {
+ return selectOneListboxTest;
+ }
+
+ public void setSelectOneListboxTest(String selectOneListboxTest) {
+ this.selectOneListboxTest = selectOneListboxTest;
+ }
+
+ public ModalPanel() {
+ this.inputTextTest = "text";
+ this.selectOneListboxTest = "1";
+ this.minHeight = 100;
+ this.minWidth = 100;
+ this.height = 300;
+ this.width = 300;
+ this.moveable=true;
+ this.resizeable=true;
+ this.autosized = false;
+ this.keepVisualState = false;
+ this.left = "100";
+ this.top = "100";
+ this.rendered = true;
+ this.shadowDepth = "3";
+ this.shadowOpacity = "3";
+ this.zindex = 3;
+ this.showWhenRendered = false;
+ }
+
public int getHeight() {
return height;
}
@@ -63,7 +96,12 @@
public void setResizeable(boolean resizeable) {
this.resizeable = resizeable;
}
+
+ public void setAutosized(boolean autosized) {
+ this.autosized = autosized;
+ }
+
public int getWidth() {
return width;
}
@@ -116,4 +154,72 @@
setMoveable(true);
setResizeable(true);
}
+
+ public boolean isAutosized() {
+ return autosized;
+ }
+
+ public boolean isKeepVisualState() {
+ return keepVisualState;
+ }
+
+ public void setKeepVisualState(boolean keepVisualState) {
+ this.keepVisualState = keepVisualState;
+ }
+
+ public String getLeft() {
+ return left;
+ }
+
+ public void setLeft(String left) {
+ this.left = left;
+ }
+
+ public String getTop() {
+ return top;
+ }
+
+ public void setTop(String top) {
+ this.top = top;
+ }
+
+ public boolean getRendered() {
+ return rendered;
+ }
+
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
+
+ public String getShadowDepth() {
+ return shadowDepth;
+ }
+
+ public void setShadowDepth(String shadowDepth) {
+ this.shadowDepth = shadowDepth;
+ }
+
+ public String getShadowOpacity() {
+ return shadowOpacity;
+ }
+
+ public void setShadowOpacity(String shadowOpacity) {
+ this.shadowOpacity = shadowOpacity;
+ }
+
+ public boolean isShowWhenRendered() {
+ return showWhenRendered;
+ }
+
+ public void setShowWhenRendered(boolean showWhenRendered) {
+ this.showWhenRendered = showWhenRendered;
+ }
+
+ public int getZindex() {
+ return zindex;
+ }
+
+ public void setZindex(int zindex) {
+ this.zindex = zindex;
+ }
}
Added: branches/3.1.x/test-applications/jsp/src/main/java/orderingList/OrderingList.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/orderingList/OrderingList.java (rev 0)
+++ branches/3.1.x/test-applications/jsp/src/main/java/orderingList/OrderingList.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -0,0 +1,355 @@
+package orderingList;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import javax.faces.component.html.HtmlDataTable;
+
+import util.data.Data;
+
+public class OrderingList{
+ private ArrayList<String> info;
+ private ArrayList<Data> list;
+ private String [] statusIcon = {"/pics/error.gif", "/pics/fatal.gif", "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif"};
+ private String captionLabel;
+ private Collection<Data> selection;
+ private String controlsType;
+ private String controlsVerticalAlign;
+ private String controlsHorizontalAlign;
+ private String bottomControlLabel;
+ private String upControlLabel;
+ private String topControlLabel;
+ private String downControlLabel;
+ private String listHeight;
+ private String listWidth;
+ private int lenght;
+ private boolean orderControlsVisible;
+ private boolean fastOrderControlsVisible;
+ private boolean rendered;
+ private boolean showButtonLabels;
+ private boolean facet;
+ private boolean showAllData;
+ private boolean showSelect;
+
+ public boolean isFacet() {
+ return facet;
+ }
+
+ public void setFacet(boolean facet) {
+ this.facet = facet;
+ }
+
+ public Collection<Data> getSelection() {
+ return selection;
+ }
+
+ public void setSelection(Collection<Data> selection) {
+ System.out.println("Selection.out: " + selection);
+ info.clear();
+ addSelection(selection);
+ this.selection = selection;
+ }
+
+ public ArrayList<Data> getList() {
+ return list;
+ }
+
+ public void setList(ArrayList<Data> list) {
+ 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(i, "Button " + i, "Link " + i, "select" +(i % 5), statusIcon[i % 5]));
+ }
+
+ public OrderingList() {
+ this.info = new ArrayList<String>();
+ this.captionLabel = "captionLabel";
+ this.lenght = 10;
+ this.listHeight = "300";
+ this.listWidth = "800";
+ this.controlsType = "button";
+ this.controlsHorizontalAlign = "right";
+ this.controlsVerticalAlign = "center";
+ this.bottomControlLabel = "bottom label";
+ this.upControlLabel = "up label";
+ this.downControlLabel = "down label";
+ this.topControlLabel = "top label";
+ this.orderControlsVisible = true;
+ this.fastOrderControlsVisible = true;
+ this.rendered = true;
+ this.showButtonLabels = true;
+ this.showAllData = true;
+ this.showSelect = true;
+ this.list = new ArrayList<Data>();
+ addNewItem();
+ }
+
+ public String getListHeight() {
+ return listHeight;
+ }
+
+ public void setListHeight(String listHeight) {
+ this.listHeight = listHeight;
+ }
+
+ public String getListWidth() {
+ return listWidth;
+ }
+
+ public void setListWidth(String listWidth) {
+ this.listWidth = listWidth;
+ }
+
+ public String getControlsType() {
+ return controlsType;
+ }
+
+ public void setControlsType(String controlsType) {
+ this.controlsType = controlsType;
+ }
+
+ public String getBottomControlLabel() {
+ return bottomControlLabel;
+ }
+
+ public void setBottomControlLabel(String bottomControlLabel) {
+ this.bottomControlLabel = bottomControlLabel;
+ }
+
+ public String getCaptionLabel() {
+ return captionLabel;
+ }
+
+ public void setCaptionLabel(String captionLabel) {
+ this.captionLabel = captionLabel;
+ }
+
+ public String getUpControlLabel() {
+ return upControlLabel;
+ }
+
+ public void setUpControlLabel(String upControlLabel) {
+ this.upControlLabel = upControlLabel;
+ }
+
+ public String getTopControlLabel() {
+ return topControlLabel;
+ }
+
+ public void setTopControlLabel(String topControlLabel) {
+ this.topControlLabel = topControlLabel;
+ }
+
+ public String getControlsVerticalAlign() {
+ return controlsVerticalAlign;
+ }
+
+ public void setControlsVerticalAlign(String controlsVerticalAlign) {
+ this.controlsVerticalAlign = controlsVerticalAlign;
+ }
+
+ public String getControlsHorizontalAlign() {
+ return controlsHorizontalAlign;
+ }
+
+ public void setControlsHorizontalAlign(String controlsHorizontalAlign) {
+ this.controlsHorizontalAlign = controlsHorizontalAlign;
+ }
+
+ public String getDownControlLabel() {
+ return downControlLabel;
+ }
+
+ public void setDownControlLabel(String downControlLabel) {
+ this.downControlLabel = downControlLabel;
+ }
+
+ public boolean isOrderControlsVisible() {
+ return orderControlsVisible;
+ }
+
+ public void setOrderControlsVisible(boolean orderControlsVisible) {
+ this.orderControlsVisible = orderControlsVisible;
+ }
+
+ public boolean isFastOrderControlsVisible() {
+ return fastOrderControlsVisible;
+ }
+
+ public void setFastOrderControlsVisible(boolean fastOrderControlsVisible) {
+ this.fastOrderControlsVisible = fastOrderControlsVisible;
+ }
+
+ public boolean isRendered() {
+ return rendered;
+ }
+
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
+
+ public boolean isShowButtonLabels() {
+ return showButtonLabels;
+ }
+
+ public void setShowButtonLabels(boolean showButtonLabels) {
+ this.showButtonLabels = showButtonLabels;
+ }
+
+ public int getLenght() {
+ return lenght;
+ }
+
+ public void setLenght(int lenght) {
+ this.lenght = lenght;
+ }
+
+ public void cbAction() {
+ info.clear();
+ info.add("commandButton submit();");
+ addSelection(getSelection());
+ }
+
+ public void clAction() {
+ info.clear();
+ info.add("commandLink submit();");
+ addSelection(getSelection());
+ }
+
+ public void bTest1(){
+ setCaptionLabel("Caption Test1");
+ setControlsHorizontalAlign("0");
+ setControlsVerticalAlign("0");
+ setControlsType("button");
+ 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");
+ 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");
+ 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 Test4");
+ setControlsHorizontalAlign("0");
+ setControlsVerticalAlign("0");
+ setControlsType("button");
+ 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");
+ setLenght(100);
+ setListHeight("400");
+ setListWidth("500");
+ setFastOrderControlsVisible(true);
+ setOrderControlsVisible(true);
+ setRendered(true);
+ setShowButtonLabels(true);
+ setTopControlLabel("top");
+ setBottomControlLabel("bottom");
+ setUpControlLabel("up");
+ setDownControlLabel("down");
+ addNewItem();
+ }
+
+ public ArrayList<String> getInfo() {
+ return info;
+ }
+
+ public void setInfo(ArrayList<String> info) {
+ this.info = info;
+ }
+
+ private void addSelection(Collection<Data> selection) {
+ if(selection == null) return;
+ Iterator<Data> inter = selection.iterator();
+ Data data = new Data();
+ while (inter.hasNext()) {
+ data = inter.next();
+ info.add(data.getInt0() + "; " + data.getStr0() + "; " + data.getStr0() + "submit(); " + data.getStr1() + "; " + data.getStr1() + "submit(); " + data.getStr2() + "; " + data.getStr3());
+ }
+ }
+
+ public boolean isShowAllData() {
+ return showAllData;
+ }
+
+ public void setShowAllData(boolean showAllData) {
+ this.showAllData = showAllData;
+ }
+
+ public boolean isShowSelect() {
+ return showSelect;
+ }
+
+ public void setShowSelect(boolean showSelect) {
+ this.showSelect = showSelect;
+ }
+}
Modified: branches/3.1.x/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -23,23 +23,21 @@
width = "500px";
mode = "none";
expandMode = "none";
- align = "left";
+ align = "";
rendered = "true";
disabled = false;
tabIndex = "1";
iconGroupPosition = "left";
iconGroupTopPosition = "left";
iconItemPosition = "left";
- iconItemTopPosition = "left";
- expandSingle = true;
+ iconGroupTopPosition = "left";
icon = new Icon();
-/* icon.setCollapsed(icon.iconCollapse);
+ icon.setCollapsed(icon.iconCollapse);
icon.setExpanded(icon.iconExpand);
icon.setItem(icon.iconItem);
icon.setIcon(icon.iconFileManager);
icon.setCollapsedGroup(icon.iconAjaxProcess);
icon.setDisabledGroup(icon.iconAjaxStoped);
-*/
}
public boolean isDisabled() {
@@ -242,4 +240,4 @@
setTabIndex("2");
}
-}
+}
\ No newline at end of file
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-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -2,7 +2,11 @@
import java.util.ArrayList;
+import org.richfaces.VersionBean;
+
public class RichBean {
+ private static final String EXT = ".jsp";
+ private String version = VersionBean.SCM_REVISION;
private String src;
private MapComponent map;
private boolean reComponent;
@@ -45,7 +49,7 @@
map.add("ToolBar", add("/ToolBar/ToolBar", new boolean [] {true, false}));
map.add("Tooltip", add("/Tooltip/Tooltip", new boolean [] {true, true}));
map.add("Tree", add("/Tree/Tree", new boolean [] {true, false}));
- map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {true, true}));
+ map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {true, false}));
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}));
@@ -53,6 +57,7 @@
map.add("DataOrderedList", add("/DataOrderedList/DataOrderedList", new boolean [] {true, false}));
map.add("ContextMenu", add("/ContextMenu/ContextMenu", new boolean [] {true, false}));
map.add("ListShuttle", add("/ListShuttle/ListShuttle", new boolean [] {true, true}));
+ map.add("ComponentControl", add("/ComponentControl/ComponentControl", new boolean [] {false, false}));
}
public String getSrc() {
@@ -77,9 +82,9 @@
private ArrayList<String> add(String path, boolean [] arr){
ArrayList<String> list = new ArrayList<String>();
- list.add(path + ".jsp");
- if(arr[0]) list.add(path + "Property.jsp"); else list.add("/pages/Blank/BlankProperty.jsp");
- if(arr[1]) list.add(path + "Straightforward.jsp"); else list.add("/pages/Blank/BlankStraightforward.jsp");
+ list.add(path + EXT);
+ if(arr[0]) list.add(path + "Property" + EXT); else list.add("/pages/Blank/BlankProperty" + EXT);
+ if(arr[1]) list.add(path + "Straightforward" + EXT); else list.add("/pages/Blank/BlankStraightforward" + EXT);
return list;
}
@@ -106,4 +111,12 @@
public void setReStraightforward(boolean reStraightforward) {
this.reStraightforward = reStraightforward;
}
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
}
Modified: branches/3.1.x/test-applications/jsp/src/main/java/sb/Data.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/sb/Data.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/sb/Data.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,39 +1,37 @@
package sb;
public class Data {
- private String text;
+ private String city;
+ private String contry;
+ private boolean flag;
- private String label;
-
- private String flag;
-
- public Data(String text, String alabelbel){
- this.text = text;
- this.label = alabelbel;
- this.flag="/pics/header.png";
+ public Data(String city, String contry, boolean flag) {
+ this.city = city;
+ this.contry = contry;
+ this.flag = flag;
}
- public String getLabel() {
- return label;
+ public boolean getFlag() {
+ return flag;
}
- public void setLabel(String label) {
- this.label = label;
+ public void setFlag(boolean flag) {
+ this.flag = flag;
}
- public String getText() {
- return text;
+ public String getCity() {
+ return city;
}
- public void setText(String text) {
- this.text = text;
+ public void setCity(String city) {
+ this.city = city;
}
- public String getFlag() {
- return flag;
+ public String getContry() {
+ return contry;
}
- public void setFlag(String flag) {
- this.flag = flag;
+ public void setContry(String contry) {
+ this.contry = contry;
}
}
Modified: branches/3.1.x/test-applications/jsp/src/main/java/sb/Sb.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/sb/Sb.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/sb/Sb.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -9,70 +9,276 @@
public class Sb implements Serializable {
- private static final String[] cit = { "Abba", "Abbeville", "Acworth",
- "Adairsville", "Adel", "Adrian", "Ailey", "Alamo", "Alapaha",
- "Albany", "Allenhurst", "Alma", "Alma", "Alpharetta", "Alston",
- "Amboy", "Ambrose", "Americus", "Appling", "Arlington", "Ashburn",
- "Athens", "Athens-Clarke County", "Atkinson", "Atlanta",
- "Attapulgus", "Auburn", "Augusta", "Augusta-Richmond County",
- "Austell", "Avondale Estates", "Axson" };
- private ArrayList cities;
- private ArrayList data;
- private ArrayList tokens;
- private int first;
- private int zindex;
- private String property;
- private String rows;
- private String cellspacing;
- private String cellpadding;
- private String minchars;
- private String rules;
- private String border;
- private String width;
- private String height;
- private String shadowOpacity;
- private String bgColor;
- private String shadowDepth;
+ private ArrayList cities;
+ private ArrayList data;
+ private ArrayList tokens;
+ private int first;
+ private int zindex;
+ private double frequency;
+ private String property;
+ private String rows;
+ private String cellspacing;
+ private String cellpadding;
+ private String minchars;
+ private String rules;
+ private String border;
+ private String width;
+ private String height;
+ private String shadowOpacity;
+ private String bgColor;
+ private String shadowDepth;
+ private boolean focus;
- private boolean focus;
+ /*
+ * private static final String[] cit = { "Abba", "Abbeville", "Acworth",
+ * "Adairsville", "Adel", "Adrian", "Ailey", "Alamo", "Alapaha", "Albany",
+ * "Allenhurst", "Alma", "Alma", "Alpharetta", "Alston", "Amboy", "Ambrose",
+ * "Americus", "Appling", "Arlington", "Ashburn", "Athens", "Athens-Clarke
+ * County", "Atkinson", "Atlanta", "Attapulgus", "Auburn", "Augusta",
+ * "Augusta-Richmond County", "Austell", "Avondale Estates", "Axson" };
+ */
+ private 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"};
+ private 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"};
+ private static final String[] cityCAmerica = {"Central America", "Belize", "Costa Rica", "El Salvador", "Guatemala", "Honduras", "Nicaragua", "Panama"};
+ private 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"};
+ private 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"};
+ private static final String[] cityNAmerica = {"North America", "Bermuda", "Canada", "Greenland", "Mexico", "Saint Pierre and Miquelon", "United States of America"};
+ private 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"};
+ private static final String[] citySAmerica = {"South America","Argentina", "Bolivia", "Brazil", "Chile", "Colombia", "Easter Island", "Ecuador", "Falkland Islands", "French Guiana", "Guyana", "Paraguay", "Peru", "Suriname", "Uruguay", "Venezuela"};
+ private 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"};
+ private static final String[] cityCaribbean = {"The Caribbean", "Anguilla", "Antigua and Barbuda", "Aruba", "Barbados", "British Virgin Islands", "Cayman Islands", "Cuba", "Dominica", "Dominican Republic", "Grenada", "Guadeloupe", "Haiti", "Jamaica", "Martinique", "Montserrat", "Navassa Island", "Netherlands Antilles", "Puerto Rico", "Saint Barthelemy", "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", "The Bahamas", "Trinidad and Tobago", "Turks and Caicos Islands", "Virgin Islands"};
- public Sb() {
- focus = false;
+
+ public Sb() {
border = "1";
width = "200";
height = "150";
shadowOpacity = "1";
shadowDepth = Integer.toString(SuggestionBoxRenderer.SHADOW_DEPTH);
zindex = 3;
+ focus = true;
rows = "0";
first = 0;
cellspacing = "2";
cellpadding = "2";
minchars = "1";
+ frequency = 0;
rules = "none";
setCities(getAllData());
- }
+ }
- public List autocomplete(Object event) {
- String pref = event.toString();
- ArrayList result = new ArrayList();
+ public List autocomplete(Object event) {
+ String pref = event.toString();
+ ArrayList result = new ArrayList();
- Iterator iterator = getAllData().iterator();
- while (iterator.hasNext()) {
- Data elem = (Data) iterator.next();
- if ((elem != null && elem.getText().toLowerCase().indexOf(
- pref.toLowerCase()) == 0)
- || "".equals(pref)) {
- result.add(elem);
- }
+ Iterator iterator = getAllData().iterator();
+ while (iterator.hasNext()) {
+ Data elem = (Data) iterator.next();
+ if ((elem != null && elem.getCity().toLowerCase().indexOf(
+ pref.toLowerCase()) == 0)
+ || "".equals(pref)) {
+ result.add(elem);
+ }
+ }
+ return result;
}
- return result;
- }
- public void bTest1(){
+ public ArrayList getCities() {
+ return cities;
+ }
+
+ public void setCities(ArrayList cities) {
+ this.cities = cities;
+ }
+
+ private ArrayList<Data> addData(String[] mStr, ArrayList<Data> arr) {
+ for (int i = 1; i < mStr.length; i++) {
+ Data data = new Data(mStr[i], mStr[0], false);
+ arr.add(data);
+ }
+ return arr;
+ }
+
+ public ArrayList getAllData() {
+ /*
+ * for (int i = 0; i < cit.length; i++) { Data data = new Data(cit[i],
+ * String.valueOf(i + 1)); result.add(data); }
+ */
+ ArrayList<Data> result = new ArrayList<Data>();
+ result = addData(cityAfrica, result);
+ result = addData(cityAsia, result);
+ result = addData(cityCAmerica, result);
+ result = addData(cityCaribbean, result);
+ result = addData(cityEurope, result);
+ result = addData(cityMEast, result);
+ result = addData(cityNAmerica, result);
+ result = addData(cityOceania, result);
+ result = addData(citySAmerica, result);
+ result = addData(citySEAsia, result);
+ return result;
+ }
+
+ public ArrayList getData() {
+ return data;
+ }
+
+ public void setData(ArrayList data) {
+ this.data = data;
+ }
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+ public String getCellpadding() {
+ return cellpadding;
+ }
+
+ public void setCellpadding(String cellpadding) {
+ this.cellpadding = cellpadding;
+ }
+
+ public String getCellspacing() {
+ return cellspacing;
+ }
+
+ public void setCellspacing(String cellspacing) {
+ this.cellspacing = cellspacing;
+ }
+
+ public int getFirst() {
+ return first;
+ }
+
+ public int getIntFirst() {
+ return first;
+ }
+
+ public void setFirst(int first) {
+ this.first = first;
+ }
+
+ public double getFrequency() {
+ return frequency;
+ }
+
+ public void setFrequency(double frequency) {
+ this.frequency = frequency;
+ }
+
+ public String getMinchars() {
+ return minchars;
+ }
+
+ public void setMinchars(String minchars) {
+ this.minchars = minchars;
+ }
+
+ public String getRows() {
+ return rows;
+ }
+
+ public int getIntRows() {
+ return Integer.parseInt(getRows());
+ }
+
+ public void setRows(String rows) {
+ this.rows = rows;
+ }
+
+ public String getRules() {
+ return rules;
+ }
+
+ public void setRules(String rules) {
+ this.rules = rules;
+ }
+
+ public ArrayList getTokens() {
+ return tokens;
+ }
+
+ public void setTokens(ArrayList tokens) {
+ this.tokens = tokens;
+ }
+
+ public void OnSelect() {
+ System.out.print("Onselect works!!!");
+ }
+
+ public String getBorder() {
+ return border;
+ }
+
+ public void setBorder(String border) {
+ this.border = border;
+ }
+
+ public String getHeight() {
+ return height;
+ }
+
+ public void setHeight(String height) {
+ this.height = height;
+ }
+
+ public String getShadowOpacity() {
+ return shadowOpacity;
+ }
+
+ public void setShadowOpacity(String shadowOpacity) {
+ this.shadowOpacity = shadowOpacity;
+ }
+
+ public String getWidth() {
+ return width;
+ }
+
+ public void setWidth(String width) {
+ this.width = width;
+ }
+
+ public String getBgColor() {
+ return bgColor;
+ }
+
+ public void setBgColor(String bgColor) {
+ this.bgColor = bgColor;
+ }
+
+ public boolean isFocus() {
+ return focus;
+ }
+
+ public void setFocus(boolean focus) {
+ this.focus = focus;
+ }
+
+ public int getZindex() {
+ return zindex;
+ }
+
+ public void setZindex(int zindex) {
+ this.zindex = zindex;
+ }
+
+ public String getShadowDepth() {
+ return shadowDepth;
+ }
+
+ public void setShadowDepth(String shadowDepth) {
+ this.shadowDepth = shadowDepth;
+ }
+
+ public void bTest1() {
setBorder("2");
setCellpadding("0");
setCellspacing("0");
+ setFrequency(0);
setHeight("150");
setWidth("200");
setMinchars("1");
@@ -81,217 +287,55 @@
setZindex(3);
}
- public void bTest2(){
+ public void bTest2() {
setBorder("0");
setCellpadding("3");
setCellspacing("3");
+ setFrequency(2);
setHeight("200");
setWidth("200");
setMinchars("1");
setShadowDepth("1");
setShadowOpacity("7");
- setZindex(3);
+ setZindex(3);
}
- public void bTest3(){
+ public void bTest3() {
setBorder("1");
setCellpadding("5");
setCellspacing("0");
+ setFrequency(1);
setHeight("150");
setWidth("200");
setMinchars("2");
setShadowDepth("1");
setShadowOpacity("7");
- setZindex(3);
+ setZindex(3);
}
- public void bTest4(){
+ public void bTest4() {
setBorder("1");
setCellpadding("0");
setCellspacing("5");
+ setFrequency(3);
setHeight("150");
setWidth("200");
setMinchars("2");
setShadowDepth("7");
setShadowOpacity("1");
- setZindex(3);
+ setZindex(3);
}
- public void bTest5(){
+ public void bTest5() {
setBorder("4");
setCellpadding("1");
setCellspacing("1");
+ setFrequency(5);
setHeight("200");
setWidth("400");
setMinchars("2");
setShadowDepth("5");
setShadowOpacity("5");
- setZindex(1);
+ setZindex(1);
}
-
- public ArrayList getAllData() {
- ArrayList result = new ArrayList();
- for (int i = 0; i < cit.length; i++) {
- Data data = new Data(cit[i], String.valueOf(i + 1));
- result.add(data);
- }
- return result;
- }
-
- public String getBgColor() {
- return bgColor;
- }
-
- public String getBorder() {
- return border;
- }
-
- public String getCellpadding() {
- return cellpadding;
- }
-
- public String getCellspacing() {
- return cellspacing;
- }
-
- public ArrayList getCities() {
- return cities;
- }
-
- public ArrayList getData() {
- return data;
- }
-
- public int getFirst() {
- return first;
- }
-
- public String getHeight() {
- return height;
- }
-
- public int getIntFirst() {
- return first;
- }
-
- public int getIntRows() {
- return Integer.parseInt(getRows());
- }
-
- public String getMinchars() {
- return minchars;
- }
-
- public String getProperty() {
- return property;
- }
-
- public String getRows() {
- return rows;
- }
-
- public String getRules() {
- return rules;
- }
-
- public String getShadowDepth() {
- return shadowDepth;
- }
-
- public String getShadowOpacity() {
- return shadowOpacity;
- }
-
- public ArrayList getTokens() {
- return tokens;
- }
-
- public String getWidth() {
- return width;
- }
-
- public int getZindex() {
- return zindex;
- }
-
- public boolean isFocus() {
- return focus;
- }
-
- public void OnSelect() {
- System.out.print("Onselect works!!!");
-
- }
-
- public void setBgColor(String bgColor) {
- this.bgColor = bgColor;
- }
-
- public void setBorder(String border) {
- this.border = border;
- }
-
- public void setCellpadding(String cellpadding) {
- this.cellpadding = cellpadding;
- }
-
- public void setCellspacing(String cellspacing) {
- this.cellspacing = cellspacing;
- }
-
- public void setCities(ArrayList cities) {
- this.cities = cities;
- }
-
- public void setData(ArrayList data) {
- this.data = data;
- }
-
- public void setFirst(int first) {
- this.first = first;
- }
-
- public void setFocus(boolean focus) {
- this.focus = focus;
- }
-
- public void setHeight(String height) {
- this.height = height;
- }
-
- public void setMinchars(String minchars) {
- this.minchars = minchars;
- }
-
- public void setProperty(String property) {
- this.property = property;
- }
-
- public void setRows(String rows) {
- this.rows = rows;
- }
-
- public void setRules(String rules) {
- this.rules = rules;
- }
-
- public void setShadowDepth(String shadowDepth) {
- this.shadowDepth = shadowDepth;
- }
-
- public void setShadowOpacity(String shadowOpacity) {
- this.shadowOpacity = shadowOpacity;
- }
-
- public void setTokens(ArrayList tokens) {
- this.tokens = tokens;
- }
-
- public void setWidth(String width) {
- this.width = width;
- }
-
- public void setZindex(int zindex) {
- this.zindex = zindex;
- }
}
Modified: branches/3.1.x/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -8,16 +8,31 @@
public class ScrollableDataTable
{
private ArrayList<Data> data;
- private String [] priority = {"blocker", "critical", "major", "minor", "trivial"};
- private String [] priorityIcon = {"/pics/sdt/priority_blocker.gif", "/pics/sdt/priority_critical.gif", "/pics/sdt/priority_major.gif", "/pics/sdt/priority_minor.gif", "/pics/sdt/priority_trivial.gif"};
+ 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 width;
+ private int rows;
+ private String key;
+ private boolean hideWhenScrolling;
+ public boolean isHideWhenScrolling() {
+ return hideWhenScrolling;
+ }
+
+ public void setHideWhenScrolling(boolean hideWhenScrolling) {
+ this.hideWhenScrolling = hideWhenScrolling;
+ }
+
public ScrollableDataTable() {
+ width = "400px";
+ rows = 30;
+ hideWhenScrolling = false;
data = new ArrayList<Data>();
int k;
for(int i = 0; i < 10000; i++) {
k = new Random().nextInt(5);
- data.add(new Data("Bug " + new Random().nextInt(10 + i), i,priority[k], priorityIcon[k]));
+ data.add(new Data("Bug " + new Random().nextInt(10 + i), i,status[k], statusIcon[k]));
}
}
@@ -28,4 +43,24 @@
public void setData(ArrayList<Data> data) {
this.data = data;
}
+
+ public String getWidth() {
+ return width;
+ }
+
+ public void setWidth(String width) {
+ this.width = width;
+ }
+
+ public int getRows() {
+ return rows;
+ }
+
+ public void setRows(int rows) {
+ this.rows = rows;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
}
\ No newline at end of file
Modified: branches/3.1.x/test-applications/jsp/src/main/java/tooltip/Tooltip.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/tooltip/Tooltip.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/tooltip/Tooltip.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -7,8 +7,7 @@
private boolean disabled;
private int horizontalOffset;
private int verticalOffset;
- private int showDelay;
- private int hideDelay;
+ private int delay;
private String value;
private String mode;
private String direction;
@@ -32,8 +31,7 @@
direction = "top-right";
horizontalOffset = 0;
verticalOffset = 0;
- showDelay = 0;
- hideDelay = 0;
+ delay = 0;
style = "none";
layout = "inline";
}
@@ -110,9 +108,16 @@
this.style = style;
}
+ public int getDelay() {
+ return delay;
+ }
+
+ public void setDelay(int delay) {
+ this.delay = delay;
+ }
+
public void bTest1(){
- setShowDelay(0);
- setHideDelay(3);
+ setDelay(0);
setDirection("top-right");
setDisabled(false);
setFollowMouse(false);
@@ -125,8 +130,7 @@
}
public void bTest2(){
- setShowDelay(3);
- setHideDelay(0);
+ setDelay(0);
setDirection("top-left");
setDisabled(false);
setFollowMouse(false);
@@ -139,8 +143,7 @@
}
public void bTest3(){
- setShowDelay(3);
- setHideDelay(3);
+ setDelay(0);
setDirection("bottom-right");
setDisabled(false);
setFollowMouse(true);
@@ -153,8 +156,7 @@
}
public void bTest4(){
- setShowDelay(1);
- setHideDelay(2);
+ setDelay(0);
setDirection("bottom-left");
setDisabled(false);
setFollowMouse(true);
@@ -167,8 +169,7 @@
}
public void bTest5(){
- setShowDelay(3);
- setHideDelay(1);
+ setDelay(0);
setDirection("bottom-right");
setDisabled(false);
setFollowMouse(true);
@@ -179,20 +180,4 @@
setValue("Test5");
setRendered(true);
}
-
- public int getShowDelay() {
- return showDelay;
- }
-
- public void setShowDelay(int showDelay) {
- this.showDelay = showDelay;
- }
-
- public int getHideDelay() {
- return hideDelay;
- }
-
- public void setHideDelay(int hideDelay) {
- this.hideDelay = hideDelay;
- }
}
Modified: branches/3.1.x/test-applications/jsp/src/main/java/tree/Bean.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/tree/Bean.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/tree/Bean.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -75,9 +75,22 @@
child.setData("Node: " + id);
data1.addChild(id, child);
}
- initData();
+ //initData();
}
+ private void initData() {
+ selectedNodeChildren.clear();
+ if (selectedNode != null) {
+ Iterator iter = selectedNode.getChildren();
+ int i = 0;
+ while (iter.hasNext()) {
+ Map.Entry entry = (Map.Entry) iter.next();
+ selectedNodeChildren
+ .put(((TreeNode) entry.getValue()).getData(), Integer.toString(i++));
+ }
+ }
+ }
+
public String getIcon() {
return icon;
}
@@ -146,6 +159,7 @@
System.out.println("Node selected: " + getTree(event).getRowKey());
if (getTree(event).getTreeNode() != null) {
selectedNode = getTree(event).getTreeNode();
+ data.removeChild(selectedNode.getChildren());
initData();
}
}
@@ -174,19 +188,6 @@
tree.setRowKey(key);
}
- private void initData() {
- selectedNodeChildren.clear();
- if (selectedNode != null) {
- Iterator iter = selectedNode.getChildren();
- int i = 0;
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
- selectedNodeChildren
- .put(((TreeNode) entry.getValue()).getData(), Integer.toString(i++));
- }
- }
- }
-
public void onExpand(NodeExpandedEvent event) {
UITree tree = getTree(event);
System.out.println("Node " + (tree.isExpanded() ? "expanded" : "collapsed") + " "
Deleted: branches/3.1.x/test-applications/jsp/src/main/java/tree/CachingTreeDataLocator.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/tree/CachingTreeDataLocator.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/tree/CachingTreeDataLocator.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,66 +0,0 @@
-/**
- *
- */
-package tree;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.richfaces.model.TreeRowKey;
-
-
-
-/**
- * @author Nick Belaevski - nbelaevski(a)exadel.com
- * created 30.12.2006
- *
- */
-public class CachingTreeDataLocator {
-
- private static class CacheEntry {
- private int pid;
- private TreeRowKey key;
- private Object data;
- }
-
- private List cache = new ArrayList();
- private int number = 0;
-
- /* (non-Javadoc)
- * @see com.exadel.jsf.model.preserve.TreeDataLocator#createData(java.lang.Object, com.exadel.jsf.model.TreeRowKey, com.exadel.jsf.model.TreeNode)
- */
- public Object createData(Object locator, TreeRowKey rowKey) {
- for (Iterator iterator = cache.iterator(); iterator.hasNext();) {
- CacheEntry entry = (CacheEntry) iterator.next();
- if (entry.pid == ((Integer) locator).intValue()) {
- return entry.data;
- }
- }
-
- return null;
- }
-
- /* (non-Javadoc)
- * @see com.exadel.jsf.model.preserve.TreeDataLocator#createLocator(java.lang.Object, com.exadel.jsf.model.TreeRowKey, com.exadel.jsf.model.TreeNode)
- */
- public Object createLocator(Object data, TreeRowKey rowKey) {
- for (Iterator iterator = cache.iterator(); iterator.hasNext();) {
- CacheEntry entry = (CacheEntry) iterator.next();
-
- if (entry.key.equals(rowKey)) {
- return Integer.valueOf(entry.pid);
- }
- }
-
- CacheEntry cacheEntry = new CacheEntry();
- cacheEntry.data = data;
- cacheEntry.key = rowKey;
- cacheEntry.pid = number++;
-
- cache.add(cacheEntry);
-
- return Integer.valueOf(cacheEntry.pid);
- }
-
-}
Modified: branches/3.1.x/test-applications/jsp/src/main/java/tree/Library.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/tree/Library.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/tree/Library.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -13,7 +13,6 @@
private Map pathways = null;
private Object state1;
- // private Object state2;
private List listPathway;
Modified: branches/3.1.x/test-applications/jsp/src/main/java/tree/test.xml
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/tree/test.xml 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/tree/test.xml 2007-12-11 13:24:41 UTC (rev 4698)
@@ -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>
Modified: branches/3.1.x/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -6,6 +6,7 @@
public class ComponentInfo {
private final String beanName;
+ private String description;
private String attribute;
private String property;
private boolean print;
@@ -20,9 +21,17 @@
public void setComponentInfo(String attribute, String property) {
this.attribute = attribute;
this.property = property;
+ this.description = "";
if(print) printInfo();
}
+ public void setComponentInfo(String attribute, String property, String description) {
+ this.attribute = attribute;
+ this.property = property;
+ this.description = description;
+ if(print) printInfo();
+ }
+
public static String toString(Object obj) {
Class cl = obj.getClass();
String r = cl.getName() + "[";
@@ -39,7 +48,6 @@
r += f.getName() + "=";
try {
Object val = f.get(obj);
- if(val == null) r += "null"; else
r += val.toString();
} catch (IllegalAccessException e) {
r += "???";
@@ -74,6 +82,14 @@
}
private void printInfo() {
- System.out.println("beanName: " + beanName + "[attribute:" + attribute + "; property:" + property + "];");
+ System.out.println("beanName: " + beanName + "[attribute: " + attribute + "; property: " + property + "; description: " + description + "];");
}
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
}
Added: branches/3.1.x/test-applications/jsp/src/main/java/util/converter/ListShuttleConverter.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/util/converter/ListShuttleConverter.java (rev 0)
+++ branches/3.1.x/test-applications/jsp/src/main/java/util/converter/ListShuttleConverter.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -0,0 +1,33 @@
+package util.converter;
+import java.util.ArrayList;
+import java.util.StringTokenizer;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+
+import util.data.Data;
+
+public class ListShuttleConverter implements Converter {
+
+ public Object getAsObject(FacesContext arg0, UIComponent arg1, String arg2) {
+ String [] str = arg2.split(":");
+ return new Data(Integer.parseInt(str[0]), str[1], str[2], str[3],str[4]);
+ }
+//list.add(new Data(i, "Button " + i, "Link " + i, "select" +(i % 5), statusIcon[i % 5]));
+ public String getAsString(FacesContext arg0, UIComponent arg1, Object arg2) {
+ Data data = (Data)arg2;
+ return data.getInt0() + ":" + data.getStr0() + ":" + data.getStr1() + ":" + data.getStr2() + ":" + data.getStr3();
+ }
+
+}
+// public Object getAsObject(FacesContext context, UIComponent component,
+// String value) {
+// int index = value.indexOf(':');
+// return new OptionItem(value.substring(0, index), Integer.valueOf(value.substring(index + 1)));
+// }
+// public String getAsString(FacesContext context, UIComponent component,
+// Object value) {
+// OptionItem optionItem = (OptionItem) value;
+// return optionItem.getName() + ":" + optionItem.getPrice();
+// }
Added: branches/3.1.x/test-applications/jsp/src/main/java/util/converter/OrderingListConverter.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/util/converter/OrderingListConverter.java (rev 0)
+++ branches/3.1.x/test-applications/jsp/src/main/java/util/converter/OrderingListConverter.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -0,0 +1,33 @@
+package util.converter;
+import java.util.ArrayList;
+import java.util.StringTokenizer;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+
+import util.data.Data;
+
+public class OrderingListConverter implements Converter {
+
+ public Object getAsObject(FacesContext arg0, UIComponent arg1, String arg2) {
+ String [] str = arg2.split(":");
+ return new Data(Integer.parseInt(str[0]), str[1], str[2], str[3],str[4]);
+ }
+//list.add(new Data(i, "Button " + i, "Link " + i, "select" +(i % 5), statusIcon[i % 5]));
+ public String getAsString(FacesContext arg0, UIComponent arg1, Object arg2) {
+ Data data = (Data)arg2;
+ return data.getInt0() + ":" + data.getStr0() + ":" + data.getStr1() + ":" + data.getStr2() + ":" + data.getStr3();
+ }
+
+}
+// public Object getAsObject(FacesContext context, UIComponent component,
+// String value) {
+// int index = value.indexOf(':');
+// return new OptionItem(value.substring(0, index), Integer.valueOf(value.substring(index + 1)));
+// }
+// public String getAsString(FacesContext context, UIComponent component,
+// Object value) {
+// OptionItem optionItem = (OptionItem) value;
+// return optionItem.getName() + ":" + optionItem.getPrice();
+// }
Modified: branches/3.1.x/test-applications/jsp/src/main/java/util/data/Data.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/util/data/Data.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/util/data/Data.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -26,13 +26,23 @@
private boolean bool3;
public Data() {
-
+ this.str0 = "";
+ this.str1 = "";
+ this.str2 = "";
+ this.str3 = "";
+ this.int0 = 0;
+ this.int1 = 0;
+ this.int2 = 0;
+ this.int3 = 0;
+ this.bool0 = false;
+ this.bool1 = false;
+ this.bool2 = false;
+ this.bool3 = false;
}
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;
@@ -158,4 +168,27 @@
public void setBool3(boolean bool3) {
this.bool3 = bool3;
}
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + int0;
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ final Data other = (Data) obj;
+ if (int0 != other.int0)
+ return false;
+ return true;
+ }
+
}
Modified: branches/3.1.x/test-applications/jsp/src/main/java/util/phaseTracker/PhaseTracker.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/util/phaseTracker/PhaseTracker.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/util/phaseTracker/PhaseTracker.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -3,6 +3,10 @@
*/
package util.phaseTracker;
+import java.util.Iterator;
+
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
@@ -25,6 +29,12 @@
*/
public void beforePhase(PhaseEvent arg0) {
System.out.println("PhaseTracker.beforePhase()" + arg0.getPhaseId());
+// ExternalContext externalContext = FacesContext.getCurrentInstance().getExternalContext();
+// Iterator names = externalContext.getRequestParameterNames();
+// while (names.hasNext()) {
+// System.out.println(names.next());
+// }
+
}
/* (non-Javadoc)
Modified: branches/3.1.x/test-applications/jsp/src/main/java/virtualEarth/VirtualEarth.java
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/java/virtualEarth/VirtualEarth.java 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/java/virtualEarth/VirtualEarth.java 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,8 +1,17 @@
package virtualEarth;
public class VirtualEarth {
- String zoom;
+ private String zoom;
+ private String version;
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
public String getZoom() {
return zoom;
}
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,11 +1,10 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="calendarSubviewID">
- <h:form>
<h:messages />
<rich:messages showDetail="true"></rich:messages>
@@ -23,7 +22,7 @@
showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" boundaryDatesMode="#{calendarBean.boundary}"
currentDateChangeListener="#{calendarBean.dcl}" valueChangeListener="#{calendarBean.ddd}" reRender="calendarPropertyID,counter" inputClass="ic"
buttonClass="bc" ajaxSingle="#{calendarBean.ajaxSingle}" buttonIcon="#{calendarBean.icon}"
- buttonIconDisabled="#{icon.iconFileManagerReject}" disabled="#{calendarBean.disabled}"
+ buttonIconDisabled="#{icon.iconFileManagerReject}" disabled="#{calendarBean.disabled}"
bypassUpdates="#{calendarBean.bypassUpdates}" zindex="#{calendarBean.zindex}" toolTipMode="#{calendarBean.toolTipMode}" rendered="#{calendarBean.renderedClient}"
focus="popupModeID" mode="client" required="#{calendarBean.required}" requiredMessage="Required Message"
timeZone="#{calendarBean.tmZone}">
@@ -96,5 +95,4 @@
</h:panelGrid>
</rich:calendar>
</h:panelGrid>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,14 +1,12 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="calendarPropertySubviewID">
<rich:simpleTogglePanel id="calendarPropertyID" switchType="client" opened="true" label="calendar property">
<h:panelGrid columns="2">
- <a4j:commandButton action="#{calendarBean.info}" value="fasdf"></a4j:commandButton>
-
<h:outputText value="Mode" />
<h:selectOneRadio value="#{calendarBean.mode}" onchange="submit();">
<f:selectItem itemLabel="client" itemValue="client"/>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="calendarStraightforwardSubviewID">
<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>
+ <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>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,17 +1,108 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
<f:subview id="componentControlSubviewID">
- <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>
+ <h:form>
+ <rich:modalPanel id="ccModalPanelID" onshow="alert(event.parameters.show)" onhide="alert(event.parameters.hide)">
+ <h:outputLink id="hideButton1ID" onclick="return false;" value="#">
+ <f:verbatim>Close 1</f:verbatim>
+ </h:outputLink>
+ <f:verbatim>
+ <br />
+ </f:verbatim>
+ <h:outputLink id="hideButton2ID" onclick="return false;" value="#">
+ <f:verbatim>Close 2</f:verbatim>
+ </h:outputLink>
+ </rich:modalPanel>
+
+ <h:commandButton id="showButtonID" value="show ModalPanel" >
+ <rich:componentControl for="ccModalPanelID" event="onclick" disableDefault="true" operation="show" params="show:'componentControl work(show)'" />
+ </h:commandButton>
- <rich:componentControl attachTo="showButton" for="MPid" operation="show" params="name:'componentControl work(show)'"/>
-
+ <rich:componentControl attachTo="hideButton1ID, hideButton2ID" event="onclick" for="ccModalPanelID" operation="hide"
+ params="hide:'componentControl work(hide)'" />
+
+ <ui:remove>
+ <f:verbatim>
+ <br />
+ <br />
+ </f:verbatim>
+
+ <rich:panelMenu id="ccPanelMenuID" mode="client">
+ <rich:panelMenuGroup label="group1">
+ <rich:panelMenuGroup label="group1 1">
+ <rich:panelMenuItem label="Item 1 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1 2"></rich:panelMenuItem>
+ </rich:panelMenuGroup>
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
+ </rich:panelMenuGroup>
+ </rich:panelMenu>
+
+ <rich:componentControl attachTo="testPMID" for="ccPanelMenuID" event="onclick" operation="doCollapse" />
+
+ <a href="#" id="testPMID" onclick="return false;">Click text</a>
+ </ui:remove>
+
+ <f:verbatim>
+ <br />
+ <br />
+ </f:verbatim>
+
+ <rich:calendar popup="#{componentControl.calendarPopup}" id="ccCalendarID" />
+ <h:panelGrid columns="2">
+ <h:outputText value="popup calendar" />
+ <h:selectBooleanCheckbox id="calendarSelectID" value="#{componentControl.calendarPopup}" onchange="submit();" />
+ </h:panelGrid>
+
+ <f:verbatim>
+ <br />
+ <a href="#" id="doExpandCalendarID">Calendar (doExpand)</a>
+ <br />
+ <a href="#" id="doNextYearCalendarID">Calendar (nextYear)</a>
+ <br />
+ <a href="#" id="doPrevYearCalendarID">Calendar (prevYear)</a>
+ <br />
+ <a href="#" id="doNextMonthCalendarID">Calendar (nextMonth)</a>
+ <br />
+ <a href="#" id="doPrevMonthCalendarID">Calendar (prevMonth)</a>
+ <br />
+ <a href="#" id="doTodayCalendarID">Calendar (today)</a>
+ </f:verbatim>
+
+ <rich:componentControl attachTo="doExpandCalendarID" for="ccCalendarID" event="onclick" operation="doExpand" />
+ <rich:componentControl attachTo="doNextYearCalendarID" for="ccCalendarID" event="onclick" operation="nextYear" />
+ <rich:componentControl attachTo="doPrevYearCalendarID" for="ccCalendarID" event="onclick" operation="prevYear" />
+ <rich:componentControl attachTo="doNextMonthCalendarID" for="ccCalendarID" event="onclick" operation="nextMonth" />
+ <rich:componentControl attachTo="doPrevMonthCalendarID" for="ccCalendarID" event="onclick" operation="prevMonth" />
+ <rich:componentControl attachTo="doTodayCalendarID" for="ccCalendarID" event="onclick" operation="today" />
+
+ <f:verbatim>
+ <br />
+ <br />
+ </f:verbatim>
+
+ <rich:panelMenu id="ccContextMenuPanelMenuID">
+ <h:outputText value="click text" />
+ </rich:panelMenu>
+
+ <rich:contextMenu id="ccContextMenuID" submitMode="ajax">
+ <rich:menuItem icon="/pics/header.png" value="tab1" reRender="cmInfoID">
+ <f:param name="cmdParam" value="menu" />
+ </rich:menuItem>
+ <rich:menuSeparator />
+ <rich:menuItem icon="/pics/info.gif" value="a" reRender="cmInfoID">
+ <f:param name="cmdParam" value="a" />
+ </rich:menuItem>
+ <rich:menuItem icon="/pics/info.gif" value=" b" reRender="cmInfoID">
+ <f:param name="cmdParam" value="b" />
+ </rich:menuItem>
+ <rich:menuItem icon="/pics/info.gif" value="c" reRender="cmInfoID">
+ <f:param name="cmdParam" value="c" />
+ </rich:menuItem>
+ </rich:contextMenu>
+ <rich:componentControl event="oncontextmenu" attachTo="ccContextMenuPanelMenuID" for="ccContextMenuID" operation="doShow" />
+ </h:form>
</f:subview>
\ No newline at end of file
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenu.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,13 +1,13 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="contextMenuSubviewID">
<h:panelGrid columns="2">
<rich:panel style="width: 130px; height: 50px; background-color: #98FB98;">
<h:outputText value="panel with contextMenu(DEFAULT)" />
- <rich:contextMenu id="contextMenuDefaultID" submitMode="ajax">
+ <rich:contextMenu id="contextMenuDefaultID" submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}">
<rich:menuItem icon="/pics/header.png" value="abc" reRender="cmInfoID">
<f:param name="cmdParam" value="abc" />
</rich:menuItem>
@@ -40,17 +40,17 @@
</rich:menuGroup>
</rich:contextMenu>
</rich:panel>
-
+
<rich:panel style="width: 130px; height: 50px; background-color: #98FB98;">
<h:outputText value="panel with contextMenu(Test)" />
<rich:contextMenu id="contextMenuID" attached="#{contextMenu.attached}" submitMode="#{contextMenu.submitMode}"
event="#{contextMenu.event}" disableDefaultMenu="#{contextMenu.disableDefaultMenu}" rendered="#{contextMenu.rendered}"
hideDelay="#{contextMenu.hideDelay}" showDelay="#{contextMenu.showDelay}" popupWidth="#{contextMenu.popupWidth}">
- <rich:menuItem icon="/pics/header.png" value="abc" reRender="cmInfoID">
+ <rich:menuItem icon="/pics/header.png" value="abc">
<f:param name="cmdParam" value="abc" />
</rich:menuItem>
<rich:menuSeparator />
- <rich:menuItem icon="/pics/info.gif" value="action" action="alert('action work')" reRender="cmInfoID">
+ <rich:menuItem icon="/pics/info.gif" value="action" reRender="cmInfoID">
<f:param name="cmdParam" value="action" />
</rich:menuItem>
<rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{contextMenu.actionListener}" reRender="cmInfoID">
@@ -97,11 +97,14 @@
</rich:contextMenu>
</rich:panel>
</h:panelGrid>
- <h:panelGrid id="cmInfoID" olumns="2">
+
+ <a4j:commandButton value="reRender" reRender="cmInfoID"></a4j:commandButton>
+
+ <h:panelGrid id="cmInfoID" columns="2">
<h:outputText value="Select items: " />
<h:outputText value="#{contextMenu.info}" style="color: red" />
</h:panelGrid>
-
+
<h:panelGrid id="pgcmTestID" columns="3">
<h:selectOneMenu value="#{contextMenu.selectOneMenu}">
<f:selectItem itemLabel="select1" itemValue="select1" />
@@ -148,7 +151,7 @@
<rich:tabPanel id="tpcmTestID" switchType="client">
<rich:tab id="t1cmTestID" label="tab1">
- <rich:contextMenu submitMode="ajax">
+ <rich:contextMenu submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}">
<rich:menuItem icon="/pics/header.png" value="tab1" reRender="cmInfoID">
<f:param name="cmdParam" value="tab1" />
</rich:menuItem>
@@ -166,7 +169,7 @@
<h:outputText value="text1" />
</rich:tab>
<rich:tab id="t2cmTestID" label="tab2">
- <rich:contextMenu submitMode="ajax">
+ <rich:contextMenu submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}">
<rich:menuItem icon="/pics/header.png" value="tab2" reRender="cmInfoID">
<f:param name="cmdParam" value="tab2" />
</rich:menuItem>
@@ -184,7 +187,7 @@
<h:outputText value="text2" />
</rich:tab>
<rich:tab id="t3cmTestID" label="tab3">
- <rich:contextMenu submitMode="ajax">
+ <rich:contextMenu submitMode="ajax" disableDefaultMenu="#{contextMenu.disableDefaultMenu}">
<rich:menuItem icon="/pics/header.png" value="tab3" reRender="cmInfoID">
<f:param name="cmdParam" value="tab3" />
</rich:menuItem>
@@ -240,7 +243,7 @@
</rich:menuItem>
</rich:contextMenu>
</rich:tabPanel>
-
+
<h:graphicImage id="gicmID" value="/pics/asus.jpg" height="125px" width="150px">
<rich:contextMenu attached="#{contextMenu.attached}" submitMode="#{contextMenu.submitMode}" event="#{contextMenu.event}"
disableDefaultMenu="#{contextMenu.disableDefaultMenu}" rendered="#{contextMenu.rendered}" hideDelay="#{contextMenu.hideDelay}"
@@ -323,48 +326,6 @@
</rich:contextMenu>
</h:inputText>
-
- <div id="divcmTestID" style="width: 80px; height: 45px; background-color: #008080;"> <rich:contextMenu
- attached="#{contextMenu.attached}" submitMode="#{contextMenu.submitMode}" event="#{contextMenu.event}"
- disableDefaultMenu="#{contextMenu.disableDefaultMenu}" rendered="#{contextMenu.rendered}" hideDelay="#{contextMenu.hideDelay}"
- showDelay="#{contextMenu.showDelay}" popupWidth="#{contextMenu.popupWidth}">
- <rich:menuItem icon="/pics/header.png" value="div" reRender="cmInfoID">
- <f:param name="cmdParam" value="div" />
- </rich:menuItem>
- <rich:menuSeparator />
- <rich:menuItem icon="/pics/info.gif" value="action" action="alert('action work')" reRender="cmInfoID">
- <f:param name="cmdParam" value="action" />
- </rich:menuItem>
- <rich:menuItem icon="/pics/info.gif" value="actionListener" actionListener="#{contextMenu.actionListener}" reRender="cmInfoID">
- </rich:menuItem>
- <rich:menuItem icon="/pics/info.gif" value="ajaxSingle" ajaxSingle="true" action="submit()" reRender="cmInfoID">
- <f:param name="cmdParam" value="ajaxSingle" />
- </rich:menuItem>
- <rich:menuItem icon="/pics/fatal.gif" value="disabled" disabled="true" reRender="cmInfoID">
- <f:param name="cmdParam" value="disabled" />
- </rich:menuItem>
- <rich:menuItem icon="/pics/fatal.gif" value="immediate" immediate="true" action="submit();">
- <f:param name="cmdParam" value="immedeate" />
- <h:inputText value="#{contextMenu.inputText}" />
- </rich:menuItem>
- <rich:menuItem icon="/pics/fatal.gif" value="submitMode: none" submitMode="none" reRender="cmInfoID">
- <f:param name="cmdParam" value="none" />
- </rich:menuItem>
- <rich:menuItem icon="/pics/fatal.gif" value="submitMode: server" submitMode="server" reRender="cmInfoID">
- <f:param name="cmdParam" value="server" />
- </rich:menuItem>
- <rich:menuItem icon="/pics/fatal.gif" value="submitMode: ajax" submitMode="ajax" reRender="cmInfoID">
- <f:param name="cmdParam" value="ajax" />
- </rich:menuItem>
- <rich:menuItem value="select">
- <h:selectOneMenu value="#{contextMenu.selectOneMenu}" onchange="submit();">
- <f:selectItem itemLabel="item1" itemValue="item1" />
- <f:selectItem itemLabel="item2" itemValue="item2" />
- </h:selectOneMenu>
- </rich:menuItem>
- </rich:contextMenu></div>
-
-
<h:panelGrid id="pgTestID" columns="1" border="5" cellpadding="2" cellspacing="2">
<h:outputText value="panelGrid" />
<h:outputText value="" />
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenuProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenuProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/ContextMenu/ContextMenuProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,8 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
<f:subview id="contextMenuPropertySubviewID">
<a4j:commandButton value="reRender" reRender="cmInfoID"></a4j:commandButton>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,9 +1,4 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
-
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"
xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
<head>
@@ -12,8 +7,21 @@
<f:view>
- <h:form>
+ <h:form id="test">
+<rich:tabPanel switchType="ajax">
- </h:form>
+<rich:tab label="Sample 1">
+<h:outputText value="1"></h:outputText>
+<h:inputText value="#{dDMenu.mode}" required="true" />
+</rich:tab>
+
+<rich:tab label="Sample 2">
+<a4j:support event="ontabenter"></a4j:support>
+<h:outputText value="2"></h:outputText>
+<h:inputText value="#{dDMenu.mode}"></h:inputText>
+</rich:tab>
+
+</rich:tabPanel>
+ </h:form>
</f:view>
-</html>
\ No newline at end of file
+</html>
\ No newline at end of file
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionList.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionList.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionList.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="dataDefinitionListSubviewID">
<rich:dataDefinitionList id="ddListID" value="#{dataDefinitionList.arr}" var="arr" first="#{dataDefinitionList.first}"
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataDefinitionList/DataDefinitionListProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="dataDefinitionListPropertySubviewID">
<h:panelGrid columns="2">
Deleted: branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,133 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
-
-<style type="text/css">
-
- body{
- font: normal 11px tahoma, sans-serif;
- }
-
- .column{
- width:75px;
- font: normal 11px tahoma, sans-serif;
- text-align:center;
- }
-
- .column-index{
- width:75px;
- font: normal 11px tahoma, sans-serif;
- text-align:left;
- }
-
- .list-row3{
- background-color:#ececec;
- }
-
- .list-row1{
- background-color:#f1f6fd;
- }
-
- .list-row2{
- background-color:#fff;
- }
-
- .list-header{
- font: bold 11px tahoma, sans-serif;
- text-align:center;
- }
-
- .list-table1{
- border:1px solid #bed6f8;
- }
-
- .list-table2{
- border:1px solid #bed6f8;
- }
-
-
-
- </style>
-<f:subview id="dfsID">
-
- <a4j:form id="form1" reRender="list-body" ajaxSubmit="true"
- ignoreDupResponses="true" requestDelay="100">
-
- <a4j:region id="stat1">
- <a4j:outputPanel id="slider-body">
-
- <rich:dataFilterSlider sliderListener="#{mybean.doSlide}"
- binding="#{inventoryList.dataFilterSlider}" for="carList"
- forValRef="inventoryList.carInventory" filterBy="getMileage"
- manualInput="true" onSlide="true"
- storeResults="true" trackStyleClass="track" width="400px"
- styleClass="slider-container" startRange="10000" endRange="60000"
- increment="10000" rangeStyleClass="range" trailer="true"
- trailerStyleClass="trailer" handleStyleClass="handle"
- handleValue="10000" id="slider_1">
- </rich:dataFilterSlider>
-
- </a4j:outputPanel>
-
-
- <a4j:outputPanel id="list-body">
- <f:verbatim>
-
- </f:verbatim>
- <h:dataTable id="carIndex" rows="10"
- binding="#{inventoryList.carMakeIndexUIData}"
- value="#{inventoryList.carMakeIndex}" var="category"
- styleClass="list-table1" columnClasses="column-index"
- rowClasses="list-row3">
-
- <h:column>
- <a4j:commandLink actionListener="#{inventoryList.filterCarList}"
- reRender="carList">
- <h:outputText value="#{category}" />
- <f:attribute name="filterRule" value="showTable" />
-
- </a4j:commandLink>
- </h:column>
-
- </h:dataTable>
-
- <h:dataTable id="carList" rows="10"
- value="#{inventoryList.carInventory}" var="category"
- rowClasses="list-row1, list-row2" columnClasses="column"
- headerClass="list-header" styleClass="list-table2">
-
- <h:column>
- <f:facet name="header">
- <h:outputText styleClass="headerText" value="Make" />
- </f:facet>
- <h:outputText value="#{category.make}" />
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText styleClass="headerText" value="Model" />
- </f:facet>
- <h:outputText value="#{category.model}" />
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText styleClass="headerText"
- value="#{inventoryList.priceColumnName}" />
- </f:facet>
- <h:outputText value="#{category.price}" />
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText styleClass="headerText"
- value="#{inventoryList.mileageColumnName}" />
- </f:facet>
- <h:outputText value="#{category.mileage}" />
- </h:column>
- </h:dataTable>
- </a4j:outputPanel>
- </a4j:region>
- <h:commandLink value="Back" action="main"></h:commandLink>
- </a4j:form>
-
-</f:subview>
-
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,30 +1,18 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
-<f:subview id="DataFilterSliderSubviewID">
-
- <a4j:form id="form1" reRender="list-body" ajaxSubmit="true"
- ignoreDupResponses="true" requestDelay="100">
+<f:subview id="dataFilterSliderSubviewID">
- <a4j:region id="stat1">
- <a4j:outputPanel id="p1">
- <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" rendered="#{dfs.rendered}"
- binding="#{inventoryList.dataFilterSlider}" for="carList"
- forValRef="inventoryList.carInventory" filterBy="getMileage"
- manualInput="true" onSlide="true" onChange="true"
- storeResults="true" trackStyleClass="track" width="400px"
- styleClass="slider-container" startRange="10000" endRange="60000"
- increment="10000" rangeStyleClass="range" trailer="true"
- trailerStyleClass="trailer" handleStyleClass="handle"
- handleValue="10000" id="slider_1">
- </rich:dataFilterSlider>
- </a4j:outputPanel>
+ <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" rendered="#{dfs.rendered}" binding="#{inventoryList.dataFilterSlider}"
+ for="carList" forValRef="inventoryList.carInventory" filterBy="getMileage" manualInput="true" onSlide="true" onChange="true"
+ storeResults="true" trackStyleClass="track" width="400px" styleClass="slider-container" startRange="10000" endRange="60000"
+ increment="10000" rangeStyleClass="range" trailer="true" trailerStyleClass="trailer" handleStyleClass="handle"
+ handleValue="10000" id="dfsID">
+ </rich:dataFilterSlider>
-
-
- <a4j:outputPanel id="list-body" style="border: 1px">
+ <h:panelGrid id="list-body">
<h:dataTable id="carIndex" rows="10"
binding="#{inventoryList.carMakeIndexUIData}"
value="#{inventoryList.carMakeIndex}" var="category"
@@ -39,7 +27,6 @@
</a4j:commandLink>
</h:column>
-
</h:dataTable>
<h:dataTable id="carList" rows="10"
@@ -76,7 +63,8 @@
<h:outputText value="#{category.mileage}" />
</h:column>
</h:dataTable>
- </a4j:outputPanel>
- </a4j:region>
- </a4j:form>
-</f:subview>
+ </h:panelGrid>
+ <h:outputText value="click reRender for update page(RF-1365)" />
+ <h:commandButton value="reRender" />
+
+</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,9 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
-<f:subview id="calendarPropertySubviewID">
+<f:subview id="dataFilterSliderPropertySubviewID">
<h:panelGrid columns="2">
<h:outputText value="Rendered:" />
<h:selectBooleanCheckbox value="#{dfs.rendered}" >
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,10 +1,11 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
<f:subview id="dataOrderedListSubviewID">
<rich:dataOrderedList id="doListID" value="#{dataOrderedList.arr}" var="arr" first="#{dataOrderedList.first}"
- rendered="#{dataOrderedList.rendered}" title="#{dataOrderedList.title}" type="#{dataOrderedList.type}" dir="#{dataOrderedList.dir}"
+ rendered="#{dataOrderedList.rendered}" title="#{dataOrderedList.title}" type="disc" dir="#{dataOrderedList.dir}"
rows="#{dataOrderedList.rows}">
<f:facet name="header">
<h:outputText value="Africa(header):" />
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedListProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedListProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedListProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,8 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
<f:subview id="dataOrderedListPropertySubviewID">
<h:panelGrid columns="2">
<h:outputText value="title" />
@@ -33,7 +34,7 @@
<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="disc" itemLabel="disc"/>
<f:selectItem itemValue="circle" itemLabel="circle"/>
<f:selectItem itemValue="square" itemLabel="square"/>
<a4j:support event="onchange" reRender="doListID"></a4j:support>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,11 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="DataScrollerSubviewID">
- <h:form dir="DSform">
-
<h:dataTable id="dataTableId" value="#{dataScroller.dataTable}"
var="dT" cellpadding="5px" rows="5" border="1">
<f:facet name="header">
@@ -29,5 +27,4 @@
<h:outputText value="#{dT.data1}" />
</h:column>
</h:dataTable>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="datascrollerPropertySubviewID">
<rich:simpleTogglePanel id="dTablePropertyID" switchType="client" opened="true"
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,26 +1,31 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="datascrollerStraightforwardSubviewID">
<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/jsp/src/main/webapp/DataTable/DataTable.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,13 +1,11 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="DataTableSubviewID">
- <h:form dir="DSform">
<rich:dataTable id="dataTableID" var="dataTableID" value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table"
- captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" headerClass="header" footerClass="footer" cellpadding=""
- cellspacing="" onRowClick="print('onRowClickInputID', 'onRowClick work!');alert('row #{key}');" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red"
+ captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" headerClass="header" footerClass="footer" onRowClick="print('onRowClickInputID', 'onRowClick work!');alert('row #{key}');" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red"
border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite"
onRowDblClick="print('onRowDblClickInputID', 'onRowDblClick work!')"
onRowMouseDown="print('onRowMouseDownInputID', 'onRowMouseDown work!')"
@@ -16,7 +14,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">
@@ -58,6 +56,12 @@
<h:outputText value="#{dataTableID.day}" />
</rich:column>
<rich:subTable id="detail" var="detail" value="#{dataTableID.detail}">
+ <f:facet name="header">
+ <h:outputText value="facet(header)" />
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText value="facet(footer)" />
+ </f:facet>
<rich:column id="name">
<h:outputText value="#{detail.name}" />
</rich:column>
@@ -69,5 +73,4 @@
<h:outputText value="#{dataTableID.total}" />
</rich:column>
</rich:dataTable>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="dataTablePropertySubviewID">
<rich:simpleTogglePanel id="dtPropertyID" switchType="client" opened="true" label="dataTable property">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="StraightforwardSubviewID">
<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/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,12 +1,13 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
-<f:subview id="DtadAndDropSubviewID">
-
- <h:form id="form">
-
+<f:subview id="dataDefinitionListSubviewID">
+ <script type="text/javascript">
+ DnD.CLIENT_VALIDATION_OFF = false;
+ </script>
+
<h:panelGroup id="dragValueText">
<h:outputText value="#{dndBean.dragValue}" />
</h:panelGroup>
@@ -76,7 +77,8 @@
<rich:dropSupport id="zone1"
oncomplete="print('oncompleteInputID', 'oncomplete work!')"
onsubmit="print('onsubmitInputID', 'onsubmit work!')" ondragenter="print('ondragenterInputID', 'ondragenter work!')"
- ondragexit="print('ondragexitInputID', 'ondragexit work!')" ondrop="print('ondropInputID', 'ondrop work!');var zone = $('DtadAndDropSubviewID:form:grid1'); zone.style.borderColor= 'red'; setTimeout( function() { this.style.borderColor= 'navy'; }.bind(zone), 300);"
+ ondragexit="print('ondragexitInputID', 'ondragexit work!')" ondropend="print('ondropendInputID', 'ondropend work!')"
+ ondrop="print('ondropInputID', 'ondrop work!')"
acceptedTypes="file, folder" typeMapping="{file: testDrop}">
<rich:dndParam name="testDrop">
<h:graphicImage height="16" width="16"
@@ -191,10 +193,9 @@
<f:verbatim>dragSupport</f:verbatim>
</h:panelGrid>
- <a4j:status startText="...request..." stopText="stop" />
+
<a4j:outputPanel ajaxRendered="true">
<h:messages />
</a4j:outputPanel>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,14 +1,13 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="DropDownMenuSubviewID">
- <h:form>
<h:panelGrid columns="2">
<rich:spacer width="400px" height="400px"></rich:spacer>
<rich:panel>
- <rich:dropDownMenu id="ddmId" value="DropDownMenu" submitMode="#{dDMenu.mode}" hideDelay="#{dDMenu.hideDelay}"
+ <rich:dropDownMenu id="ddmId" value="DropDownMenu" submitMode="#{dDMenu.mode}" hideDelay="#{dDMenu.hideDelay}"
direction="#{dDMenu.direction}" horizontalOffset="#{dDMenu.horizontalOffset}" jointPoint="#{dDMenu.jointPoint}"
popupWidth="#{dDMenu.popupWidth}" showDelay="#{dDMenu.showDelay}" rendered="#{dDMenu.rendered}"
verticalOffset="#{dDMenu.verticalOffset}" styleClass="panelpos" event="#{dDMenu.event}"
@@ -66,5 +65,4 @@
</rich:panel>
</h:panelGrid>
<a4j:log></a4j:log>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="dropDownMenuPropertySubviewID">
<rich:simpleTogglePanel id="ddMenuPropertyID" switchType="client" opened="true" label="dropDownMenu property">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="dropDownMenuStraightforwardSubviewID">
<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/jsp/src/main/webapp/Effect/Effect.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,10 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="effectSubviewID">
- <h:form>
<rich:panel id="indexID">
<a4j:commandLink value="Hide all" onclick="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()"></a4j:commandLink>
@@ -296,5 +295,4 @@
<rich:effect for="frm5" name="showFrm5" type="Appear" />
-</h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,12 +1,11 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="GmapSubviewID">
- <h:form>
- <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" onclick=""
- ondblclick="print('ondblclickInputID', 'ondblclick work!')" oninit="print('oninitInputID', 'oninit work!')"
+ <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" onclick="print('onclickInputID', 'onclick work!')"
+ ondblclick="print('ondblclickInputID', 'ondblclick work!')"
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!')"
@@ -49,7 +48,7 @@
</f:verbatim>
</h:panelGroup>
- <a4j:outputPanel>
+ <a4j:outputPanel>
<script>
function createMarker(point,html) {
@@ -84,5 +83,4 @@
</script>
</a4j:outputPanel>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="GmapPropertySubviewID">
<h:panelGrid columns="2">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -4,28 +4,23 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="inputNumberSliderSubviewID">
- <h:form>
<h:panelGrid columns="1">
- <rich:inputNumberSlider id="SliderId" immediate="#{inputNumberSlider.immediate}"
+ <rich:inputNumberSlider id="SliderId" immediate="#{inputNumberSlider.immediate}"
inputPosition="#{inputNumberSlider.inputPosition}" showToolTip="#{inputNumberSlider.showToolTip}"
- tabindex="#{inputNumberSlider.tabindex}" value="#{inputNumberSlider.value}" valueChangeListener="{key}"
+ tabindex="#{inputNumberSlider.tabindex}" value="#{inputNumberSlider.value}" valueChangeListener="#{inputNumberSlider.valueChangeListener}"
required="#{inputNumberSlider.rendered}" requiredMessage="#{inputNumberSlider.requiredMessage}"
disabled="#{inputNumberSlider.disabled}" enableManualInput="#{inputNumberSlider.enableManualInput}"
inputSize="#{inputNumberSlider.inputSize}" maxValue="#{inputNumberSlider.maxValue}" minValue="#{inputNumberSlider.minValue}"
rendered="#{inputNumberSlider.rendered}" showBoundaryValues="#{inputNumberSlider.showBoundaryValues}"
step="#{inputNumberSlider.step}" showInput="#{inputNumberSlider.showInput}" width="#{inputNumberSlider.width}"
barClass="#{inputNumberSlider.barStyle}" tipClass="#{inputNumberSlider.tipStyle}" inputClass="#{inputNumberSlider.inputStyle}"
- handleClass="#{inputNumberSlider.handleStyle}" styleClass="#{inputNumberSlider.tipStyle}"
- maxlength="#{inputNumberSlider.maxlength}" onmousedown="print('onmousedownInputID', 'onmousedown work!')"
- onblur="print('onblurInputID', 'onblur work!')" onchange="print('onchangeInputID', 'onchange work!')"
- onclick="print('onclickInputID', 'onclick work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')"
- onerror="print('ondblclickInputID', 'ondblclick work!')" onfocus="print('onfocusInputID', 'onfocus work!')"
- onselect="print('onselectInputID', 'onselect work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')"
- onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')"
- onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')"
- onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')">
+ handleClass="#{inputNumberSlider.handleStyle}" styleClass="#{inputNumberSlider.tipStyle}"
+ maxlength="#{inputNumberSlider.maxlength}" onmousedown="print('onmousedownInputID', 'onmousedown work!')" >
</rich:inputNumberSlider>
+ <h:panelGroup>
+ <a4j:commandButton value="valueChangeListener (show)" reRender="valueCLID" />
+ <h:outputText id="valueCLID" value=" #{inputNumberSlider.valueChangeListener}" />
+ </h:panelGroup>
</h:panelGrid>
<rich:spacer height="20px"></rich:spacer>
- </h:form>
</f:subview>
\ No newline at end of file
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="inputNumberSliderPropertySubviewID">
<rich:simpleTogglePanel id="iNSliderPropertyID" switchType="client" opened="true" label="inputNumberSlider property">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="inputNumberSliderStraightforwardSubviewID">
<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/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,10 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="inputNumberSpinnerSubviewID">
- <h:form>
<h:messages></h:messages>
<rich:inputNumberSpinner id="SpinnerID" tabindex="#{inputNumberSpinner.tabindex}" cycled="#{inputNumberSpinner.cycled}"
@@ -22,5 +21,4 @@
onmouseup="print('onmouseupInputID', 'onmouseup work!')" ondownclick="print('ondownclickInputID', 'ondownclick work!')"
onupclick="print('onupclickInputID', 'onupclick work!')"></rich:inputNumberSpinner>
<rich:spacer height="20px"></rich:spacer>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="iNSpinnerPropertySubviewID">
<rich:simpleTogglePanel id="iNSpinnerPropertyID" switchType="client" opened="true" label="inputNumberSpinner property">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="iNSpinnerStraightforwardSubviewID">
<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/jsp/src/main/webapp/Insert/Insert.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Insert/Insert.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Insert/Insert.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,15 +1,13 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="insertSubviewID">
- <h:form>
<h:messages />
<rich:panel id="panelID" header="Highlight: #{insert.highlight}; File: #{insert.src}">
<rich:insert id="insertID" highlight="#{insert.highlight}"
rendered="#{insert.rendered}" src="#{insert.src}"></rich:insert>
</rich:panel>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Insert/InsertProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Insert/InsertProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Insert/InsertProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="InsertPropertySubviewID">
<h:panelGrid columns="2">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,18 +1,23 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="listShuttleSubviewID">
<rich:listShuttle id="listShuttleID" var="item" sourceValue="#{listShuttle.sourceValue}" targetValue="#{listShuttle.targetValue}"
bottomControlLabel="#{listShuttle.bottomControlLabel}" copyAllControlLabel="#{listShuttle.copyAllControlLabel}"
copyControlLabel="#{listShuttle.copyControlLabel}" downControlLabel="#{listShuttle.downControlLabel}"
- fastMoveControlsVisible="#{listShuttle.fastMoveControlsVisible}"
+ fastMoveControlsVisible="#{listShuttle.fastMoveControlsVisible}" converter="listShuttleConverter"
fastOrderControlsVisible="#{listShuttle.fastOrderControlsVisible}" first="#{listShuttle.first}"
moveControlsVisible="#{listShuttle.moveControlsVisible}" orderControlsVisible="#{listShuttle.orderControlsVisible}"
removeAllControlLabel="#{listShuttle.removeAllControlLabel}" removeControlLabel="#{listShuttle.removeControlLabel}"
- selection="#{listShuttle.selection}" showButtonLabels="#{listShuttle.showButtonLabels}"
+ sourceSelection="#{listShuttle.sourceSelection}" targetSelection="#{listShuttle.targetSelection}"
+ showButtonLabels="#{listShuttle.showButtonLabels}" switchByClick="#{listShuttle.switchByClick}"
+ targetListWidth="#{listShuttle.targetListWidth}" sourceListWidth="#{listShuttle.sourceListWidth}"
+ listsHeight="#{listShuttle.listsHeight}" sourceCaptionLabel="#{listShuttle.sourceCaptionLabel}"
+ targetCaptionLabel="#{listShuttle.targetCaptionLabel}"
topControlLabel="#{listShuttle.topControlLabel}" upControlLabel="#{listShuttle.upControlLabel}">
+
<h:column>
<f:facet name="header">
<h:outputText value="Number" />
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="listShuttlePropertySubviewID">
<h:panelGrid columns="2">
@@ -13,11 +13,12 @@
<h:commandButton action="submit();" value="submit();" />
<h:commandButton action="submit();" immediate="true" value="immediate submit();" />
</h:panelGroup>
-
+
<h:outputText value="Enter quantity of lines" />
- <h:inputText value="#{listShuttle.lenght}">
- <a4j:support event="onchange" action="#{listShuttle.addNewItem}" reRender="listShuttleID"></a4j:support>
- </h:inputText>
+ <h:panelGroup>
+ <h:inputText value="#{listShuttle.lenght}" />
+ <a4j:commandButton action="#{listShuttle.addNewItem}" reRender="listShuttleID" value="ok" />
+ </h:panelGroup>
<h:outputText value="first" />
<h:inputText value="#{listShuttle.first}">
@@ -39,6 +40,34 @@
<h:outputText value="fastMoveControlsVisible" />
<h:selectBooleanCheckbox value="#{listShuttle.fastMoveControlsVisible}" onchange="submit();" />
+ <h:outputText value="switchByClick" />
+ <h:selectBooleanCheckbox value="#{listShuttle.switchByClick}" onchange="submit();" />
+
+ <h:outputText value="sourceCaptionLabel" />
+ <h:inputText value="#{listShuttle.sourceCaptionLabel}">
+ <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="targetCaptionLabel" />
+ <h:inputText value="#{listShuttle.targetCaptionLabel}">
+ <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="sourceListWidth" />
+ <h:inputText value="#{listShuttle.sourceListWidth}">
+ <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="targetListWidth" />
+ <h:inputText value="#{listShuttle.targetListWidth}">
+ <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="listsHeight" />
+ <h:inputText value="#{listShuttle.listsHeight}">
+ <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
+ </h:inputText>
+
<h:outputText value="copyControlLabel" />
<h:inputText value="#{listShuttle.copyControlLabel}">
<a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="listShuttleStraightforwardSubviewID">
<h:panelGrid columns="3">
@@ -10,7 +10,7 @@
<h:selectBooleanCheckbox value="#{listShuttle.showSelect}" onclick="submit();" />
</h:column>
<h:column>
- <h:dataTable id="infoLSlID" value="#{listShuttle.info}" var="info" rendered="#{listShuttle.showSelect}" border="1">
+ <h:dataTable id="infoLSID" value="#{listShuttle.info}" var="info" rendered="#{listShuttle.showSelect}" border="1">
<h:column>
<h:outputText value="#{info}" />
</h:column>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Message/Message.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Message/Message.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Message/Message.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,10 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="messageSubviewID">
- <h:form>
<rich:panel>
<h:outputText value="Rich Message Demo:" />
@@ -45,7 +44,7 @@
showSummary="#{message.showSummary}" passedLabel="No Error" errorLabelClass="errorLabel" fatalLabelClass="warnLabel"
infoLabelClass="infoLabel" warnLabelClass="fatalLabel" warnMarkerClass="markerWarn" infoMarkerClass="markerInfo"
errorMarkerClass="markerError" fatalMarkerClass="markerFatal" errorClass="errorClass" fatalClass="fatalClass"
- warnClass="warnClass" infoClass="infoClass" labelClass="labelClass" var="messages" styleClass="class" title="#{message.title}">
+ warnClass="warnClass" infoClass="infoClass" labelClass="labelClass" styleClass="class" title="#{message.title}">
<f:facet name="errorMarker">
<h:graphicImage url="/pics/error.gif" />
</f:facet>
@@ -65,10 +64,4 @@
</h:outputText>
</rich:messages>
</rich:panel>
-
- <f:verbatim>
- <br />
- </f:verbatim>
-
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="MessagePropertySubviewID">
<rich:simpleTogglePanel id="msgPropertyID" switchType="client" opened="true" label="modalPanel property">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="MessageStraightforwardSubviewID">
<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/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,31 +1,51 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="modalPanelSubviewID">
+ <h:messages />
+ <rich:modalPanel id="modalPanelID" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}"
+ height="#{modalPanel.height}" width="#{modalPanel.width}" moveable="#{modalPanel.moveable}"
+ resizeable="#{modalPanel.resizeable}" keepVisualState="#{modalPanel.keepVisualState}"
+ rendered="#{modalPanel.rendered}" zindex="#{modalPanel.zindex}" autosized="#{modalPanel.autosized}" left="#{modalPanel.left}"
+ top="#{modalPanel.top}" shadowDepth="#{modalPanel.shadowDepth}" shadowOpacity="#{modalPanel.shadowOpacity}"
+ showWhenRendered="#{modalPanel.showWhenRendered}" 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('modalPanelID');return false;" />
+ </f:facet>
+ <h:outputText value="This is Modal Panel example" styleClass="text1" />
+ <h:inputText value="#{modalPanel.inputTextTest}" />
+ <h:selectOneListbox value="#{modalPanel.selectOneListboxTest}">
+ <f:selectItem itemLabel="1" itemValue="1" />
+ <f:selectItem itemLabel="2" itemValue="2" />
+ <f:selectItem itemLabel="3" itemValue="3" />
+ </h:selectOneListbox>
+ <f:verbatim>
+ <br />
+ <br />
+ </f:verbatim>
+ <h:outputLink onclick="Richfaces.hideModalPanel('modalPanelID');return false;" value="Close">
+ <f:verbatim>Close</f:verbatim>
+ </h:outputLink>
+ </rich:modalPanel>
- <h:form id="MPform">
- <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>
-
- <h:outputText value="This is Modal Panel example" styleClass="text1" />
- <f:verbatim>
- <br />
- <br />
- </f:verbatim>
- <h:outputLink onclick="Richfaces.hideModalPanel('MPform:MPid');return false;" value="Close">
- <f:verbatim>Close</f:verbatim>
- </h:outputLink>
-
- </rich:modalPanel>
-
- <a onclick="Richfaces.showModalPanel('MPform:MPid');" href="#">Show MP</a>
-
- <rich:spacer height="20px"></rich:spacer>
- </h:form>
+ <a onclick="Richfaces.showModalPanel('modalPanelID');" href="#">Show MP</a>
+
+ <f:verbatim>
+ <br />
+ <br />
+ </f:verbatim>
+
+ <h:graphicImage value="/pics/info.gif" onclick="Richfaces.showModalPanel('modalPanelID');" />
+ <f:verbatim>
+ <br />
+ <br />
+ </f:verbatim>
+ <div style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div>
+
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,40 +1,86 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="ModalPanelPropertySubviewID">
<rich:simpleTogglePanel id="mpPropertyID" switchType="client" opened="true" label="modalPanel property">
<h:panelGrid columns="2">
+ <h:outputText value="shadowDepth" />
+ <h:inputText value="#{modalPanel.shadowDepth}" >
+ <a4j:support event="onchange" reRender="modalPanelID"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="shadowOpacity" />
+ <h:inputText value="#{modalPanel.shadowOpacity}" >
+ <a4j:support event="onchange" reRender="modalPanelID"></a4j:support>
+ </h:inputText>
+ <h:outputText value="keepVisualState" />
+ <h:selectBooleanCheckbox value="#{modalPanel.keepVisualState}" >
+ <a4j:support event="onchange" reRender="modalPanelID"></a4j:support>
+ </h:selectBooleanCheckbox>
+
+ <h:outputText value="left" />
+ <h:inputText value="#{modalPanel.left}" >
+ <a4j:support event="onchange" reRender="modalPanelID"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="top" />
+ <h:inputText value="#{modalPanel.top}" >
+ <a4j:support event="onchange" reRender="modalPanelID"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="rendered" />
+ <h:selectBooleanCheckbox value="#{modalPanel.rendered}" >
+ <a4j:support event="onchange" reRender="modalPanelID"></a4j:support>
+ </h:selectBooleanCheckbox>
+
+ <h:outputText value="showWhenRendered" />
+ <h:selectBooleanCheckbox value="#{modalPanel.showWhenRendered}" >
+ <a4j:support event="onchange" reRender="modalPanelID"></a4j:support>
+ </h:selectBooleanCheckbox>
+
+ <h:outputText value="zindex" />
+ <h:selectOneRadio value="#{modalPanel.zindex}">
+ <f:selectItem itemLabel="1" itemValue="1" />
+ <f:selectItem itemLabel="3" itemValue="3" />
+ <a4j:support event="onchange" reRender="modalPanelID"></a4j:support>
+ </h:selectOneRadio>
+
<h:outputText value="Width:" />
<h:inputText value="#{modalPanel.width}">
- <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support>
+ <a4j:support event="onchange" reRender="modalPanelID"></a4j:support>
</h:inputText>
<h:outputText value="Height:" />
<h:inputText value="#{modalPanel.height}">
- <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support>
+ <a4j:support event="onchange" reRender="modalPanelID"></a4j:support>
</h:inputText>
<h:outputText value="minWidth:" />
<h:inputText value="#{modalPanel.minWidth}">
- <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support>
+ <a4j:support event="onchange" reRender="modalPanelID"></a4j:support>
</h:inputText>
<h:outputText value="minHeight:" />
<h:inputText value="#{modalPanel.minHeight}">
- <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support>
+ <a4j:support event="onchange" reRender="modalPanelID"></a4j:support>
</h:inputText>
+
+ <h:outputText value="autosized" />
+ <h:selectBooleanCheckbox value="#{modalPanel.autosized}" >
+
+ </h:selectBooleanCheckbox>
<h:outputText value="Resizeable:" />
- <h:selectBooleanCheckbox value="#{modalPanel.resizeable}">
- <a4j:support event="onclick" reRender="MPform:MPid"></a4j:support>
+ <h:selectBooleanCheckbox value="#{modalPanel.resizeable}" onchange="submit();">
+
</h:selectBooleanCheckbox>
<h:outputText value="Moveable:" />
<h:selectBooleanCheckbox value="#{modalPanel.moveable}">
- <a4j:support event="onclick" reRender="MPform:MPid"></a4j:support>
+ <a4j:support event="onclick" reRender="modalPanelID"></a4j:support>
</h:selectBooleanCheckbox>
</h:panelGrid>
</rich:simpleTogglePanel>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="ModalPanelStraightforwardSubviewID">
<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>
+ <a4j:commandButton action="#{modalPanel.bTest1}" value="run" reRender="modalPanelID,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>
+ <a4j:commandButton action="#{modalPanel.bTest2}" value="run" reRender="modalPanelID,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>
+ <a4j:commandButton action="#{modalPanel.bTest3}" value="run" reRender="modalPanelID,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>
+ <a4j:commandButton action="#{modalPanel.bTest4}" value="run" reRender="modalPanelID,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>
+ <a4j:commandButton action="#{modalPanel.bTest5}" value="run" reRender="modalPanelID,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/jsp/src/main/webapp/OrderingList/OrderingList.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,20 +1,25 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="orderingListSubviewID">
- <h:messages showDetail="true" />
+ <a4j:outputPanel ajaxRendered="true">
+ <h:messages />
+ </a4j:outputPanel>
<rich:orderingList id="orderingListID" value="#{orderingList.list}" var="item" listHeight="#{orderingList.listHeight}"
- listWidth="#{orderingList.listWidth}" controlsType="#{orderingList.controlsType}"
+ listWidth="#{orderingList.listWidth}" controlsType="#{orderingList.controlsType}" converter="orderingListConverter"
bottomControlLabel="#{orderingList.bottomControlLabel}" captionLabel="#{orderingList.captionLabel}"
topControlLabel="#{orderingList.topControlLabel}" upControlLabel="#{orderingList.upControlLabel}"
controlsHorizontalAlign="#{orderingList.controlsHorizontalAlign}" controlsVerticalAlign="#{orderingList.controlsVerticalAlign}"
- downControlLabel="#{orderingList.downControlLabel}"
+ downControlLabel="#{orderingList.downControlLabel}"
orderControlsVisible="#{orderingList.orderControlsVisible}" fastOrderControlsVisible="#{orderingList.fastOrderControlsVisible}"
- rendered="#{orderingList.rendered}" showButtonLabels="#{orderingList.showButtonLabels}" selection="#{orderingList.selection}">
+ rendered="#{orderingList.rendered}" showButtonLabels="#{orderingList.showButtonLabels}" selection="#{orderingList.selection}"
+ onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onclick="print('onclickInputID', 'onclick work!')"
+ ondblclick="print('ondblclickInputID', 'ondblclick work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')"
+ onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onorderchanged="print('onorderchangedInputID', 'onorderchanged work!')" ontopclick="print('ontopclickInputID', 'ontopclick work!')" onupclick="print('onupclickInputID', 'onupclick work!')" ondownclick="print('ondownclickInputID', 'ondownclick work!')" onbottomclick="print('onbottomclickInputID', 'onbottomclick work!')" onheaderclick="print('onheaderclickInputID', 'onheaderclick work!')">
<f:facet name="header">
<h:outputText value="header" />
</f:facet>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/OrderingList/OrderingListProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/OrderingList/OrderingListProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/OrderingList/OrderingListProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,95 +1,90 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
<f:subview id="orderingListPropertySubviewID">
- <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:panelGrid columns="2">
+ <h:outputText value="Enter quantity of lines" />
+ <h:panelGroup>
+ <h:inputText value="#{orderingList.lenght}" />
+ <a4j:commandButton action="#{orderingList.addNewItem}" reRender="orderingListID" value="ok" />
+ </h:panelGroup>
- <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="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="captionLabel" />
- <h:inputText value="#{orderingList.captionLabel}">
- <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="headerLabel" />
- <h:inputText value="#{orderingList.headerLabel}">
- <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="listHeight:" />
- <h:inputText value="#{orderingList.listHeight}">
- <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="listWidth" />
- <h:inputText value="#{orderingList.listWidth}">
- <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:inputText>
+ <h:outputText value="controlsVerticalAlign" />
+ <h:selectOneRadio value="#{orderingList.controlsVerticalAlign}">
+ <f:selectItem itemLabel="top" itemValue="top" />
+ <f:selectItem itemLabel="center" itemValue="center" />
+ <f:selectItem itemLabel="bottom" itemValue="bottom" />
+ <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
+ </h:selectOneRadio>
- <h:outputText value="controlsVerticalAlign" />
- <h:selectOneRadio value="#{orderingList.controlsVerticalAlign}">
- <f:selectItem itemLabel="top" itemValue="top"/>
- <f:selectItem itemLabel="center" itemValue="center"/>
- <f:selectItem itemLabel="bottom" itemValue="bottom"/>
- <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:selectOneRadio>
+ <h:outputText value="controlsHorizontalAlign" />
+ <h:selectOneRadio value="#{orderingList.controlsHorizontalAlign}">
+ <f:selectItem itemLabel="left" itemValue="left" />
+ <f:selectItem itemLabel="right" itemValue="right" />
+ <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
+ </h:selectOneRadio>
- <h:outputText value="controlsHorizontalAlign" />
- <h:selectOneRadio value="#{orderingList.controlsHorizontalAlign}">
- <f:selectItem itemLabel="left" itemValue="left"/>
- <f:selectItem itemLabel="right" itemValue="right"/>
- <a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:selectOneRadio>
+ <h:outputText value="upControlLabel" />
+ <h:inputText value="#{orderingList.upControlLabel}">
+ <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="bottomControlLabel" />
+ <h:inputText value="#{orderingList.bottomControlLabel}">
+ <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="topControlLabel" />
+ <h:inputText value="#{orderingList.topControlLabel}">
+ <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="downControlLabel" />
+ <h:inputText value="#{orderingList.downControlLabel}">
+ <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="showButtonLabels" />
+ <h:selectBooleanCheckbox value="#{orderingList.showButtonLabels}">
+ <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="fastOrderControlsVisible" />
+ <h:selectBooleanCheckbox value="#{orderingList.fastOrderControlsVisible}">
+ <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="orderControlsVisible" />
+ <h:selectBooleanCheckbox value="#{orderingList.orderControlsVisible}">
+ <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="rendered" />
- <h:selectBooleanCheckbox value="#{orderingList.rendered}" onclick="submit();">
- </h:selectBooleanCheckbox>
- </h:panelGrid>
- </rich:simpleTogglePanel>
+ <h:outputText value="rendered" />
+ <h:selectBooleanCheckbox value="#{orderingList.rendered}" onclick="submit();">
+ </h:selectBooleanCheckbox>
+ </h:panelGrid>
</f:subview>
\ No newline at end of file
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/OrderingList/OrderingListStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/OrderingList/OrderingListStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/OrderingList/OrderingListStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,28 +1,29 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
<f:subview id="orderingListStraightforwardSubviewID">
- <rich:simpleTogglePanel switchType="client" opened="true" label="modalPanel straightforward">
+
<h:panelGrid columns="3">
<h:outputText value="Test1" />
- <a4j:commandButton action="#{orderingList.bTest1}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton>
+ <a4j:commandButton action="#{orderingList.bTest1}" value="run" reRender="richGridID"></a4j:commandButton>
<h:outputText value="#{msg.t1OrderingList}" />
<h:outputText value="Test2" />
- <a4j:commandButton action="#{orderingList.bTest2}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton>
+ <a4j:commandButton action="#{orderingList.bTest2}" value="run" reRender="richGridID"></a4j:commandButton>
<h:outputText value="#{msg.t2OrderingList}" />
<h:outputText value="Test3" />
- <a4j:commandButton action="#{orderingList.bTest3}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton>
+ <a4j:commandButton action="#{orderingList.bTest3}" value="run" reRender="richGridID"></a4j:commandButton>
<h:outputText value="#{msg.t3OrderingList}" />
<h:outputText value="Test4" />
- <a4j:commandButton action="#{orderingList.bTest4}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton>
+ <a4j:commandButton action="#{orderingList.bTest4}" value="run" reRender="richGridID"></a4j:commandButton>
<h:outputText value="#{msg.t4OrderingList}" />
<h:outputText value="Test5" />
- <a4j:commandButton action="#{orderingList.bTest5}" value="run" reRender="orderingListPropertyID,orderingListID"></a4j:commandButton>
+ <a4j:commandButton action="#{orderingList.bTest5}" value="run" reRender="richGridID"></a4j:commandButton>
<h:outputText value="#{msg.t5OrderingList}" />
<a4j:commandButton value="Show selection (reRender)" reRender="infoPanelID"></a4j:commandButton>
@@ -109,5 +110,5 @@
<h:commandButton action="submit();" immediate="true" value="immediate submit();" />
</h:panelGroup>
</h:panelGrid>
- </rich:simpleTogglePanel>
+
</f:subview>
\ No newline at end of file
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,13 +1,11 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="paint2DSubviewID">
- <h:form>
<rich:paint2D id="paint2dID" paint="#{paint2D.paint}" data="#{paintData}" width="#{paint2D.width}" height="#{paint2D.height}"
align="#{paint2D.align}" hspace="#{paint2D.hspace}" vspace="#{paint2D.vspace}" bgcolor="#{paint2D.bgcolor}"
format="#{paint2D.format}" title="#{paint2D.title}" styleClass="#{paint2D.styleString}" border="#{paint2D.border}"
rendered="#{paint2D.rendered}" />
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="Paint2DPropertySubviewID">
<rich:simpleTogglePanel id="paint2DPropertyID" switchType="client" opened="true" label="paint2D property">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="Paint2DStraightforwardSubviewID">
<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/jsp/src/main/webapp/Panel/Panel.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,10 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="panelSubviewID">
- <h:form>
<h:outputText value="Panel 1, rendered: #{!panel.rendered}; Panel 2, rendered #{panel.rendered};"></h:outputText>
@@ -45,6 +44,5 @@
<f:verbatim>This is panel 2 example...(Test events)</f:verbatim>
</rich:panel>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,12 +1,10 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="panel2SubviewID">
- <h:form>
- <h:messages showDetail="true" />
- <h:panelGrid columnClasses="panel" border="0" columns="3">
+ <h:panelGrid columnClasses="panel" border="0" columns="3">
<rich:panel styleClass="top">
<f:facet name="header">
<h:panelGroup>
@@ -94,5 +92,4 @@
<h:outputText value="inside the form" />
</h:form>
</rich:panel>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="PanelPropertySubviewID">
<rich:simpleTogglePanel id="panelPropertyID" switchType="client" opened="true" label="panel property">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="PanelStraightforwardSubviewID">
<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/jsp/src/main/webapp/PanelBar/PanelBar.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,10 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="panelBarSubviewID">
- <h:form>
<h:messages></h:messages>
@@ -35,5 +34,4 @@
</rich:panelBar>
<rich:spacer height="20px"></rich:spacer>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="panelBarPropertySubviewID">
<rich:simpleTogglePanel id="pbPropertyID" switchType="client" opened="true" label="panelBar property">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="panelBarStraightforwardSubviewID">
<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/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,11 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="panelMenuSubviewID">
- <h:form>
- <h:messages showDetail="true"/>
<rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild"
expandSingle="#{panelMenu.expandSingle}" mode="#{panelMenu.mode}" value="PanelMenu" rendered="#{panelMenu.rendered}"
iconCollapsedGroup="#{panelMenu.icon.collapsedGroup}" iconCollapsedTopGroup="#{panelMenu.icon.collapsedTopGroup}"
@@ -42,7 +40,7 @@
</rich:panelMenuItem>
<rich:panelMenuItem label="Action" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem>
- <rich:panelMenuGroup label="Group 1 (align)" align="#{panelMenu.align}">
+ <rich:panelMenuGroup label="Group 1">
<rich:panelMenuItem label="Item 1" disabled="true"></rich:panelMenuItem>
<rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem>
<rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
@@ -54,7 +52,7 @@
<rich:panelMenuItem label="Item 1_2"></rich:panelMenuItem>
- <rich:panelMenuGroup label="Group 1_1_1 (align)" align="#{panelMenu.align}">
+ <rich:panelMenuGroup label="Group 1_1_1">
<rich:panelMenuItem label="Item 1 (action)" onmousedown="alert('OnMouseDown');"></rich:panelMenuItem>
<rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
</rich:panelMenuGroup>
@@ -116,7 +114,7 @@
<h:outputText id="info"
value="Expand Mode: #{panelMenu.mode}, Disabled: #{!panelMenu.disabled}, Align: #{panelMenu.align}, Tab Index: #{panelMenu.tabIndex}"></h:outputText>
-
+ <!-- triangleUp triangle triangleDown disc chevron chevronUp chevronDown grid -->
<f:verbatim>
<br />
</f:verbatim>
@@ -172,10 +170,4 @@
</rich:panelMenuGroup>
</rich:panelMenuGroup>
</rich:panelMenu>
-
- <f:verbatim>
- <br />
- <br />
- </f:verbatim>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="panelMenuPropertySubviewID">
<rich:simpleTogglePanel id="pmPropertyID" switchType="client" opened="true" label="panelMenu property">
@@ -35,16 +35,6 @@
<f:selectItem itemLabel="server" itemValue="server" />
</h:selectOneRadio>
- <h:outputText value="Align:"></h:outputText>
- <h:selectOneMenu value="#{panelMenu.align}">
- <f:selectItem itemLabel="left" itemValue="left" />
- <f:selectItem itemLabel="middle" itemValue="middle" />
- <f:selectItem itemLabel="right" itemValue="right" />
- <f:selectItem itemLabel="bottom" itemValue="bottom" />
- <f:selectItem itemLabel="top" itemValue="top" />
- <a4j:support event="onclick" reRender="panelMenuID,panelMenuID2,info"></a4j:support>
- </h:selectOneMenu>
-
<h:outputText value="Disabled"></h:outputText>
<h:selectBooleanCheckbox value="#{panelMenu.disabled}">
<a4j:support event="onchange" reRender="panelMenuID,panelMenuID2,info"></a4j:support>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="panelMenuStraightforwardSubviewID">
<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
Deleted: branches/3.1.x/test-applications/jsp/src/main/webapp/Sb.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Sb.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Sb.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,17 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
-<html>
- <body>
- <f:view>
- <h:form>
- <h:inputText id="su"></h:inputText>
- <rich:suggestionbox width="200" height="200" for="su" suggestionAction="#{sb.autocomplete}" var="c">
- <h:column>
- <h:outputText value="#{c.text}"></h:outputText>
- </h:column>
- </rich:suggestionbox>
- </h:form>
- </f:view>
- </body>
-</html>
Deleted: branches/3.1.x/test-applications/jsp/src/main/webapp/Sb.xhtml
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Sb.xhtml 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Sb.xhtml 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +0,0 @@
-<!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:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jstl/core"
- xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
- xmlns:rich="http://richfaces.org/rich">
-
-
-
-
- <ui:define name="body">
- <h:form>
- <h:inputText id="su"></h:inputText>
- <rich:suggestionbox width="200" height="200" for="su" suggestionAction="#{sb.autocomplete}" var="c">
- <h:column>
- <h:outputText value="#{c.text}"></h:outputText>
- </h:column>
- </rich:suggestionbox>
- <a4j:log></a4j:log>
- </h:form>
- </ui:define>
-
-</html>
\ No newline at end of file
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,20 +1,20 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="scrollableDataTableSubviewID">
- <h:form>
- <rich:scrollableDataTable id="sdt" var="sdt" value="#{scrollableDT.data}" rows="30" width="400px"
+ <rich:scrollableDataTable id="sdt" var="sdt" value="#{scrollableDT.data}" rows="#{scrollableDT.rows}" width="#{scrollableDT.width}"
+ 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>
@@ -23,19 +23,22 @@
<rich:column width="100px" sortable="false">
<f:facet name="header">
- <h:outputText value="Priority" />
+ <h:outputText value="Status" />
</f:facet>
- <h:outputText value="#{sdt.data2}" />
+ <h:selectOneMenu value="#{sdt.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>
</rich:column>
- <rich:column width="100px" sortable="false">
+ <rich:column width="30px" sortable="false">
<f:facet name="header">
- <h:outputText value="Name" />
+ <h:outputText value="Icon" />
</f:facet>
- <h:outputText value="#{sdt.data3}" />
+ <h:graphicImage value="#{sdt.data3}" />
</rich:column>
</rich:scrollableDataTable>
-
-
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,8 +1,18 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="scrollableDataTablePropertySubviewID">
+ <h:panelGrid columns="2">
+ <h:outputText value="rows" />
+ <h:inputText value="#{scrollableDT.rows}" />
+
+ <h:outputText value="width" />
+ <h:inputText value="#{scrollableDT.width}" />
+
+ <h:outputText value="hideWhenScrolling" />
+ <h:selectBooleanCheckbox value="#{scrollableDT.hideWhenScrolling}" />
+ </h:panelGrid>
<a4j:commandButton value="reRender" reRender="sdt"></a4j:commandButton>
</f:subview>
\ No newline at end of file
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/Separator.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/Separator.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/Separator.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,10 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="separatorSubviewID">
- <h:form>
<h:outputText value="Some text one..." styleClass="text"></h:outputText>
<rich:separator id="separatorId" rendered="#{separator.rendered}" width="#{separator.width}" height="#{separator.height}"
title="#{separator.title}" lineType="#{separator.lineType}" align="#{separator.align}" styleClass="#{separator.style}"
@@ -15,5 +14,4 @@
onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"></rich:separator>
<h:outputText value="Some text two..." styleClass="text"></h:outputText>
<rich:spacer height="20px"></rich:spacer>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="SeparatorPropertySubviewID">
<rich:simpleTogglePanel id="separatorPropertyID" switchType="client" opened="true" label="separator property">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="SeparatorStraightforwardSubviewID">
<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/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,11 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="simpleTogglePanelSubviewID">
-
- <h:form>
<rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text"
width="#{simpleTogglePanel.width}" height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}"
opened="false" onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')"
@@ -70,5 +68,4 @@
</rich:simpleTogglePanel>
<rich:spacer height="20px"></rich:spacer>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
- <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="stpPropertySubviewID">
<rich:simpleTogglePanel id="stpPropertyID" switchType="client" opened="true" label="spacer property">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="stpStraightforwardSubviewID">
<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/jsp/src/main/webapp/Spacer/Spacer.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,10 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="spacerSubviewID">
- <h:form>
<style type="text/css">
.text {
font-size: 20px;
@@ -24,5 +23,4 @@
onmouseup="print('onmouseupInputID', 'onmouseup work!')">
</rich:spacer>
<h:outputText value="Some text two..." styleClass="text"></h:outputText>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="spacerPropertySubviewID">
<rich:simpleTogglePanel id="spacerPropertyID" switchType="client" opened="true" label="spacer property">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="spacerStraightforwardSubviewID">
<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/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,37 +1,36 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="suggestionBoxSubviewID">
- <h:form id="suggestionbox_form">
<h:messages showDetail="true"/>
<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 value="#{sb.property}" id="text" />
- <rich:suggestionbox id="suggestionBoxId" for="text"
- zindex="#{sb.zindex}" rules="#{sb.rules}" styleClass="styleClass"
- suggestionAction="#{sb.autocomplete}" var="result"
+ <rich:suggestionbox id="suggestionBoxId" for="text" var="result"
+ suggestionAction="#{sb.autocomplete}"
width="#{sb.width}" height="#{sb.height}" border="#{sb.border}"
+ zindex="#{sb.zindex}" rules="#{sb.rules}" styleClass="styleClass"
cellpadding="#{sb.cellpadding}" cellspacing="#{sb.cellspacing}"
- first="#{sb.first}" minChars="#{sb.minchars}" tokens=", ]"
+ first="#{sb.first}" minChars="1" tokens=", ]"
bgcolor="#{sb.bgColor}" focus="#{sb.forcus}" title="#{result.text}"
summary="summary" shadowOpacity="#{sb.shadowOpacity}"
- shadowDepth="#{sb.shadowDepth}" selectValueClass="mousemove"
+ shadowDepth="#{sb.shadowDepth}" selectValueClass="mousemove" frequency="#{sb.frequency}"
nothingLabel="nothingLabel work! " oncomplete="print('oncompleteInputID', 'oncomplete work!')"
- onselect="print('onselectInputID', 'onselect work!')" onsubmit="print('onsubmitInputID', 'onsubmit work!')">
+ onselect="print('onselectInputID', 'onselect work!')" >
<h:column>
- <h:outputText value="#{result.text}" />
+ <h:outputText value="#{result.city}" />
</h:column>
+ <h:column>
+ <h:outputText value="#{result.contry}" />
+ </h:column>
+ <h:column>
+ <h:outputText value="#{result.flag}" />
+ </h:column>
+
</rich:suggestionbox>
<div
style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div>
-
- <f:verbatim>
- <br />
- <br />
- </f:verbatim>
-
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -14,6 +14,11 @@
<a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support>
</h:selectOneRadio>
+ <f:verbatim>Frequency</f:verbatim>
+ <h:inputText value="#{sb.frequency}">
+ <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support>
+ </h:inputText>
+
<f:verbatim>Border</f:verbatim>
<h:inputText value="#{sb.border}">
<a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -4,22 +4,28 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="suggestionboxStraightforwardSubviewID">
+
<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/jsp/src/main/webapp/TabPanel/TabPanel.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,10 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="tabPanelSubviewID">
- <h:form>
<rich:tabPanel id="tabPanelId" headerAlignment="#{tabPanel.headerAlignment}" width="#{tabPanel.width}"
height="#{tabPanel.height}" rendered="#{tabPanel.rendered}" title="#{tabPanel.title}" switchType="#{tabPanel.switchType}"
headerSpacing="#{tabPanel.headerSpacing}" selectedTab="#{tabPanel.selectedTab}" activeTabClass="#{tabPanel.activeTabStyle}"
@@ -55,5 +54,4 @@
</rich:tabPanel>
<rich:spacer height="20px"></rich:spacer>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,67 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
-<f:subview id="tabPanelPropertySubviewID">
- <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>
+<f:subview id="tabPanelStraightforwardSubviewID">
+ <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/jsp/src/main/webapp/TabPanel/TabPanelStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanelStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanelStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,67 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
-<f:subview id="tabPanelStraightforwardSubviewID">
- <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();" />
+<f:subview id="tabPanelPropertySubviewID">
+ <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/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,10 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="togglePanelSubviewID">
- <h:form id="tooggleTest">
<rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank"
style="width:300px!important; overflow: hidden;" onclick="print('onclickInputID', 'onclick work!')"
@@ -17,7 +16,7 @@
<rich:panel>
<f:facet name="header">
<h:panelGroup>
- <rich:toggleControl id="toggleControl_blank" for="tooggleTest:panel1">
+ <rich:toggleControl id="toggleControl_blank" for="togglePanelSubviewID:panel1">
<h:outputText value="Expand" style="font-weight: bold;" />
<h:graphicImage url="/pics/collapse.gif" style="border-width: 0px;" />
</rich:toggleControl>
@@ -30,7 +29,7 @@
<rich:panel>
<f:facet name="header">
<h:panelGroup>
- <rich:toggleControl id="toggleControl_panel1" for="tooggleTest:panel1">
+ <rich:toggleControl id="toggleControl_panel1" for="togglePanelSubviewID:panel1">
<h:outputText value="Collapse" style="font-weight: bold;" />
<h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" />
</rich:toggleControl>
@@ -71,7 +70,7 @@
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Customizable toggle panel" style="font-weight: bold;" />
- <rich:toggleControl id="toggleControl_panel_1" for="tooggleTest:panel2">
+ <rich:toggleControl id="toggleControl_panel_1" for="togglePanelSubviewID:panel2">
<h:outputText value="Next"></h:outputText>
<h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" />
</rich:toggleControl>
@@ -99,7 +98,7 @@
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Customizable toggle panel" style="font-weight: bold;" />
- <rich:toggleControl id="toggleControl_panel_2" for="tooggleTest:panel2">
+ <rich:toggleControl id="toggleControl_panel_2" for="togglePanelSubviewID:panel2">
<h:outputText value="Next"></h:outputText>
<h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" />
</rich:toggleControl>
@@ -127,7 +126,7 @@
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Customizable toggle panel" style="font-weight: bold;" />
- <rich:toggleControl id="toggleControl_panel_3" for="tooggleTest:panel2">
+ <rich:toggleControl id="toggleControl_panel_3" for="togglePanelSubviewID:panel2">
<h:outputText value="Next"></h:outputText>
<h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" />
</rich:toggleControl>
@@ -151,10 +150,5 @@
</f:facet>
</rich:togglePanel>
- <f:verbatim>
- <br />
- <br />
- </f:verbatim>
<ui:debug hotkey="L"></ui:debug>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="togglePanelPropertySubviewID">
<rich:simpleTogglePanel id="tPanelPropertyID" switchType="client" opened="true" label="tooglePanel property">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="togglePanelStraightforwardSubviewID">
<rich:simpleTogglePanel switchType="client" opened="true" label="tooglePanel straightforward">
<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/jsp/src/main/webapp/ToolBar/ToolBar.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,10 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="toolBarSubviewID">
- <h:form>
<h:messages></h:messages>
<rich:toolBar id="toolBarId" width="#{toolBar.width}"
@@ -34,5 +33,4 @@
</rich:toolBar>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/ToolBar/ToolBarProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/ToolBar/ToolBarProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/ToolBar/ToolBarProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="toolBarPropertySubviewID">
<h:panelGrid columns="2">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,11 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="tooltipSubviewID">
- <h:form>
-
<h:messages></h:messages>
<h:outputText value="DEFAULT VALUE:"></h:outputText>
@@ -53,7 +51,7 @@
</f:verbatim>
<rich:panel style="width:50px; height:50px; background-color: gray">
- <rich:toolTip id="tooltipID" value="#{tooltip.value}" mode="#{tooltip.mode}" showDelay="#{tooltip.showDelay}" hideDelay="#{tooltip.hideDelay}"
+ <rich:toolTip id="tooltipID" value="#{tooltip.value}" mode="#{tooltip.mode}"
layout="#{tooltip.layout}" horizontalOffset="#{tooltip.horizontalOffset}" verticalOffset="#{tooltip.verticalOffset}"
followMouse="#{tooltip.followMouse}" direction="#{tooltip.direction}" style="#{tooltip.style}" disabled="#{tooltip.disabled}"
rendered="#{tooltip.rendered}" onclick="print('onclickInputID', 'onclick work!')"
@@ -71,5 +69,4 @@
<br />
</f:verbatim>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,9 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
-<f:subview id="toolTipPropertySubviewID">
+<f:subview id="toolTipStraightforwardSubviewID">
<rich:simpleTogglePanel id="toolTipPropertyID" switchType="client" opened="true" label="toolTip property">
<h:panelGrid columns="2">
<h:outputText value="Text:"></h:outputText>
@@ -11,16 +11,11 @@
<a4j:support event="onchange" reRender="tooltipID" />
</h:inputText>
- <h:outputText value="showDelay"></h:outputText>
- <h:inputText value="#{tooltip.showDelay}">
+ <h:outputText value="Delay"></h:outputText>
+ <h:inputText value="#{tooltip.delay}">
<a4j:support event="onchange" reRender="tooltipID" />
</h:inputText>
- <h:outputText value="hideDelay"></h:outputText>
- <h:inputText value="#{tooltip.hideDelay}">
- <a4j:support event="onchange" reRender="tooltipID" />
- </h:inputText>
-
<h:outputText value="Layout:"></h:outputText>
<h:selectOneRadio value="#{tooltip.layout}">
<f:selectItem itemLabel="inline" itemValue="inline" />
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipStraightforward.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipStraightforward.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipStraightforward.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,25 +1,30 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
-<f:subview id="toolTipStraightforwardSubviewID">
+<f:subview id="toolTipPropertySubviewID">
<rich:simpleTogglePanel id="toolTipStraightforwardID" switchType="client" opened="true" label="toolTip straightforward">
- <h:panelGrid columns="2">
+ <h:panelGrid columns="3">
<h:outputText value="Test1" />
<a4j:commandButton action="#{tooltip.bTest1}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton>
+ <h:outputText value="#{msg.t1Tooltip}"/>
<h:outputText value="Test2" />
<a4j:commandButton action="#{tooltip.bTest2}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton>
+ <h:outputText value="#{msg.t2Tooltip}"/>
<h:outputText value="Test3" />
<a4j:commandButton action="#{tooltip.bTest3}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton>
+ <h:outputText value="#{msg.t3Tooltip}"/>
<h:outputText value="Test4" />
<a4j:commandButton action="#{tooltip.bTest4}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton>
+ <h:outputText value="#{msg.t4Tooltip}"/>
<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/jsp/src/main/webapp/Tree/Tree.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Tree/Tree.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Tree/Tree.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,10 +1,9 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="treeSubviewID">
- <h:form>
<a4j:outputPanel ajaxRendered="true">
<h:messages />
</a4j:outputPanel>
@@ -13,6 +12,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!')"
@@ -20,10 +22,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}" />
@@ -112,5 +111,4 @@
</rich:tree>
<rich:spacer></rich:spacer>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="treePropertySubviewID">
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,27 +1,20 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="virtualEarthSubviewID">
- <h:form>
<h:panelGrid columns="2">
- <rich:virtualEarth style="width:800px;" id="gm" lat="37.97" dashboardSize="Normal" zoom="#{virtualEarth.zoom}"
+ <rich:virtualEarth style="width:800px;" version="#{virtualEarth.version}" id="gm" lat="37.97" dashboardSize="Normal" zoom="#{virtualEarth.zoom}"
mapStyle="Hybrid" var="map" onclick="print('onclickInputID', 'onclick work!')"
ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')"
onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')"
- onLoadMap="print('onLoadMapInputID', 'onLoadMap work!')" onmousedown="print('onmousedownInputID', 'onmousedown 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!')"/>
</h:panelGrid>
- <a4j:outputPanel id="zoomer">
- <script>
- function zoomIt() {
- map.setZoom(#{virtualEarth.zoom});
- }
- </script>
- </a4j:outputPanel>
+
<a4j:outputPanel>
<script>
function createMarker(point,html) {
@@ -43,5 +36,4 @@
}
</script>
</a4j:outputPanel>
- </h:form>
</f:subview>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="virtualEarthPropertySubviewID">
<h:panelGroup>
Added: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ComponentControl.xml
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ComponentControl.xml (rev 0)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ComponentControl.xml 2007-12-11 13:24:41 UTC (rev 4698)
@@ -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>componentControl</managed-bean-name>
+ <managed-bean-class>componentControl.ComponentControl</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Added: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml (rev 0)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml 2007-12-11 13:24:41 UTC (rev 4698)
@@ -0,0 +1,13 @@
+<?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>
+ <converter>
+ <converter-id>listShuttleConverter</converter-id>
+ <converter-class>util.converter.ListShuttleConverter</converter-class>
+ </converter>
+ <converter>
+ <converter-id>orderingListConverter</converter-id>
+ <converter-class>util.converter.OrderingListConverter</converter-class>
+ </converter>
+</faces-config>
Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataOrderedList.xml
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataOrderedList.xml 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataOrderedList.xml 2007-12-11 13:24:41 UTC (rev 4698)
@@ -2,9 +2,9 @@
<!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>
+ <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/jsp/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-12-11 13:24:41 UTC (rev 4698)
@@ -5,34 +5,22 @@
<navigation-rule>
<from-view-id>/pages/main.jsp</from-view-id>
<navigation-case>
- <from-outcome>Suggest</from-outcome>
- <to-view-id>/SuggestionBox/SuggestionBox.jsp</to-view-id>
+ <from-outcome>TestDiv</from-outcome>
+ <to-view-id>/pages/Div/Div.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>Spinner</from-outcome>
<to-view-id>/InputNumberSpinner/InputNumberSpinner.jsp</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>Slider</from-outcome>
- <to-view-id>/InputNumberSlider/InputNumberSlider.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
<from-outcome>Panel</from-outcome>
<to-view-id>/Panel/Panel.jsp</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>PanelBar</from-outcome>
- <to-view-id>/PanelBar/PanelBar.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>Separator</from-outcome>
+ <from-outcome>Separ</from-outcome>
<to-view-id>/Separator/Separator.jsp</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>Paint2D</from-outcome>
- <to-view-id>/Paint2D/Paint2D.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
<from-outcome>Spacer</from-outcome>
<to-view-id>/Spacer/Spacer.jsp</to-view-id>
</navigation-case>
@@ -45,46 +33,62 @@
<to-view-id>/TabPanel/TabPanel.jsp</to-view-id>
</navigation-case>
<navigation-case>
+ <from-outcome>Suggest</from-outcome>
+ <to-view-id>/SuggestionBox/SuggestionBox.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>Paint</from-outcome>
+ <to-view-id>/Paint2D/Paint2D.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
<from-outcome>Tree</from-outcome>
<to-view-id>/Tree/Tree.jsp</to-view-id>
</navigation-case>
<navigation-case>
+ <from-outcome>Slide</from-outcome>
+ <to-view-id>/InputNumberSlider/InputNumberSlider.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>PanelBar</from-outcome>
+ <to-view-id>/PanelBar/PanelBar.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
<from-outcome>TogglePanel</from-outcome>
<to-view-id>/TogglePanel/TogglePanel.jsp</to-view-id>
</navigation-case>
<navigation-case>
+ <from-outcome>Gmap</from-outcome>
+ <to-view-id>/Gmap/Gmap.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
<from-outcome>ToolBar</from-outcome>
<to-view-id>/ToolBar/ToolBar.jsp</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>DnD</from-outcome>
+ <from-outcome>dnd</from-outcome>
<to-view-id>/DragAndDrop/DragAndDrop.jsp</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>MP</from-outcome>
- <to-view-id>/ModalPanel/ModalPanel.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
<from-outcome>DS</from-outcome>
<to-view-id>/DataScroller/DataScroller.jsp</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>DT</from-outcome>
- <to-view-id>/DataTable/DataTable.jsp</to-view-id>
+ <from-outcome>DDMenu</from-outcome>
+ <to-view-id>/DropDownMenu/DropDownMenu.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>DFS</from-outcome>
<to-view-id>/DataFilterSlider/DataFilterSlider.jsp</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>DDM</from-outcome>
- <to-view-id>/DropDownMenu/DropDownMenu.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
<from-outcome>PanelMenu</from-outcome>
<to-view-id>/PanelMenu/PanelMenu.jsp</to-view-id>
</navigation-case>
<navigation-case>
+ <from-outcome>ModalPanel</from-outcome>
+ <to-view-id>/ModalPanel/ModalPanel.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
<from-outcome>Tooltip</from-outcome>
<to-view-id>/Tooltip/Tooltip.jsp</to-view-id>
</navigation-case>
@@ -93,10 +97,6 @@
<to-view-id>/Calendar/Calendar.jsp</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>Gmap</from-outcome>
- <to-view-id>/Gmap/Gmap.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
<from-outcome>Message</from-outcome>
<to-view-id>/Message/Message.jsp</to-view-id>
</navigation-case>
@@ -113,11 +113,11 @@
<to-view-id>/Insert/Insert.jsp</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>TestDiv</from-outcome>
- <to-view-id>/pages/Div/Div.jsp</to-view-id>
+ <from-outcome>SDT</from-outcome>
+ <to-view-id>/ScrollableDataTable/ScrollableDataTable.jsp</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>RichTest</from-outcome>
+ <from-outcome>RichFaces</from-outcome>
<to-view-id>/pages/Rich/Rich.jsp</to-view-id>
</navigation-case>
<navigation-case>
@@ -128,12 +128,9 @@
<from-outcome>CustomizePage</from-outcome>
<to-view-id>/CustomizePage/CustomizePage.jsp</to-view-id>
</navigation-case>
- </navigation-rule>
- <navigation-rule>
- <from-view-id>*</from-view-id>
<navigation-case>
- <from-outcome>main</from-outcome>
- <to-view-id>/pages/main.jsp</to-view-id>
+ <from-outcome>jQuery</from-outcome>
+ <to-view-id>/jQuery/jQuery.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
@@ -144,12 +141,24 @@
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/Panel/Panel2.jsp</from-view-id>
+ <from-view-id>/Panel/panel2.jsp</from-view-id>
<navigation-case>
<from-outcome>BackP</from-outcome>
<to-view-id>/Panel/Panel.jsp</to-view-id>
</navigation-case>
</navigation-rule>
+ <navigation-rule>
+ <from-view-id>*</from-view-id>
+ <navigation-case>
+ <from-outcome>main</from-outcome>
+ <to-view-id>/pages/main.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <application>
+ <locale-config>
+ <default-locale>en</default-locale>
+ </locale-config>
+ </application>
<lifecycle>
<phase-listener id="phaseTracker">util.phaseTracker.PhaseTracker</phase-listener>
</lifecycle>
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-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-12-11 13:24:41 UTC (rev 4698)
@@ -13,18 +13,20 @@
<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,/WEB-INF/faces-config-DataOrderedList.xml,
- /WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.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-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,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,
+ /WEB-INF/faces-config-ComponentControl.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/Rich/Rich.jsp
===================================================================
--- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2007-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,3 +1,4 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
@@ -2,45 +3,59 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
+<html>
<f:view>
-<html>
-<head>
-<title></title>
+ <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;
- newObject.value = value;
- newObject.id = oldObject.id;
- //if(oldObject.size) newObject.size = oldObject.size;
- //if(oldObject.value) newObject.value = value;
- //if(oldObject.id) newObject.id = oldObject.id;
- //if(oldObject.name) newObject.name = oldObject.name;
- //if(oldObject.className) newObject.className = oldObject.className;
+ if(oldObject.type) newObject.type = "text";
+ if(oldObject.size) newObject.size = oldObject.size;
+ if(oldObject.value) newObject.value = value;
+ if(oldObject.id) newObject.id = oldObject.id;
oldObject.parentNode.replaceChild(newObject,oldObject);
}
</script>
-<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" />
-</head>
-<body>
- <jsp:include page="/pages/RichMenu/RichMenu.jsp" />
- <jsp:include page="${richBean.pathComponent}" />
+ <link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" />
+ </head>
+ <body>
+ <div id="divOpthID" align="right" style="z-index: 200">
+ <jsp:include page="/pages/RichMenu/RichMenu.jsp" />
+ </div>
<h:form>
- <jsp:include page="${richBean.pathStraightforward}" />
- <jsp:include page="${richBean.pathProperty}" />
+ <h:panelGrid id="richGridID" columns="1">
+ <h:column rendered="#{richBean.reComponent}">
+ <jsp:include page="${richBean.pathComponent}" />
+ </h:column>
+ <h:column rendered="#{!richBean.reComponent}"></h:column>
+
+ <h:column rendered="#{richBean.reStraightforward}">
+ <jsp:include page="${richBean.pathStraightforward}" />
+ </h:column>
+ <h:column rendered="#{!richBean.reStraightforward}"></h:column>
+
+ <h:column rendered="#{richBean.reProperty}">
+ <jsp:include page="${richBean.pathProperty}" />
+ </h:column>
+ <h:column rendered="#{!richBean.reProperty}"></h:column>
+ </h:panelGrid>
</h:form>
- <rich:modalPanel id="eventInfoID" minHeight="550" minWidth="200" moveable="true" resizeable="true" style="overflow: true;">
+ <rich:modalPanel id="eventInfoID" autosized="true" minHeight="550" minWidth="200" moveable="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');"/>
+ <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');" />
</f:facet>
-
+
<jsp:include page="/pages/Action/EventInfo.jsp" />
- </rich:modalPanel>
+ </rich:modalPanel>
<a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton>
-</body>
+ </body>
+</f:view>
</html>
-</f:view>
\ No newline at end of file
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-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -1,24 +1,40 @@
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<f:subview id="richMenuID">
- <h:form id="forvDivOpthID">
- <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>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
- <rich:toolBarGroup location="right">
- <h:panelGrid columns="1">
- <h:outputText value="Select component:" />
- <h:selectOneMenu value="#{richBean.src}" onchange="submit();">
+<h:form id="forvDivOpthID">
+ <h:panelGrid columns="4" border="1">
+ <h:column>
+ <a4j:status startText="WORK!" startStyle="color: red;" stopText="a4j:status"></a4j:status>
+ </h:column>
+ <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>
+
+ <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="ComponentControl" itemLabel="ComponentControl" />
<f:selectItem itemValue="OrderingList" itemLabel="OrderingList" />
<f:selectItem itemValue="ListShuttle" itemLabel="ListShuttle" />
<f:selectItem itemValue="ContextMenu" itemLabel="ContextMenu" />
@@ -54,10 +70,8 @@
<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:commandLink value="Back" action="main"></h:commandLink>
- </h:form>
-</f:subview>
\ No newline at end of file
+ </h:selectOneMenu>
+ </h:panelGrid>
+ </h:panelGrid>
+ <h:commandLink value="Back" action="main"></h:commandLink>
+</h:form>
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-12-11 13:05:02 UTC (rev 4697)
+++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-12-11 13:24:41 UTC (rev 4698)
@@ -18,7 +18,7 @@
<rich:spacer></rich:spacer>
<rich:panel>
<h:panelGrid columns="2" cellpadding="5px" cellspacing="5px">
- <h:commandLink value="RichFaces" action="RichTest"></h:commandLink>
+ <h:commandLink value="RichFaces" action="RichFaces"></h:commandLink>
<h:commandLink value="Div" action="TestDiv"></h:commandLink>
<h:commandLink value="Select" action="Map"></h:commandLink>
<h:commandLink value="Customize page" action="CustomizePage"></h:commandLink>
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4697 - trunk/ui/dataTable/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-11 08:05:02 -0500 (Tue, 11 Dec 2007)
New Revision: 4697
Modified:
trunk/ui/dataTable/src/main/config/component/colgroup.xml
Log:
http://jira.jboss.com/jira/browse/RF-1553
Modified: trunk/ui/dataTable/src/main/config/component/colgroup.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/colgroup.xml 2007-12-11 13:02:35 UTC (rev 4696)
+++ trunk/ui/dataTable/src/main/config/component/colgroup.xml 2007-12-11 13:05:02 UTC (rev 4697)
@@ -30,11 +30,6 @@
&ui_component_attributes;
&html_universal_attributes;
<property>
- <name>breakBefore</name>
- <classname>boolean</classname>
- <description>if "true" next column begins from the first row</description>
- </property>
- <property>
<name>columnClasses</name>
<classname>java.lang.String</classname>
<description>
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4696 - branches/3.1.x/ui/dataTable/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-11 08:02:35 -0500 (Tue, 11 Dec 2007)
New Revision: 4696
Modified:
branches/3.1.x/ui/dataTable/src/main/config/component/colgroup.xml
Log:
http://jira.jboss.com/jira/browse/RF-1553
Modified: branches/3.1.x/ui/dataTable/src/main/config/component/colgroup.xml
===================================================================
--- branches/3.1.x/ui/dataTable/src/main/config/component/colgroup.xml 2007-12-11 12:57:00 UTC (rev 4695)
+++ branches/3.1.x/ui/dataTable/src/main/config/component/colgroup.xml 2007-12-11 13:02:35 UTC (rev 4696)
@@ -30,11 +30,6 @@
&ui_component_attributes;
&html_universal_attributes;
<property>
- <name>breakBefore</name>
- <classname>java.lang.String</classname>
- <description>if "true" next column begins from the first row</description>
- </property>
- <property>
<name>columnClasses</name>
<classname>java.lang.String</classname>
<description>
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4695 - in trunk/sandbox/ui/columns/src/main: java/org/richfaces/iterator and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2007-12-11 07:57:00 -0500 (Tue, 11 Dec 2007)
New Revision: 4695
Modified:
trunk/sandbox/ui/columns/src/main/config/component/columns.xml
trunk/sandbox/ui/columns/src/main/java/org/richfaces/iterator/SimpleForEachIterator.java
trunk/sandbox/ui/columns/src/main/java/org/richfaces/tag/AbstractColumnsTag.java
trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java
Log:
RF-1201 add end attribute
Modified: trunk/sandbox/ui/columns/src/main/config/component/columns.xml
===================================================================
--- trunk/sandbox/ui/columns/src/main/config/component/columns.xml 2007-12-11 12:53:38 UTC (rev 4694)
+++ trunk/sandbox/ui/columns/src/main/config/component/columns.xml 2007-12-11 12:57:00 UTC (rev 4695)
@@ -61,6 +61,13 @@
The first iteration item
</description>
</property>
+ <property>
+ <name>end</name>
+ <classname>java.lang.Object</classname>
+ <description>
+ The last iteration item
+ </description>
+ </property>
<property disabled="true">
<name>header</name>
</property>
Modified: trunk/sandbox/ui/columns/src/main/java/org/richfaces/iterator/SimpleForEachIterator.java
===================================================================
--- trunk/sandbox/ui/columns/src/main/java/org/richfaces/iterator/SimpleForEachIterator.java 2007-12-11 12:53:38 UTC (rev 4694)
+++ trunk/sandbox/ui/columns/src/main/java/org/richfaces/iterator/SimpleForEachIterator.java 2007-12-11 12:57:00 UTC (rev 4695)
@@ -6,6 +6,7 @@
package org.richfaces.iterator;
+import java.io.Serializable;
import java.util.Arrays;
import java.util.Collection;
import java.util.Enumeration;
@@ -21,7 +22,7 @@
* @author "Andrey Markavtsov"
*
*/
-public class SimpleForEachIterator implements ForEachIterator {
+public class SimpleForEachIterator implements ForEachIterator, Serializable {
private Iterator i;
Modified: trunk/sandbox/ui/columns/src/main/java/org/richfaces/tag/AbstractColumnsTag.java
===================================================================
--- trunk/sandbox/ui/columns/src/main/java/org/richfaces/tag/AbstractColumnsTag.java 2007-12-11 12:53:38 UTC (rev 4694)
+++ trunk/sandbox/ui/columns/src/main/java/org/richfaces/tag/AbstractColumnsTag.java 2007-12-11 12:57:00 UTC (rev 4695)
@@ -75,6 +75,9 @@
/** Begin attribute - defines the first iteration item */
private ValueExpression begin;
+ /** Begin attribute - defines the last iteration item */
+ private ValueExpression end;
+
/** Index attr - defines page variable for current column counter */
private ValueExpression _index;
@@ -87,6 +90,9 @@
/** Integer value of begin attr. */
private Integer _begin;
+ /** Integer value of end attr. */
+ private Integer _end;
+
/** String value of var attr */
private String itemId = null;
@@ -771,6 +777,25 @@
}
/**
+ * Extracts string value from index attr
+ */
+ private void initEnd() {
+ _end = 0;
+ if (end != null) {
+ try {
+ String t = (String) end.getValue(getELContext());
+ _end = Integer.parseInt(t);
+ if (_end < 0) {
+ _end = 0;
+ }
+ } catch (ClassCastException e) {
+ _end = 0;
+ }
+
+ }
+ }
+
+ /**
* Extracts tags attributes values
*/
private void initVariables() {
@@ -778,6 +803,7 @@
initIndex();
initVar();
initBegin();
+ initEnd();
}
/**
@@ -787,7 +813,11 @@
* @throws JspTagException
*/
private boolean hasNext() throws JspTagException {
- return items.hasNext();
+ if (_end != 0) {
+ return (index < (_end - 1)) ? items.hasNext() : false;
+ } else {
+ return items.hasNext();
+ }
}
/**
@@ -939,8 +969,8 @@
private void correctFirst() {
try {
if (items != null) {
- if (_begin > 0 && (index < (_begin-1))) {
- while ((index < (_begin -1)) && hasNext()) {
+ if (_begin > 0 && (index < (_begin - 1))) {
+ while ((index < (_begin - 1)) && hasNext()) {
next();
}
}
@@ -1038,6 +1068,21 @@
this._index = index;
}
+ /**
+ * @return the end
+ */
+ public ValueExpression getEnd() {
+ return end;
+ }
+
+ /**
+ * @param end
+ * the end to set
+ */
+ public void setEnd(ValueExpression end) {
+ this.end = end;
+ }
+
}
class TypedCollections {
Modified: trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java
===================================================================
--- trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java 2007-12-11 12:53:38 UTC (rev 4694)
+++ trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java 2007-12-11 12:57:00 UTC (rev 4695)
@@ -22,6 +22,7 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;
import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.PageContext;
import org.richfaces.iterator.ForEachIterator;
import org.richfaces.iterator.SimpleForEachIterator;
@@ -44,7 +45,7 @@
/** end attribute */
private TagAttribute columns;
-
+
/** begin attribute */
private TagAttribute begin;
@@ -54,6 +55,9 @@
/** index attribute */
private TagAttribute index;
+ /** end attribute */
+ private TagAttribute end;
+
/** Iterator for columns's tag value attribute */
protected ForEachIterator items; // our 'digested' items
@@ -62,10 +66,13 @@
/** Var attr - defines page variable for current item */
private String _indexId;
-
- /** Integer value begin attr*/
+
+ /** Integer value begin attr */
private Integer _begin;
+ /** Integer value end attr */
+ private Integer _end;
+
/** Integer value of end attr. */
private Integer _columns;
@@ -102,6 +109,7 @@
initIndex(ctx);
initVar(ctx);
initBegin(ctx);
+ initEnd(ctx);
}
/**
@@ -114,7 +122,7 @@
initVariables(ctx);
try {
-
+
this.value = getAttribute("value");
// produce the right sort of ForEachIterator
@@ -129,29 +137,29 @@
.supportedTypeForEachIterator(rawItems);
} else {
// no 'items', so use 'begin' and 'end'
- items = SimpleForEachIterator.beginEndForEachIterator(_columns - 1);
+ items = SimpleForEachIterator
+ .beginEndForEachIterator(_columns - 1);
}
} catch (Exception e) {
// TODO: handle exception
}
-
+
correctFirst(ctx);
-
+
if (hasNext()) {
exposeVariables(ctx, 0);
next(ctx);
}
}
-
-
+
/**
* Inits first iteration item
*/
private void correctFirst(FaceletContext ctx) {
if (items != null) {
if (_begin > 0 && (_index < _begin)) {
- while ( (_index < _begin) && hasNext()) {
+ while ((_index < _begin) && hasNext()) {
next(ctx);
}
}
@@ -166,7 +174,11 @@
*/
private boolean hasNext() {
try {
- return items.hasNext();
+ if (_end != 0) {
+ return (_index < _end) ? items.hasNext() : false;
+ } else {
+ return items.hasNext();
+ }
} catch (Exception e) {
return false;
}
@@ -196,7 +208,7 @@
this.columns = getAttribute("columns");
if (columns != null) {
try {
- _columns = Integer.parseInt((String)columns.getObject(ctx));
+ _columns = Integer.parseInt((String) columns.getObject(ctx));
if (_columns < 0) {
_columns = 0; // If end is negative set up zero
}
@@ -207,17 +219,16 @@
_columns = 0;
}
}
-
-
+
/**
- * Extracts integer value from end attr
+ * Extracts integer value from begin attr
*/
private void initBegin(FaceletContext ctx) {
this.begin = getAttribute("begin");
if (begin != null) {
try {
- _begin = Integer.parseInt((String)begin.getObject(ctx));
- _begin--; // - 1
+ _begin = Integer.parseInt((String) begin.getObject(ctx));
+ _begin--; // - 1
if (_begin < 0) {
_begin = 0; // If end is negative set up zero
}
@@ -230,6 +241,25 @@
}
/**
+ * Extracts integer value from end attr
+ */
+ private void initEnd(FaceletContext ctx) {
+ this.end = getAttribute("end");
+ if (end != null) {
+ try {
+ _end = Integer.parseInt((String) end.getObject(ctx));
+ if (_end < 0) {
+ _end = 0; // If end is negative set up zero
+ }
+ } catch (Exception e) {
+ _end = 0;
+ }
+ } else {
+ _end = 0;
+ }
+ }
+
+ /**
* Extracts string value from var attr
*/
private void initVar(FaceletContext ctx) {
@@ -315,7 +345,8 @@
if (value != null) {
ValueExpression srcVE = value.getValueExpression(ctx,
Object.class);
- ValueExpression ve = getVarExpression(ctx, srcVE, k + _begin);
+ ValueExpression ve = getVarExpression(ctx, srcVE, k
+ + _begin);
vm.setVariable(_itemId, ve);
}
}
@@ -335,6 +366,23 @@
}
/**
+ * Removes page attributes that we have exposed and, if applicable, restores
+ * them to their prior values (and scopes).
+ */
+ private void unExposeVariables(FaceletContext ctx) {
+ VariableMapper vm = ctx.getVariableMapper();
+ // "nested" variables are now simply removed
+ if (_itemId != null) {
+ if (vm != null)
+ vm.setVariable(_itemId, null);
+ }
+ if (_indexId != null) {
+ if (vm != null)
+ vm.setVariable(_indexId, null);
+ }
+ }
+
+ /**
* Return expression for page variables
*
* @param expr
@@ -396,6 +444,7 @@
if ((vCounter == (_index - _begin)) || atFirst()) {
release();
+ unExposeVariables(ctx);
return;
}
@@ -430,7 +479,7 @@
* @author Kin-man Chung
* @version $Id: IteratedExpression.java,v 1.3 2005/12/08 01:20:43 kchung Exp $
*/
-final class IteratedExpression implements Serializable{
+final class IteratedExpression implements Serializable {
private static final long serialVersionUID = 1L;
protected final ValueExpression orig;
@@ -521,8 +570,8 @@
* @version $Id: IteratedValueExpression.java,v 1.2 2005/12/08 01:20:43 kchung
* Exp $
*/
-final class IteratedValueExpression extends ValueExpression
-implements Serializable{
+final class IteratedValueExpression extends ValueExpression implements
+ Serializable {
private static final long serialVersionUID = 1L;
protected final int i;
@@ -574,8 +623,8 @@
* @version $Id: IteratedIndexExpression.java,v 1.2 2007/12/06 01:20:43
*
*/
-final class IteratedIndexExpression extends ValueExpression
-implements Serializable{
+final class IteratedIndexExpression extends ValueExpression implements
+ Serializable {
private static final long serialVersionUID = 1L;
protected final Integer i;
@@ -624,8 +673,8 @@
* @author Jacob Hookom
* @version $Id: IndexedValueExpression.java,v 1.3 2005/08/24 04:38:52 jhook Exp $
*/
-final class IndexedValueExpression extends ValueExpression
-implements Serializable{
+final class IndexedValueExpression extends ValueExpression implements
+ Serializable {
/**
*
16 years, 10 months
- 1
- 0