October 2007 - richfaces-svn-commits

JBoss Rich Faces SVN: r3466 - trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script.

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

Author: sergeyhalipov Date: 2007-10-22 10:38:03 -0400 (Mon, 22 Oct 2007) New Revision: 3466 Modified: trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js Log: http://jira.jboss.com/jira/browse/RF-1113 Modified: trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js =================================================================== --- trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2007-10-22 14:27:45 UTC (rev 3465) +++ trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2007-10-22 14:38:03 UTC (rev 3466) @@ -95,7 +95,7 @@ } this.initialized = true; - //this.setInitialValue(); + this.setInitialValue(); //Event.observe(window, "load", this.setInitialValue.bindAsEventListener(this)); //FIX RFA-190 //Event.observe($(input), "propertychange", this.setInitialValue.bindAsEventListener(this));

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r3465 - in trunk/ui/simpleTogglePanel/src/main: templates and 1 other directory.

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

Author: akushunin Date: 2007-10-22 10:27:45 -0400 (Mon, 22 Oct 2007) New Revision: 3465 Modified: trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx Log: RF-1120 Modified: trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js =================================================================== --- trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js 2007-10-22 12:55:14 UTC (rev 3464) +++ trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js 2007-10-22 14:27:45 UTC (rev 3465) @@ -11,19 +11,22 @@ this.status="true"; } - this.timer = setTimeout(this.windowOnLoad.bind(this), 100); +// this.timer = setTimeout(this.windowOnLoad.bind(this), 100); }, - windowOnLoad: function(){ +/* windowOnLoad: function(){ if (RichFaces.navigatorType() == "MSIE"){ var body = $(this.panelId+"_body"); - if (body && body.style.display!="none") body.firstChild.style.width=body.clientWidth; + if (body && body.style.display!="none") body.firstChild.style.width=body.clientWidth; +*/ + /* if ($(this.panelId_head).clientWidth<$(this.panelId).clientWidth){ $(this.panelId_head).style.width=$(this.panelId).clientWidth-2+"px"; - }*/ + } } }, +*/ toggleToState: function() { var body = $(this.panelId+"_body"); @@ -34,7 +37,7 @@ this.status="true"; switch_off.style.display="none"; switch_on.style.display=""; - this.timer = setTimeout(this.windowOnLoad.bind(this), 100); +// this.timer = setTimeout(this.windowOnLoad.bind(this), 100); // body.firstChild.style.width=body.clientWidth; } else { Element.hide(body); Modified: trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx =================================================================== --- trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-10-22 12:55:14 UTC (rev 3464) +++ trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-10-22 14:27:45 UTC (rev 3465) @@ -87,17 +87,13 @@ <f:call name="utils.encodeEndFormIfNessesary"/> <div id="#{clientId}_body" + class="dr-stglpnl-b rich-stglpanel-body #{component.attributes['bodyClass']}" style="display : #{this:getdivdisplay(context, component)}; - height: #{component.attributes['height']}; width: 100%;"> - <table cellpadding="0" style="width: 100%" > - <tr> - <td class="dr-stglpnl-b rich-stglpanel-body #{component.attributes['bodyClass']}"> + height: #{component.attributes['height']};"> + <vcp:body> <f:call name="renderChildren" /> </vcp:body> - </td> - </tr> - </table> </div> </div>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r3464 - in branches/3.1.x/test-applications/jsp/src/main: java/calendar and 42 other directories.

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

Author: ayanul Date: 2007-10-22 08:55:14 -0400 (Mon, 22 Oct 2007) New Revision: 3464 Added: branches/3.1.x/test-applications/jsp/src/main/java/jQuery/ branches/3.1.x/test-applications/jsp/src/main/java/jQuery/JQuery.java branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java branches/3.1.x/test-applications/jsp/src/main/java/util/ branches/3.1.x/test-applications/jsp/src/main/java/util/componentInfo/ 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/phaseTracker/ 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/skins/ branches/3.1.x/test-applications/jsp/src/main/java/util/skins/Skins.java branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/ branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Div/ branches/3.1.x/test-applications/jsp/src/main/webapp/Div/Div.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/RichTest/ branches/3.1.x/test-applications/jsp/src/main/webapp/RichTest/Rich.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Select/ branches/3.1.x/test-applications/jsp/src/main/webapp/Select/Map.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Select/SelectOneMenuPage.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichBean.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ScrollableDataTable.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-jQuery.xml branches/3.1.x/test-applications/jsp/src/main/webapp/jQuery/ branches/3.1.x/test-applications/jsp/src/main/webapp/jQuery/jQuery.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div/ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div/Div.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Rich/ 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/ 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/Select/ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/Map.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/SelectOneMenuPage.jsp 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/CalendarDataModelImpl.java branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java branches/3.1.x/test-applications/jsp/src/main/java/dataScroller/Data.java branches/3.1.x/test-applications/jsp/src/main/java/dataTable/Data.java branches/3.1.x/test-applications/jsp/src/main/java/dataTable/DataTable.java branches/3.1.x/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java branches/3.1.x/test-applications/jsp/src/main/java/effect/Effect.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/modalPanel/ModalPanel.java branches/3.1.x/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java branches/3.1.x/test-applications/jsp/src/main/java/sb/Sb.java branches/3.1.x/test-applications/jsp/src/main/java/spacer/Spacer.java branches/3.1.x/test-applications/jsp/src/main/java/tabPanel/TabPanel.java branches/3.1.x/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java branches/3.1.x/test-applications/jsp/src/main/java/toolBar/ToolBar.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/webapp/Calendar/Calendar.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DT.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Effect/Effect.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Skin.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/main.jsp Log: 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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -21,7 +21,6 @@ package calendar; -import java.lang.reflect.Array; import java.text.DateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -30,21 +29,19 @@ import java.util.StringTokenizer; import java.util.TimeZone; -import javax.faces.component.UIComponent; import javax.faces.event.ValueChangeEvent; -import javax.faces.webapp.UIComponentTag; import org.richfaces.event.CurrentDateChangeEvent; 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[] { "Monday", - "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "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 [] 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 +" }; @@ -73,7 +70,6 @@ private String boundary; private String icon; private String toolTipMode; - private String scrollMode; private String label; private String timeZone; private int zindex; @@ -123,13 +119,6 @@ this.pattern = pattern; } - public void selectPattern(ValueChangeEvent event) { - String tPatern = (String) event.getNewValue(); - if (tPatern != null) { - pattern = tPatern; - } - } - public CalendarBean() { height = "400px"; width = "400px"; @@ -149,12 +138,11 @@ rendered = true; zindex = 2; toolTipMode = "none"; - scrollMode = "client"; required = false; - weekDay = "none"; + weekDay = "long"; month = "none"; timeZone = "Eastern European Time"; - preloadDateRangeBegin = "10.09.2007"; + preloadDateRangeBegin = "10.08.2007"; //d.m.y preloadDateRangeEnd = "11.10.2007"; } @@ -166,9 +154,8 @@ date.add(Integer.parseInt(st.nextToken())); } cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0); - System.out.println(cal.getTime()); + System.out.println("prBegin " + cal.getTime()); return cal.getTime(); - } public Date getPrDateRangeEnd() { @@ -179,7 +166,7 @@ date.add(Integer.parseInt(st.nextToken())); } cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0); - System.out.println(cal.getTime()); + System.out.println("prEnd " + cal.getTime()); return cal.getTime(); } @@ -207,19 +194,10 @@ this.readonly = readonly; } - public void selectLocale(ValueChangeEvent event) { - String tLocale = (String) event.getNewValue(); - if (tLocale != null) { - String lang = tLocale.substring(0, 2); - String country = tLocale.substring(3); - locale = new Locale(lang, country, ""); - } - } - public Object getWeekDayLabels() { if(weekDay.equals("long")) return CalendarBean.WEEK_DAY; - else return null; + else return null; } public Object getWeekDayLabelsShort() { @@ -234,10 +212,6 @@ else return null; } - public void weekDay(ValueChangeEvent event) { - weekDay = (String) event.getNewValue(); - } - public Object getMonthLabelsShort() { if(month.equals("short")) return CalendarBean.MOUNT_LABELS_SHORT; @@ -245,9 +219,12 @@ } + public String getMonth() { + return month; + } - public void month(ValueChangeEvent event) { - month = (String) event.getNewValue(); + public void setMonth(String month) { + this.month = month; } public String getCurrentDateAsText() { @@ -284,9 +261,6 @@ this.jointPoint = jointPoint; } - public void selectJointPoint(ValueChangeEvent event) { - jointPoint = (String) event.getNewValue(); - } public String getDirection() { return direction; @@ -296,10 +270,6 @@ this.direction = direction; } - public void selectDirection(ValueChangeEvent event) { - direction = (String) event.getNewValue(); - } - public String getBoundary() { return boundary; } @@ -379,14 +349,6 @@ this.toolTipMode = toolTipMode; } - public String getScrollMode() { - return scrollMode; - } - - public void setScrollMode(String scrollMode) { - this.scrollMode = scrollMode; - } - public int getZindex() { return zindex; } @@ -442,4 +404,12 @@ public void setPreloadDateRangeEnd(String preloadDateRangeEnd) { this.preloadDateRangeEnd = preloadDateRangeEnd; } + + public String getWeekDay() { + return weekDay; + } + + public void setWeekDay(String weekDay) { + this.weekDay = weekDay; + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -22,10 +22,12 @@ package calendar; import java.text.DateFormat; +import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import java.util.Random; import org.richfaces.model.CalendarDataModel; import org.richfaces.model.CalendarDataModelItem; @@ -55,7 +57,6 @@ protected CalendarDataModelItem createDataModelItem(Date date) { CalendarDataModelItemImpl item = new CalendarDataModelItemImpl(); - item.setDate(date); Map data = new HashMap(); DateFormat enFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.ENGLISH); DateFormat frFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.FRENCH); @@ -63,8 +64,20 @@ data.put("enLabel", enFormatter.format(date)); data.put("frLabel", frFormatter.format(date)); data.put("deLabel", deFormatter.format(date)); + /*Calendar c = Calendar.getInstance(); + c.setTime(date); + item.setDay(c.get(Calendar.DAY_OF_MONTH));*/ + + if (new Random().nextInt(10) > 5) { + item.setEnabled(true); + } else { + item.setEnabled(false); + } + item.setData(data); - + + System.out.println(item.getData() + " " + item.isEnabled()); + return item; } @@ -73,12 +86,7 @@ */ public Object getToolTip(Date date) { - // TODO Auto-generated method stub return null; } - public int getDay() { - // TODO Auto-generated method stub - return 0; - } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -21,8 +21,6 @@ package calendar; -import java.util.Date; - import org.richfaces.model.CalendarDataModelItem; /** @@ -33,11 +31,20 @@ public class CalendarDataModelItemImpl implements CalendarDataModelItem { private Object data; - private Date date; private String styleClass; private Object toolTip; + private int day; private boolean enabled = true; + + public int getDay() { + return day; + } + + public void setDay(int day) { + this.day = day; + } + /* (non-Javadoc) * @see org.richfaces.component.CalendarDataModelItem#getData() */ @@ -46,13 +53,6 @@ } /* (non-Javadoc) - * @see org.richfaces.component.CalendarDataModelItem#getDate() - */ - public Date getDate() { - return date; - } - - /* (non-Javadoc) * @see org.richfaces.component.CalendarDataModelItem#getStyleClass() */ public String getStyleClass() { @@ -88,13 +88,6 @@ } /** - * @param date the date to set - */ - public void setDate(Date date) { - this.date = date; - } - - /** * @param styleClass the styleClass to set */ public void setStyleClass(String styleClass) { @@ -114,9 +107,5 @@ public void setEnabled(boolean enabled) { this.enabled = enabled; } - public int getDay() { - // TODO Auto-generated method stub - return 0; - } - + } 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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/dataScroller/Data.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -6,11 +6,18 @@ public String data0; public int data1; + public String data2; + public String data3; - public Data(String str,int a) { - this.data0 =str+"_"+a; - this.data1 = new Random().nextInt(10+a); + public Data(String data0, int data1) { + this.data0 = data0; + this.data1 = data1; + } + public Data(String data0, int data1, String data2, String data3) { + this(data0, data1); + this.data2 = data2; + this.data3 = data3; } public String getData0() { @@ -25,6 +32,22 @@ return data1; } + public String getData2() { + return data2; + } + + public void setData2(String data2) { + this.data2 = data2; + } + + public String getData3() { + return data3; + } + + public void setData3(String data3) { + this.data3 = data3; + } + public void setData1(int data1) { this.data1 = data1; } Modified: branches/3.1.x/test-applications/jsp/src/main/java/dataTable/Data.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/dataTable/Data.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/dataTable/Data.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -19,7 +19,6 @@ * */ public Data() { - // TODO Auto-generated constructor stub } /** Modified: branches/3.1.x/test-applications/jsp/src/main/java/dataTable/DataTable.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/dataTable/DataTable.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/dataTable/DataTable.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -13,7 +13,6 @@ private List mounths = new ArrayList(); private List numbers = new ArrayList(); private String align; - private String bgcolor; private String border; private String width; private String columnsWidth; @@ -22,7 +21,6 @@ public DataTable() { align = "center"; - bgcolor = "aqua"; border = "1"; width = "400px"; columnsWidth = "200px"; @@ -109,14 +107,6 @@ this.align = align; } - public String getBgcolor() { - return bgcolor; - } - - public void setBgcolor(String bgcolor) { - this.bgcolor = bgcolor; - } - public String getBorder() { return border; } Modified: branches/3.1.x/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -28,34 +28,14 @@ * @author $Autor$ * */ - - - public class DemoSliderBean { - private boolean manualInput; - private boolean onSlide; - private boolean storeResults; - private boolean trailer; - private String width; - private int increment; - private int handleValue; - private int startRange; - private int endRange; - + private boolean rendered; DemoInventoryList demoInventoryList; public DemoSliderBean() { - manualInput = true; - onSlide = true; - storeResults = true; - width="400px"; - startRange = 10000; - endRange = 60000; - increment = 10000; - trailer = true; - handleValue = 10000; + rendered = true; } - + public void setDemoInventoryList(DemoInventoryList demoInventoryList) { this.demoInventoryList = demoInventoryList; } @@ -69,4 +49,23 @@ } + public void doRendered() + { + if(rendered) + rendered = false; + else rendered = true; + } + + public String getRenderedName() { + if(rendered) return "Rendered on"; + else return "Rendered off"; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } } \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/java/effect/Effect.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/effect/Effect.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/effect/Effect.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -1,3 +1,24 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + package effect; public class Effect { @@ -35,4 +56,3 @@ this.state = state; } } - 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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -22,7 +22,6 @@ private boolean showBoundaryValues; public InputNumberSlider() { - // TODO Auto-generated constructor stub inputSize = 5; maxlength = 3; 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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -18,7 +18,6 @@ private boolean rendered; public InputNumberSpinner() { - // TODO Auto-generated constructor stub // size= "200"; inputSize = 2; cycled = false; Added: branches/3.1.x/test-applications/jsp/src/main/java/jQuery/JQuery.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/jQuery/JQuery.java (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/java/jQuery/JQuery.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,5 @@ +package jQuery; + +public class JQuery { + +} 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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -20,8 +20,6 @@ moveable=true; resizeable=true; - - // TODO Auto-generated constructor stub } public int getHeight() { Added: 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 (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,20 @@ +package rich; + +import java.util.ArrayList; + +public class RichBean { + + private String src; + + public RichBean() { + src = ""; + } + + public String getSrc() { + return src; + } + + public void setSrc(String src) { + this.src = src; + } +} Modified: branches/3.1.x/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -2,15 +2,14 @@ public class SimpleTogglePanel { - private String switchType; // "client", "server"(default), "ajax" - private String width; - private String height; + private String switchType; // "client", "server"(default), "ajax" + private String width; + private String height; - private boolean focus; - private boolean rendered; + private boolean focus; + private boolean rendered; public SimpleTogglePanel() { - // TODO Auto-generated constructor stub width = "75%"; height = "100%"; switchType = "server"; 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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/sb/Sb.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -50,7 +50,7 @@ frequency = "0"; rules = "none"; setCities(getAllData()); - // TODO Auto-generated constructor stub + } public List autocomplete(Object event) { Modified: branches/3.1.x/test-applications/jsp/src/main/java/spacer/Spacer.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/spacer/Spacer.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/spacer/Spacer.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -13,7 +13,6 @@ private boolean rendered; public Spacer() { - // TODO Auto-generated constructor stub height = "50px"; width = "300px"; Modified: branches/3.1.x/test-applications/jsp/src/main/java/tabPanel/TabPanel.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/tabPanel/TabPanel.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/tabPanel/TabPanel.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -23,8 +23,6 @@ private boolean disabledTab; public TabPanel() { - // TODO Auto-generated constructor stub - width="75%"; height="200px"; title="title goes here..."; Modified: branches/3.1.x/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -9,7 +9,6 @@ public TogglePanel() { - // TODO Auto-generated constructor stub initialState="asus"; switchType="server"; stateOrder="asus,benq,toshiba"; Modified: branches/3.1.x/test-applications/jsp/src/main/java/toolBar/ToolBar.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/toolBar/ToolBar.java 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/toolBar/ToolBar.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -22,7 +22,6 @@ location="left"; contentStyle=null; separatorStyle=null; - // TODO Auto-generated constructor stub } 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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/tooltip/Tooltip.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -14,6 +14,14 @@ private String style; private String layout; + public String getLayout() { + return layout; + } + + public void setLayout(String layout) { + this.layout = layout; + } + public Tooltip() { followMouse = false; rendered = true; @@ -23,6 +31,7 @@ direction = "top-right"; horizontalOffset = 0; verticalOffset = 0; + delay = 0; style = "none"; layout = "inline"; } @@ -107,12 +116,4 @@ this.delay = delay; } - public String getLayout() { - return layout; - } - - public void setLayout(String layout) { - this.layout = layout; - } - } 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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/java/tree/Bean.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -222,7 +222,6 @@ try { tree.queueNodeExpand(new ListRowKey(expandPath)); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } @@ -255,7 +254,6 @@ try { this.tree.queueExpandAll(); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } return null; Added: 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 (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,32 @@ +package util.componentInfo; + +public class ComponentInfo { + private String attribute; + private String property; + + public ComponentInfo() { + + } + + public ComponentInfo(String attribute, String property) { + this.attribute = attribute; + this.property = property; + System.out.println(); + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getProperty() { + return property; + } + + public void setProperty(String property) { + this.property = property; + } +} Added: 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 (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/java/util/phaseTracker/PhaseTracker.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,37 @@ +/** + * + */ +package util.phaseTracker; + +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; + +/** + * @author AYanul + * + */ +public class PhaseTracker implements PhaseListener { + + /* (non-Javadoc) + * @see javax.faces.event.PhaseListener#afterPhase(javax.faces.event.PhaseEvent) + */ + public void afterPhase(PhaseEvent arg0) { + System.out.println("PhaseTracker.afterPhase()" + arg0.getPhaseId()); + } + + /* (non-Javadoc) + * @see javax.faces.event.PhaseListener#beforePhase(javax.faces.event.PhaseEvent) + */ + public void beforePhase(PhaseEvent arg0) { + System.out.println("PhaseTracker.beforePhase()" + arg0.getPhaseId()); + } + + /* (non-Javadoc) + * @see javax.faces.event.PhaseListener#getPhaseId() + */ + public PhaseId getPhaseId() { + return PhaseId.ANY_PHASE; + } + +} Added: branches/3.1.x/test-applications/jsp/src/main/java/util/skins/Skins.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/util/skins/Skins.java (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/java/util/skins/Skins.java 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,71 @@ +package util.skins; + +import java.util.Map; + +import javax.faces.component.UIComponent; +import javax.faces.component.UISelectItem; +import javax.faces.component.UISelectOne; +import javax.faces.component.html.HtmlSelectOneRadio; +import javax.faces.context.FacesContext; + +/** + * @author Nick Belaevski - nbelaevski(a)exadel.com created 09.02.2007 + * + */ +public class Skins { + + private String[] skinsArray = new String[] { "blueSky", "classic", + "deepMarine", "DEFAULT", "emeraldTown", "japanCherry", "ruby", + "wine", "plain" }; + + private String defaultSkin = "blueSky"; + + private String skin = defaultSkin; + + private UISelectOne createComponent() { + UISelectOne selectOne = new HtmlSelectOneRadio(); + selectOne.setValue(skin); + + for (int i = 0; i < skinsArray.length; i++) { + String skinName = skinsArray[i]; + + UISelectItem item = new UISelectItem(); + item.setItemLabel(skinName); + item.setItemValue(skinName); + item.setId("skinSelectionFor_" + skinName); + + selectOne.getChildren().add(item); + } + + return selectOne; + } + + public String getSkin() { + return skin; + } + + public UIComponent getComponent() { + FacesContext facesContext = FacesContext.getCurrentInstance(); + Map requestMap = facesContext.getExternalContext().getRequestMap(); + Object object = requestMap.get("SkinBean"); + if (object != null) { + return (UISelectOne) object; + } + + UISelectOne selectOne = createComponent(); + requestMap.put("SkinBean", selectOne); + return selectOne; + } + + public void setComponent(UIComponent component) { + FacesContext facesContext = FacesContext.getCurrentInstance(); + Map requestMap = facesContext.getExternalContext().getRequestMap(); + requestMap.put("SkinBean", component); + } + + public String change() { + UISelectOne selectOne = (UISelectOne) getComponent(); + skin = (String) selectOne.getValue(); + return null; + } +} 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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -17,64 +17,79 @@ } </style> <h:form> - <rich:calendar id="calendarID" dataModel="#{calendarDataModel}" - locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" - datePattern="#{calendarBean.pattern}" - preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" - preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" - weekDayLabels="#{calendarBean.weekDayLabels}" - weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" - monthLabels="#{calendarBean.monthLabels}" - monthLabelsShort="#{calendarBean.monthLabelsShort}" - value="#{calendarBean.selectedDate}" - currentDate="#{calendarBean.currentDate}" - jointPoint="#{calendarBean.jointPoint}" - direction="#{calendarBean.direction}" - enableManualInput="#{calendarBean.enableManualInput}" - showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" - boundaryDatesMode="#{calendarBean.boundary}" - currentDateChangeListener="#{calendarBean.dcl}" - valueChangeListener="#{calendarBean.ddd}" reRender="counter" - inputClass="ic" buttonClass="bc" - ajaxSingle="#{calendarBean.ajaxSingle}" - buttonIcon="#{calendarBean.icon}" - buttonIconDisabled="#{icon.iconFileManagerReject}" - disabled="#{calendarBean.disabled}" - bypassUpdates="#{calendarBean.bypassUpdates}" - height="#{calendarBean.height}" - width="#{calendarBean.width}" - zindex="#{calendarBean.zindex}" - toolTipMode="#{calendarBean.toolTipMode}" - scrollMode="#{calendarBean.scrollMode}" - rendered="#{calendarBean.rendered}" - focus="popupModeID" - timeZone="#{calendarBean.tmZone}" - required="#{calendarBean.required}" - requiredMessage="Required Message"> - <f:facet name="optionalHeader"> - <h:outputText value="optionalHeader Facet" /> - </f:facet> - <f:facet name="optionalFooter"> - <h:outputText value="optionalFooter Facet" /> - </f:facet> - <f:validator validatorId="org.richfaces.CalendarValidator" /> + <rich:messages showDetail="true"></rich:messages> + + <h:panelGrid columns="2"> + <h:outputText value="Client mode" /> + <h:outputText value="Ajax mode" /> + + <rich:calendar id="calendarClientID" dataModel="#{calendarDataModel}" + locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" + preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" + preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" + datePattern="#{calendarBean.pattern}" + weekDayLabels="#{calendarBean.weekDayLabels}" + weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" + monthLabels="#{calendarBean.monthLabels}" + monthLabelsShort="#{calendarBean.monthLabelsShort}" + value="#{calendarBean.selectedDate}" + currentDate="#{calendarBean.currentDate}" + jointPoint="#{calendarBean.jointPoint}" + direction="#{calendarBean.direction}" + enableManualInput="#{calendarBean.enableManualInput}" + showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" + boundaryDatesMode="#{calendarBean.boundary}" + currentDateChangeListener="#{calendarBean.dcl}" + valueChangeListener="#{calendarBean.ddd}" reRender="counter" + inputClass="ic" buttonClass="bc" + ajaxSingle="#{calendarBean.ajaxSingle}" + buttonIcon="#{calendarBean.icon}" + buttonIconDisabled="#{icon.iconFileManagerReject}" + disabled="#{calendarBean.disabled}" + bypassUpdates="#{calendarBean.bypassUpdates}" + height="#{calendarBean.height}" + width="#{calendarBean.width}" + zindex="#{calendarBean.zindex}" + toolTipMode="#{calendarBean.toolTipMode}" + rendered="#{calendarBean.rendered}" + focus="popupModeID" + mode="client" + required="#{calendarBean.required}" + requiredMessage="Required Message" + > + <f:facet name="weekDay"> + <f:verbatim><span style="padding: 2px; font-size: 4" >{weekDayLabel + weekDayLabelShort}</span></f:verbatim> + </f:facet> + + <f:facet name="optionalHeader"> + <h:outputText value="optionalHeader Facet" /> + </f:facet> + + <f:facet name="optionalFooter"> + <h:outputText value="optionalFooter Facet" /> + </f:facet> + + <f:validator validatorId="org.richfaces.CalendarValidator" /> + + <h:panelGrid columns="2"> + <f:verbatim> + <span style="padding: 2px;">{day}</span> + </f:verbatim> + <h:panelGrid> + <h:outputText styleClass="smallText" value="{data.enLabel}" /> + <h:outputText styleClass="smallText" value="{data.frLabel}" /> + <h:outputText styleClass="smallText" value="{data.deLabel}" /> + </h:panelGrid> + </h:panelGrid> + </rich:calendar> - <h:panelGrid columns="2"> - <f:verbatim> - <span style="padding: 2px;">{day}</span> - </f:verbatim> - <h:panelGrid> - <h:outputText styleClass="smallText" value="{data.enLabel}" /> - <h:outputText styleClass="smallText" value="{data.frLabel}" /> - <h:outputText styleClass="smallText" value="{data.deLabel}" /> - </h:panelGrid> - </h:panelGrid> - </rich:calendar> + </h:panelGrid> + - <h:panelGrid columns="2"> + + <h:panelGrid columns="2"> <h:outputText value="Select Locale:" /> - <h:selectOneRadio onchange="submit()" value="en/US" - valueChangeListener="#{calendarBean.selectLocale}"> + <h:selectOneRadio onchange="submit()" value="en/US"> <f:selectItem itemLabel="US" itemValue="en/US" /> <f:selectItem itemLabel="DE" itemValue="de/DE" /> <f:selectItem itemLabel="FR" itemValue="fr/FR" /> @@ -86,27 +101,27 @@ onclick="submit()" /> <h:outputText value="Custom day labels" /> - <h:selectOneRadio valueChangeListener="#{calendarBean.weekDay}" - onclick="submit()" > + <h:selectOneRadio value="#{calendarBean.weekDay}"> <f:selectItem itemLabel="none" itemValue="none"/> <f:selectItem itemLabel="day labels" itemValue="long"/> <f:selectItem itemLabel="day labels short" itemValue="short"/> + <a4j:support event="onclick" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:selectOneRadio> <h:outputText value="Custom month labels" /> - <h:selectOneRadio valueChangeListener="#{calendarBean.month}" - onclick="submit()" > + <h:selectOneRadio value="#{calendarBean.month}"> <f:selectItem itemLabel="none" itemValue="none"/> <f:selectItem itemLabel="day labels" itemValue="long"/> <f:selectItem itemLabel="day labels short" itemValue="short"/> + <a4j:support event="onclick" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:selectOneRadio> <h:outputText value="Select Date Pattern:" /> - <h:selectOneMenu value="MMM d, yyyy" onchange="submit()" - valueChangeListener="#{calendarBean.selectPattern}"> + <h:selectOneMenu value="MMM d, yyyy" onchange="submit()"> <f:selectItem itemLabel="d/M/yy" itemValue="d/M/yy" /> <f:selectItem itemLabel="dd/M/yy" itemValue="dd/M/yy" /> <f:selectItem itemLabel="d/MMM/y" itemValue="d/MMM/y" /> + <f:selectItem itemLabel="dd.MM.yyyy" itemValue="dd.MM.yyyy" /> <f:selectItem itemLabel="MMM d, yyyy" itemValue="MMM d, yyyy" /> </h:selectOneMenu> @@ -114,7 +129,7 @@ <h:commandButton type="button" value="Select Date" onclick="$(this.form.id+':calendarID').component.selectDate(this.form[this.form.id+':selectdate'].value);" /> - <h:outputText value="Preload date range begin(d.m.y)" /> + <h:outputText value="Preload date range begin(d.m.y)" /> <h:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();"/> <h:outputText value="Preload date range end(d.m.y)" /> @@ -122,17 +137,17 @@ <h:outputText value="z-index:" /> <h:inputText value="#{calendarBean.zindex}"> - <a4j:support event="onchange" reRender="calendarID"></a4j:support> + <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:inputText> <h:outputText value="Height:" /> <h:inputText value="#{calendarBean.height}"> - <a4j:support event="onchange" reRender="calendarID"></a4j:support> + <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:inputText> <h:outputText value="Width:" /> <h:inputText value="#{calendarBean.width}"> - <a4j:support event="onchange" reRender="calendarID"></a4j:support> + <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:inputText> <h:outputText value="reRender (counter):" /> @@ -143,8 +158,7 @@ <h:outputText value="Select Popup Joint Point:" /> <h:selectOneRadio onchange="submit()" - value="#{calendarBean.jointPoint}" - valueChangeListener="#{calendarBean.selectJointPoint}"> + value="#{calendarBean.jointPoint}"> <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> <f:selectItem itemLabel="top-right" itemValue="top-right" /> @@ -153,8 +167,7 @@ <h:outputText value="Select Popup Direction:" /> <h:selectOneRadio onchange="submit()" - value="#{calendarBean.direction}" - valueChangeListener="#{calendarBean.selectDirection}"> + value="#{calendarBean.direction}"> <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> <f:selectItem itemLabel="top-right" itemValue="top-right" /> @@ -176,12 +189,6 @@ <f:selectItem itemLabel="single" itemValue="single"/> <f:selectItem itemLabel="batch" itemValue="batch"/> </h:selectOneRadio> - - <h:outputText value="Scroll Mode:" /> - <h:selectOneRadio value="#{calendarBean.scrollMode}" onchange="submit();"> - <f:selectItem itemLabel="client" itemValue="client"/> - <f:selectItem itemLabel="ajax" itemValue="ajax"/> - </h:selectOneRadio> <h:outputText value="BoundaryDatesMode:" /> <h:selectOneRadio onclick="submit()" value="#{calendarBean.boundary}"> @@ -217,14 +224,6 @@ <f:verbatim></f:verbatim> <h:commandButton value="Submit" /> - - <rich:messages showDetail="true"></rich:messages> </h:panelGrid> - - <f:verbatim> - <br /> - </f:verbatim> - - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> Added: 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 (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,18 @@ +<%@ 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"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <h:form> + <rich:messages showDetail="true"></rich:messages> + + </h:form> +</body> +</html> +</f:view> \ No newline at end of file Added: 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 (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,131 @@ +<%@ 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="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> + + + + <a4j:outputPanel id="list-body" style="border: 1px"> + <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:panelGrid columns="2"> + <h:outputText value="Rendered:" /> + <h:selectBooleanCheckbox value="#{dfs.rendered}" > + <a4j:support event="onclick" reRender="p1"></a4j:support> + </h:selectBooleanCheckbox> + </h:panelGrid> + </a4j:form> + +</f:subview> + Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DT.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -1,124 +1,106 @@ -<%@ 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"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> - <f:subview id="DataTableID"> - <h:form> - - <rich:dataTable id="dataTableID" var="dataTableID" - value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table" - captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" - headerClass="header" footerClass="footer" - onRowClick="alert('row #{key}')" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="#{dataTable.bgcolor}" - border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite"> - <f:facet name="caption"> - <h:outputText value="caption" /> - </f:facet> - <f:facet name="header"> - <rich:columnGroup columnClasses="cola, colb ,rowc rowcc"> - <rich:column rowspan="2" rendered="#{dataTable.r2rendered}"> - <h:outputText value="2-row head" /> - </rich:column> - <h:column rendered="#{dataTable.r2rendered}"> - <h:outputText value="head in UIColumn" /> - </h:column> - <rich:column breakBefore="true"> - <h:outputText value="2-d row head" /> - </rich:column> - </rich:columnGroup> - </f:facet> - <f:facet name="footer"> - <h:outputText value="table foot" /> - </f:facet> - <rich:columnGroup> - <rich:column id="mounth" styleClass="column" rowspan="2" - headerClass="cheader" footerClass="cfooter"> - <f:facet name="header"> - <h:outputText value="mounth" /> - </f:facet> - <f:facet name="footer"> - <h:outputText value="-//-" /> - </f:facet> - <h:outputText value="#{dataTableID.mounth}" /> - </rich:column> - <rich:column styleClass="column" headerClass="cheader" - footerClass="cfooter" rendered="#{dataTable.r2rendered}"> - <f:facet name="header"> - <h:outputText value="mounth" /> - </f:facet> - <f:facet name="footer"> - <h:outputText value="-//-" /> - </f:facet> - <h:outputText value="#{dataTableID.town}" /> - </rich:column> - </rich:columnGroup> - <rich:column styleClass="column" headerClass="cheader" - footerClass="cfooter" rendered="#{dataTable.r2rendered}"> - <h:outputText value="#{dataTableID.day}" /> - </rich:column> - <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}"> - <rich:column id="name"> - <h:outputText value="#{detail.name}" /> - </rich:column> - <rich:column id="qty" rendered="#{dataTable.r2rendered}"> - <h:outputText value="#{detail.qty}" /> - </rich:column> - </rich:subTable> - <rich:column id="total" styleClass="total" colspan="2"> - <h:outputText value="#{dataTableID.total}" /> - </rich:column> - </rich:dataTable> - - <h:panelGrid columns="2"> - <h:outputText value="Align:"></h:outputText> - <h:selectOneMenu value="#{dataTable.align}"> - <f:selectItem itemLabel="center" itemValue="*center" /> - <f:selectItem itemLabel="left" itemValue="*left" /> - <f:selectItem itemLabel="right " itemValue="*right" /> - <a4j:support event="onclick" reRender="dataTableID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="Border: "></h:outputText> - <h:inputText value="#{dataTable.border}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> - - <h:outputText value="Columns Width: "></h:outputText> - <h:inputText value="#{dataTable.columnsWidth}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> - - <h:outputText value="Width: "></h:outputText> - <h:inputText value="#{dataTable.width}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> - - <h:outputText value="Background Colour"></h:outputText> - <h:selectOneMenu value="#{dataTable.bgcolor}"> - <f:selectItem itemLabel="aqua" itemValue="aqua" /> - <f:selectItem itemLabel="blue" itemValue="blue" /> - <f:selectItem itemLabel="fuchsia" itemValue="fuchsia" /> - <f:selectItem itemLabel="gray" itemValue="gray" /> - <f:selectItem itemLabel="lime" itemValue="lime" /> - <f:selectItem itemLabel="maroon" itemValue="maroon" /> - <f:selectItem itemLabel="purple" itemValue="purple" /> - <f:selectItem itemLabel="red" itemValue="red" /> - <f:selectItem itemLabel="silver" itemValue="silver" /> - <f:selectItem itemLabel="teal" itemValue="teal" /> - <f:selectItem itemLabel="yellow" itemValue="yellow" /> - <f:selectItem itemLabel="white" itemValue="white" /> - <a4j:support event="onclick" reRender="dataTableID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="rendered:" /> - <h:selectBooleanCheckbox value="#{dataTable.rendered}" - onclick="submit();" /> - - <h:outputText value=" row 2 rendered" /> - <h:selectBooleanCheckbox value="#{dataTable.r2rendered}" - onclick="submit();" /> - </h:panelGrid> - - </h:form> - </f:subview> - +<%@ 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"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> + <f:subview id="DataTableID"> + <h:form> + <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="alert('row #{key}')" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" + border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite"> + <f:facet name="caption"> + <h:outputText value="caption" /> + </f:facet> + <f:facet name="header"> + <rich:columnGroup columnClasses="cola, colb ,rowc rowcc"> + <rich:column rowspan="2" rendered="#{dataTable.r2rendered}"> + <h:outputText value="2-row head" /> + </rich:column> + <h:column rendered="#{dataTable.r2rendered}"> + <h:outputText value="head in UIColumn" /> + </h:column> + <rich:column breakBefore="true"> + <h:outputText value="2-d row head" /> + </rich:column> + </rich:columnGroup> + </f:facet> + <f:facet name="footer"> + <h:outputText value="table foot" /> + </f:facet> + <rich:columnGroup> + <rich:column id="mounth" styleClass="column" rowspan="2" + headerClass="cheader" footerClass="cfooter"> + <f:facet name="header"> + <h:outputText value="mounth" /> + </f:facet> + <f:facet name="footer"> + <h:outputText value="-//-" /> + </f:facet> + <h:outputText value="#{dataTableID.mounth}" /> + </rich:column> + <rich:column styleClass="column" headerClass="cheader" + footerClass="cfooter" rendered="#{dataTable.r2rendered}"> + <f:facet name="header"> + <h:outputText value="mounth" /> + </f:facet> + <f:facet name="footer"> + <h:outputText value="-//-" /> + </f:facet> + <h:outputText value="#{dataTableID.town}" /> + </rich:column> + </rich:columnGroup> + <rich:column styleClass="column" headerClass="cheader" + footerClass="cfooter" rendered="#{dataTable.r2rendered}"> + <h:outputText value="#{dataTableID.day}" /> + </rich:column> + <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}"> + <rich:column id="name"> + <h:outputText value="#{detail.name}" /> + </rich:column> + <rich:column id="qty" rendered="#{dataTable.r2rendered}"> + <h:outputText value="#{detail.qty}" /> + </rich:column> + </rich:subTable> + <rich:column id="total" styleClass="total" colspan="2"> + <h:outputText value="#{dataTableID.total}" /> + </rich:column> + </rich:dataTable> + + <h:panelGrid columns="2"> + <h:outputText value="Align:"></h:outputText> + <h:selectOneMenu value="#{dataTable.align}"> + <f:selectItem itemLabel="center" itemValue="*center" /> + <f:selectItem itemLabel="left" itemValue="*left" /> + <f:selectItem itemLabel="right " itemValue="*right" /> + <a4j:support event="onclick" reRender="dataTableID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="Border: "></h:outputText> + <h:inputText value="#{dataTable.border}"> + <a4j:support event="onchange" reRender="dataTableID"></a4j:support> + </h:inputText> + + <h:outputText value="Columns Width: "></h:outputText> + <h:inputText value="#{dataTable.columnsWidth}"> + <a4j:support event="onchange" reRender="dataTableID"></a4j:support> + </h:inputText> + + <h:outputText value="Width: "></h:outputText> + <h:inputText value="#{dataTable.width}"> + <a4j:support event="onchange" reRender="dataTableID"></a4j:support> + </h:inputText> + + <h:outputText value="rendered:" /> + <h:selectBooleanCheckbox value="#{dataTable.rendered}" + onclick="submit();" /> + + <h:outputText value=" row 2 rendered" /> + <h:selectBooleanCheckbox value="#{dataTable.r2rendered}" + onclick="submit();" /> + </h:panelGrid> + + </h:form> + </f:subview> + Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Div/Div.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Div/Div.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Div/Div.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,21 @@ +<%@ 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"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> + + <div id="div_1_ID" style="position: relative; left:400px; top:400px; border-color: red, 2px;"> + <div id="div_2_ID" style="position: absolute; left:-380px; top:-380px; color: blue, 2px;"> + <jsp:include page="${richBean.src}" /> + </div> + </div> +</body> +</html> +</f:view> \ 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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -5,37 +5,49 @@ <f:subview id="effectID"> <h:messages /> - <h:form id="indexID"> - <h:outputText value="Menu:" /> - <h:panelGrid columns="2"> - <h:outputText value="1." /> - <f:verbatim> - <span onclick="showFrm1(),hideIndexID()"><font color="blue">JSF Components</font></span> - </f:verbatim> + <h:form> + <rich:panel id="indexID"> + <a4j:commandLink value="Hide all" onclick="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()"></a4j:commandLink> + + <f:verbatim> + <br /> + </f:verbatim> + + <h:outputText value="Menu:" /> + <h:panelGrid columns="2" > + <h:outputText value="1." /> + <f:verbatim> + <span onclick="showFrm1(),hideIndexID()"><font color="blue">JSF + Components</font></span> + </f:verbatim> - <h:outputText value="2." /> - <f:verbatim> - <span onclick="showFrm2(),hideIndexID()"><font color="blue">JSF Component with Event and non-jsf target</font></span> - </f:verbatim> + <h:outputText value="2." /> + <f:verbatim> + <span onclick="showFrm2(),hideIndexID()"><font color="blue">JSF + Component with Event and non-jsf target</font></span> + </f:verbatim> - <h:outputText value="3." /> - <f:verbatim> - <span onclick="showFrm3(),hideIndexID()"><font color="blue">JSF Component with Event and jsf target</font></span> - </f:verbatim> + <h:outputText value="3." /> + <f:verbatim> + <span onclick="showFrm3(),hideIndexID()"><font color="blue">JSF + Component with Event and jsf target</font></span> + </f:verbatim> - <h:outputText value="4." /> - <f:verbatim> - <span onclick="showFrm4(),hideIndexID()"><font color="blue">JSF Component with Event.</font></span> - </f:verbatim> - - <h:outputText value="5." /> - <f:verbatim> - <span onclick="showFrm5(),hideIndexID()"><font color="blue">RichFace Components.</font></span> - </f:verbatim> - </h:panelGrid> - </h:form> + <h:outputText value="4." /> + <f:verbatim> + <span onclick="showFrm4(),hideIndexID()"><font color="blue">JSF + Component with Event.</font></span> + </f:verbatim> - <h:form id="frm1"> + <h:outputText value="5." /> + <f:verbatim> + <span onclick="showFrm5(),hideIndexID()"><font color="blue">RichFace + Components.</font></span> + </f:verbatim> + </h:panelGrid> + </rich:panel> + + <rich:panel id="frm1"> <h:outputText value="JSF Components:" /> <h:panelGrid id="panGrID" columns="2"> @@ -43,7 +55,7 @@ <h:inputText value="#{effect.time}" /> <f:verbatim> - <span onclick="hidePanel1(), hedeImage1()"><font color="blue">Hide Panel</font> + <span onclick="hidePanel1(), hideImage1()"><font color="blue">Hide Panel</font> </span> </f:verbatim> <h:graphicImage value="/pics/fatal.gif" @@ -80,84 +92,84 @@ <h:panelGroup id="form_1b_ID"> <h:inputText value="onmouse and onclick"> - <rich:effect event="onclick" type="Highlight" + <rich:effect event="onclick" type="Fold" params="duration:0.5,from:0.4,to:1.0" /> - <rich:effect event="onmouseout" type="Opacity" - params="duration:0.5,from:0.4,to:1.0" /> + <rich:effect event="onmouseout" type="Highlight" + params="duration:0.5,from:1.0,to:0.4" /> </h:inputText> </h:panelGroup> </h:panelGrid> <rich:effect for="panel_1_ID" name="hidePanel1" type="Fade" params="duration:#{effect.time}" /> - <rich:effect for="panel_1_ID" event="" name="showPanel1" type="Appear" /> + <rich:effect for="panel_1_ID" name="showPanel1" type="Appear" /> - <rich:effect for="asusID" event="" name="hideImage1" type="Fold" + <rich:effect for="asusID" name="hideImage1" type="Fold" params="duration:#{effect.time}" /> - <rich:effect for="asusID" event="" name="showImage1" type="Grow" /> + <rich:effect for="asusID" name="showImage1" type="Grow" /> <f:verbatim> <br /> <span onclick="hideFrm1(),showIndexID()"><font color="blue">Close</font></span> </f:verbatim> - </h:form> + </rich:panel> - <h:form id="frm2"> - <h:outputText - value="JSF Component with Event and non-jsf target (onclick, onmouseout)" /> + <rich:panel id="frm2"> + <h:outputText + value="JSF Component with Event and non-jsf target (onclick, onmouseout)" /> - <h:panelGrid columns="2"> - <h:graphicImage id="imageID" value="/pics/podb109_61.jpg" - width="100" height="50"> - <rich:effect event="onclick" targetId="divID" type="Opacity" - params="duration:0.5,from:0.4,to:1.0" /> - <rich:effect event="onmouseout" type="Opacity" - params="targetId:'divID',duration:0.5,from:1.0,to:0.4" /> - </h:graphicImage> + <h:panelGrid columns="2"> + <h:graphicImage id="imageID" value="/pics/podb109_61.jpg" width="100" + height="50"> + <rich:effect event="onclick" targetId="divID" type="Opacity" + params="duration:0.5,from:0.4,to:1.0" /> + <rich:effect event="onmouseout" type="Opacity" + params="targetId:'divID',duration:0.5,from:1.0,to:0.4" /> + </h:graphicImage> - <f:verbatim> - <div id="divID" - style="width: 100px; height: 50px; background-color: red"><rich:effect - event="onclick" targetId="imageID" type="Opacity" - params="duration:0.5,from:0.4,to:1.0" /> <rich:effect - event="onmouseout" type="Opacity" - params="targetId:'imageID',duration:0.5,from:1.0,to:0.4" /></div> - </f:verbatim> - </h:panelGrid> - <f:verbatim> - <br /> - <span onclick="hideFrm2(),showIndexID()"><font color="blue">Close</font></span> + <div id="divID" + style="width: 100px; height: 50px; background-color: red"><rich:effect + event="onclick" targetId="imageID" type="Opacity" + params="duration:0.5,from:0.4,to:1.0" /> <rich:effect + event="onmouseout" type="Opacity" + params="targetId:'imageID',duration:0.5,from:1.0,to:0.4" /></div> </f:verbatim> - </h:form> + </h:panelGrid> - <h:form id="frm3"> - <h:outputText - value="JSF Component with Event and jsf target (onclick, onmouseout)" /> + <f:verbatim> + <br /> + <span onclick="hideFrm2(),showIndexID()"><font color="blue">Close</font></span> + </f:verbatim> + </rich:panel> - <h:panelGrid id="gridID" border="1" style="background-color:green"> - <h:outputText value="Panel Content" /> - <rich:effect event="onclick" targetId="imgID" type="Opacity" - params="duration:0.5,from:0.4,to:1.0" /> - <rich:effect event="onmouseout" targetId="imgID" type="Opacity" - params="duration:0.5,from:1.0,to:0.4" /> - </h:panelGrid> + <rich:panel id="frm3"> + <h:outputText + value="JSF Component with Event and jsf target (onclick, onmouseout)" /> - <h:graphicImage id="imgID" value="/pics/podb109_61.jpg" width="93" - height="30px"> - <rich:effect event="onmouseout" targetId="gridID" type="Opacity" - params="duration:0.5,from:0.4,to:1.0" /> - <rich:effect event="onclick" targetId="gridID" type="Opacity" - params="duration:0.5,from:1.0,to:0.4" /> - </h:graphicImage> + <h:panelGrid id="gridID" border="1" style="background-color:green"> + <h:outputText value="Panel Content" /> + <rich:effect event="onclick" targetId="imgID" type="Opacity" + params="duration:0.5,from:0.4,to:1.0" /> + <rich:effect event="onmouseout" targetId="imgID" type="Opacity" + params="duration:0.5,from:1.0,to:0.4" /> + </h:panelGrid> - <f:verbatim> - <br /> - <span onclick="hideFrm3(),showIndexID()"><font color="blue">Close</font></span> - </f:verbatim> - </h:form> + <h:graphicImage id="imgID" value="/pics/podb109_61.jpg" width="93" + height="30px"> + <rich:effect event="onmouseout" targetId="gridID" type="Opacity" + params="duration:0.5,from:0.4,to:1.0" /> + <rich:effect event="onclick" targetId="gridID" type="Opacity" + params="duration:0.5,from:1.0,to:0.4" /> + </h:graphicImage> - <h:form id="frm4"> + <f:verbatim> + <br /> + <span onclick="hideFrm3(),showIndexID()"><font color="blue">Close</font></span> + </f:verbatim> + </rich:panel> + + <rich:panel id="frm4"> <h:outputText value="1. (Event 2)" /> <h:graphicImage id="img_1_ID" value="/pics/asus.jpg" width="200px" height="150px" /> @@ -187,10 +199,10 @@ <br /> <span onclick="hideFrm4(),showIndexID()"><font color="blue">Close</font></span> </f:verbatim> - </h:form> - - <h:form id="frm5"> - <h:panelGrid id="panGrID" columns="2"> + </rich:panel> + + <rich:panel id="frm5"> + <h:panelGrid id="panelGrdID" columns="2"> <f:verbatim> <span onclick="hideRichPanel()"><font color="blue">Hide Panel</font> </span> @@ -262,30 +274,26 @@ <br /> <span onclick="hideFrm5(),showIndexID()"><font color="blue">Close</font></span> </f:verbatim> - </h:form> + </rich:panel> - <rich:effect for="indexID" event="" name="hideIndexID" type="BlindUp" /> - <rich:effect for="indexID" event="" name="showIndexID" type="BlindDown" /> - <rich:effect for="frm1" event="" name="hideFrm1" type="Fade" /> - <rich:effect for="frm1" event="" name="showFrm1" type="Appear" /> + <rich:effect for="indexID" name="hideIndexID" type="SlideUp" /> + <rich:effect for="indexID" name="showIndexID" type="SlideDown" /> - <rich:effect for="frm2" event="" name="hideFrm2" type="Fade" /> - <rich:effect for="frm2" event="" name="showFrm2" type="Appear" /> + <rich:effect for="frm1" name="hideFrm1" type="Fade" /> + <rich:effect for="frm1" name="showFrm1" type="Appear" /> - <rich:effect for="frm3" event="" name="hideFrm3" type="Fade" /> - <rich:effect for="frm3" event="" name="showFrm3" type="Appear" /> - - <rich:effect for="frm4" event="" name="hideFrm4" type="Fade" /> - <rich:effect for="frm4" event="" name="showFrm4" type="Appear" /> + <rich:effect for="frm2" name="hideFrm2" type="Fade" /> + <rich:effect for="frm2" name="showFrm2" type="Appear" /> - <rich:effect for="frm5" event="" name="hideFrm5" type="Fade" /> - <rich:effect for="frm5" event="" name="showFrm5" type="Appear" /> + <rich:effect for="frm3" name="hideFrm3" type="Fade" /> + <rich:effect for="frm3" name="showFrm3" type="Appear" /> - <rich:effect for="backFrmID" event="" name="hideBackFrm" type="Fade" /> - <rich:effect for="backFrmID" event="" name="showBackFrm" type="Appear" /> - <h:form id="backFrmID"> - <h:commandLink value="Back" action="main"></h:commandLink> + <rich:effect for="frm4" name="hideFrm4" type="Fade" /> + <rich:effect for="frm4" name="showFrm4" type="Appear" /> + + <rich:effect for="frm5" name="hideFrm5" type="Fade" /> + <rich:effect for="frm5" name="showFrm5" type="Appear" /> </h:form> </f:subview> 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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -2,7 +2,6 @@ <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<f:view> <f:subview id="modalPanel"> <h:form id="MPform"> 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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -120,15 +120,15 @@ </rich:panel> </h:panelGrid> + <rich:panel style="position: absolute; top: 116px; right: 100px; " styleClass="top"> <f:facet name="header"> <h:outputText value="Header of the Panel" /> </f:facet> <h:outputText escape="false" value=" This is a panel with absolute position on the screen.<br /> Resize the browser's window for fun." /> + </rich:panel> - </rich:panel> - </rich:panel> <rich:panel style="width:#{panel.width};height:#{panel.height}"> <f:facet name="header"> <f:verbatim> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/RichTest/Rich.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/RichTest/Rich.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/RichTest/Rich.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,16 @@ +<%@ 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"%> +<f:view> +<html> +<head> +<title></title> +<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.src}" /> +</body> +</html> +</f:view> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Select/Map.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Select/Map.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Select/Map.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,22 @@ +<%@ 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"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> + + <div id="divID" style="position: absolute; top:60px; left: 10px; z-index: 1"> + <jsp:include page="SelectOneMenuPage.jsp" /> + </div> + <div id="divPageID" style="position: absolute; top:110px; left: 10px;"> + <jsp:include page="${richBean.src}" /> + </div> +</body> +</html> +</f:view> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Select/SelectOneMenuPage.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Select/SelectOneMenuPage.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Select/SelectOneMenuPage.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,176 @@ +<%@ 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"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> + +<f:subview id="selectOneMenuPage"> + <h:panelGrid columns="7" cellpadding="20px" cellspacing="30px"> + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + </h:panelGrid> +</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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -13,13 +13,15 @@ } </style> -<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> <f:subview id="simpleTogglePanelID"> <h:messages></h:messages> <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"> + <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" + label="simpleTogglePanel with some text" + width="#{simpleTogglePanel.width}" + height="#{simpleTogglePanel.height}" + switchType="#{simpleTogglePanel.switchType}" opened="false"> <f:facet name="closeMarker"> <h:outputText value="Close It" /> </f:facet> @@ -27,21 +29,26 @@ <h:outputText value="Open It" /> </f:facet> <f:verbatim> - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - </f:verbatim> + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + </f:verbatim> </rich:simpleTogglePanel> - <rich:simpleTogglePanel id="sTP1" headerClass="head" label="simpleTogglePanel wiht image" width="#{simpleTogglePanel.width}" - height="#{simpleTogglePanel.height}" rendered="#{simpleTogglePanel.rendered}" switchType="#{simpleTogglePanel.switchType}" opened="false"> + <rich:simpleTogglePanel id="sTP1" headerClass="head" + label="simpleTogglePanel wiht image" + width="#{simpleTogglePanel.width}" + height="#{simpleTogglePanel.height}" + rendered="#{simpleTogglePanel.rendered}" + switchType="#{simpleTogglePanel.switchType}" opened="false"> <h:graphicImage value="/pics/podb109_61.jpg" width="500" height="300"></h:graphicImage> </rich:simpleTogglePanel> - <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" width="#{simpleTogglePanel.width}" ignoreDupResponses="true" + <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" + width="#{simpleTogglePanel.width}" ignoreDupResponses="true" focus="#{simpleTogglePanel.focus}"> <f:facet name="closeMarker"> <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage> @@ -51,14 +58,15 @@ </f:facet> <rich:simpleTogglePanel id="INsTP"> <h:panelGrid columns="2"> - <h:graphicImage value="/pics/podb109_61.jpg"></h:graphicImage> - <h:outputText - value="Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text..." /> + <h:graphicImage value="/pics/podb109_61.jpg" width="250px" height="200px"></h:graphicImage> + <f:verbatim> + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + </f:verbatim> </h:panelGrid> </rich:simpleTogglePanel> </rich:simpleTogglePanel> @@ -87,13 +95,11 @@ </h:selectOneRadio> <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{simpleTogglePanel.rendered}" onclick="submit()"> + <h:selectBooleanCheckbox value="#{simpleTogglePanel.rendered}" + onclick="submit()"> </h:selectBooleanCheckbox> </h:panelGrid> - - - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> 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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -6,36 +6,43 @@ <h:messages></h:messages> <h:form id="tooggleTest"> + <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" + initialState="asus" stateOrder="asus,blank" + style="width:300px!important"> + <f:facet name="blank"> + <rich:panel> + <f:facet name="header"> + <h:panelGroup> + <rich:toggleControl id="toggleControl_blank" + for="tooggleTest:panel1"> + <h:outputText value="Expand" style="font-weight: bold;" /> + <h:graphicImage url="/pics/collapse.gif" + style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + </rich:panel> + </f:facet> - <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" - style="width:300px" > - <f:facet name="blank"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <rich:toggleControl id="toggleControl_blank" for="tooggleTest:panel1" > - <h:outputText value="Expand" style="font-weight: bold;" /> - <h:graphicImage url="/pics/collapse.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - </rich:panel> - </f:facet> - - <f:facet name="asus"> - <rich:panel> - <f:facet name="header"> - <h:panelGroup> - <rich:toggleControl id="toggleControl_panel1" for="tooggleTest:panel1"> - <h:outputText value="Collapse" style="font-weight: bold;" /> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;"> - <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg"/> + <f:facet name="asus"> + <rich:panel> + <f:facet name="header"> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" /> + <rich:toggleControl id="toggleControl_panel1" + for="tooggleTest:panel1"> + <h:outputText value="Collapse" style="font-weight: bold;" /> + <h:graphicImage url="/pics/expand.gif" + style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2" border="0" + style="width: 100%;background-color: white;"> + <h:graphicImage url="/pics/asus.jpg" height="300" width="300" + alt="asus.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" + value="Asus F 3 Tc" /> <f:verbatim> Processor: AMD Turion 64 X 2 - 1600 Mhz<br /> RAM: 1024 Mb<br /> @@ -47,30 +54,35 @@ </h:panelGroup> </h:panelGrid> </rich:panel> - </f:facet> - </rich:togglePanel> - - <f:verbatim> - <br /><br /> - </f:verbatim> + </f:facet> + </rich:togglePanel> + <br /> + <br /> - <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" initialState="#{togglePanel.initialState}" - stateOrder="#{togglePanel.stateOrder}"> - <f:facet name="asus"> - <rich:panel> - <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"> - <h:outputText value="Next"></h:outputText> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;"> - <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg"/> + <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" + initialState="#{togglePanel.initialState}" + stateOrder="#{togglePanel.stateOrder}"> + <f:facet name="asus"> + <rich:panel> + <f:facet name="header"> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" /> + <h:outputText value="Customizable toggle panel" + style="font-weight: bold;" /> + <rich:toggleControl id="toggleControl_panel_1" + for="tooggleTest:panel2"> + <h:outputText value="Next"></h:outputText> + <h:graphicImage url="/pics/expand.gif" + style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2" border="0" + style="width: 100%;background-color: white;"> + <h:graphicImage url="/pics/asus.jpg" height="300" width="300" + alt="asus.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" + value="Asus F 3 Tc" /> <f:verbatim> Processor: AMD Turion 64 X 2 - 1600 Mhz<br /> RAM: 1024 Mb<br /> @@ -83,22 +95,28 @@ </h:panelGrid> </rich:panel> </f:facet> - - <f:facet name="benq"> - <rich:panel> - <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"> - <h:outputText value="Next"></h:outputText> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: yellow;"> - <h:graphicImage url="/pics/benq.jpg" height="300" width="300" alt="benq.jpg"/> + + <f:facet name="benq"> + <rich:panel> + <f:facet name="header"> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="BenQ A 52" /> + <h:outputText value="Customizable toggle panel" + style="font-weight: bold;" /> + <rich:toggleControl id="toggleControl_panel_2" + for="tooggleTest:panel2"> + <h:outputText value="Next"></h:outputText> + <h:graphicImage url="/pics/expand.gif" + style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2" border="0" + style="width: 100%;background-color: yellow;"> + <h:graphicImage url="/pics/benq.jpg" height="300" width="300" + alt="benq.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" + value="BenQ A 52" /> <f:verbatim> Processor: Core Duo T2250 (1.73GHz)<br /> RAM: 1024 Mb<br /> @@ -111,22 +129,28 @@ </h:panelGrid> </rich:panel> </f:facet> - - <f:facet name="toshiba"> - <rich:panel> - <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"> - <h:outputText value="Next"></h:outputText> - <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> - </rich:toggleControl> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2" border="0" style="width: 100%;background-color: orange;"> - <h:graphicImage url="/pics/toshiba.jpg" height="300" width="300" alt="toshiba.jpg"/> + + <f:facet name="toshiba"> + <rich:panel> + <f:facet name="header"> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" value="Toshiba Satellite A 100-784" /> + <h:outputText value="Customizable toggle panel" + style="font-weight: bold;" /> + <rich:toggleControl id="toggleControl_panel_3" + for="tooggleTest:panel2"> + <h:outputText value="Next"></h:outputText> + <h:graphicImage url="/pics/expand.gif" + style="border-width: 0px;" /> + </rich:toggleControl> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2" border="0" + style="width: 100%;background-color: orange;"> + <h:graphicImage url="/pics/toshiba.jpg" height="300" width="300" + alt="toshiba.jpg" /> + <h:panelGroup> + <h:outputText style="font: 18px;font-weight: bold;" + value="Toshiba Satellite A 100-784" /> <f:verbatim> Processor: Intel Core Duo T2250 - 1.73GHz<br /> RAM: 1024 Mb<br /> @@ -138,41 +162,41 @@ </h:panelGroup> </h:panelGrid> </rich:panel> - </f:facet> - </rich:togglePanel> - - <f:verbatim> - <br /><br /> - </f:verbatim> - - <rich:separator height="5px" width="500px" /> + </f:facet> + </rich:togglePanel> + <f:verbatim> + <br /> + <br /> + </f:verbatim> + <rich:separator height="5px" width="500px" /> - <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px"> - <h:outputText value="InitialState:"></h:outputText> - <h:selectOneRadio value="#{togglePanel.initialState}"> - <f:selectItem itemLabel="Asus" itemValue="asus" /> - <f:selectItem itemLabel="Benq" itemValue="benq" /> - <f:selectItem itemLabel="toshiba" itemValue="toshiba" /> - <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> - </h:selectOneRadio> + <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px"> + <h:outputText value="InitialState:"></h:outputText> + <h:selectOneRadio value="#{togglePanel.initialState}"> + <f:selectItem itemLabel="Asus" itemValue="asus" /> + <f:selectItem itemLabel="Benq" itemValue="benq" /> + <f:selectItem itemLabel="toshiba" itemValue="toshiba" /> + <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> + </h:selectOneRadio> - <h:outputText value="StateOrder:"></h:outputText> - <h:selectOneRadio value="#{togglePanel.stateOrder}"> - <f:selectItem itemLabel="Asus,Benq,Toshiba" itemValue="asus,benq,toshiba" /> - <f:selectItem itemLabel="Toshiba, Asus, Benq" itemValue="toshiba,asus,benq" /> - <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> - </h:selectOneRadio> + <h:outputText value="StateOrder:"></h:outputText> + <h:selectOneRadio value="#{togglePanel.stateOrder}"> + <f:selectItem itemLabel="Asus,Benq,Toshiba" + itemValue="asus,benq,toshiba" /> + <f:selectItem itemLabel="Toshiba, Asus, Benq" + itemValue="toshiba,asus,benq" /> + <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> + </h:selectOneRadio> - <h:outputText value="switchType:"></h:outputText> - <h:selectOneRadio value="#{togglePanel.switchType}"> - <f:selectItem itemLabel="client" itemValue="client" /> - <f:selectItem itemLabel="server" itemValue="server" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <a4j:support event="onclick" reRender="panel1,panel2"></a4j:support> - </h:selectOneRadio> - </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> - <ui:debug hotkey="L"></ui:debug> + <h:outputText value="switchType:"></h:outputText> + <h:selectOneRadio value="#{togglePanel.switchType}"> + <f:selectItem itemLabel="client" itemValue="client" /> + <f:selectItem itemLabel="server" itemValue="server" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <a4j:support event="onclick" reRender="panel1,panel2"></a4j:support> + </h:selectOneRadio> + </h:panelGrid> + </h:form> </f:subview> 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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -4,20 +4,20 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="tooltipID"> <h:form> - <h:messages /> - + <h:messages></h:messages> + <h:outputText value="DEFAULT VALUE:"></h:outputText> - + <f:verbatim> <br /> </f:verbatim> - + <h:graphicImage value="/pics/ajax_process.gif" width="15px" height="15px"> <rich:toolTip value="ajax progress"> </rich:toolTip> </h:graphicImage> - + <h:inputText value="Text" id="inp1" size="50"> <rich:toolTip value="toolTip for input text"> <f:facet name="defaultContent"> @@ -43,10 +43,10 @@ <f:verbatim> <br /> </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}" layout="#{tooltip.layout}" + <rich:toolTip id="tooltipID" value="#{tooltip.value}" + mode="#{tooltip.mode}" delay="#{tooltip.delay}" layout="#{tooltip.layout}" horizontalOffset="#{tooltip.horizontalOffset}" verticalOffset="#{tooltip.verticalOffset}" followMouse="#{tooltip.followMouse}" @@ -59,6 +59,7 @@ <f:verbatim> <br /> </f:verbatim> + <h:panelGrid columns="2"> <h:outputText value="Text:"></h:outputText> <h:inputText value="#{tooltip.value}"> @@ -132,12 +133,6 @@ <a4j:support event="onclick" reRender="tooltipID" /> </h:selectBooleanCheckbox> </h:panelGrid> -  - - </h:form> - <h:form> - <h:commandLink value="Back" action="main"></h:commandLink> - </h:form> + </h:form> </f:subview> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -3,7 +3,7 @@ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> <faces-config> <managed-bean> - <managed-bean-name>mybean</managed-bean-name> + <managed-bean-name>dfs</managed-bean-name> <managed-bean-class>dfs.DemoSliderBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> <managed-property> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichBean.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichBean.xml (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichBean.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -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>richBean</managed-bean-name> + <managed-bean-class>rich.RichBean</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-RichTest.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -3,8 +3,8 @@ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> <faces-config> <managed-bean> - <managed-bean-name>rich</managed-bean-name> - <managed-bean-class>rich.Rich</managed-bean-class> + <managed-bean-name>richBean</managed-bean-name> + <managed-bean-class>rich.RichBean</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-ScrollableDataTable.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ScrollableDataTable.xml (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ScrollableDataTable.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -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>scrollableDT</managed-bean-name> + <managed-bean-class>scrollableDataTable.ScrollableDataTable</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-Skin.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Skin.xml 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Skin.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -2,9 +2,9 @@ <!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>skinBean</managed-bean-name> - <managed-bean-class>skins.Skins</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> + <managed-bean> + <managed-bean-name>skinBean</managed-bean-name> + <managed-bean-class>util.skins.Skins</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-jQuery.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-jQuery.xml (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-jQuery.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -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>jQuery</managed-bean-name> + <managed-bean-class>jQuery.JQuery</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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -74,7 +74,7 @@ </navigation-case> <navigation-case> <from-outcome>DFS</from-outcome> - <to-view-id>/DataFilterSlider/DFS.jsp</to-view-id> + <to-view-id>/DataFilterSlider/DataFilterSlider.jsp</to-view-id> </navigation-case> <navigation-case> <from-outcome>DDM</from-outcome> @@ -114,16 +114,20 @@ </navigation-case> <navigation-case> <from-outcome>TestDiv</from-outcome> - <to-view-id>/pages/Div.jsp</to-view-id> + <to-view-id>/pages/Div/Div.jsp</to-view-id> </navigation-case> <navigation-case> <from-outcome>RichTest</from-outcome> - <to-view-id>/pages/RichTest.jsp</to-view-id> + <to-view-id>/pages/Rich/Rich.jsp</to-view-id> </navigation-case> <navigation-case> <from-outcome>Map</from-outcome> - <to-view-id>/pages/Map.jsp</to-view-id> + <to-view-id>/pages/Select/Map.jsp</to-view-id> </navigation-case> + <navigation-case> + <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> @@ -146,4 +150,7 @@ <to-view-id>/Panel/Panel.jsp</to-view-id> </navigation-case> </navigation-rule> + <lifecycle> + <phase-listener id="phaseTracker">util.phaseTracker.PhaseTracker</phase-listener> + </lifecycle> </faces-config> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-10-22 12:55:14 UTC (rev 3464) @@ -12,8 +12,23 @@ </context-param> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> - <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-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Message! .xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-Div.xml,/WEB-INF/faces-config-RichTest.xml</param-value> + <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml, + /WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml, + /WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml, + /WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml, + /WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-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-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</param-value> </context-param> + <context-param> + <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> + <param-value>false</param-value> + </context-param> <filter> <display-name>Ajax4jsf Filter</display-name> <filter-name>ajax4jsf</filter-name> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/jQuery/jQuery.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/jQuery/jQuery.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/jQuery/jQuery.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,97 @@ +<%@ 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"%> + +<f:subview id="jQuerySubviewID"> + <h:form id="form"> +<style> +.divSize_1 { + width: 150px; + height: 90px; + margin: 10px; + border: 2px solid #DAA520; +} + +.divColor_1 { + + background-color: #1E90FF; +} + +.divTextSize_1 { + font-size: xx-large; +} +.divSize_2 { + width: 90px; + height: 150px; + margin: 10px; + border: 2px solid #FF0000; +} + +.divColor_2 { + background-color: #7FFF00; +} + +.oddTable{ + background-color: #FFE4C4; +} +.activeTable{ + background-color: #AFEEEE; +} +.fontColor { + font-style: italic; + color: #228B22; +} +</style> + + <h:messages /> + <h:panelGrid id="panelGridID" columns="2" border="1"> + <h:outputText value="add text: [li],work!, e.g. A. one [li],work!" /> + <h:panelGroup> + <f:verbatim> + <ol type="A" title="li"> + <li>one </li> + <li>two </li> + <li>three</li> + </ol> + </f:verbatim> + </h:panelGroup> + + <h:outputText value="green text: add text3 " /> + <f:verbatim> <p><span>Text1 </span>text2</p> </f:verbatim> + + <h:panelGroup> + <f:verbatim> + Rectangle: size: "150 x 90"; bgcolor: "dodgerblue"; + <br /> + Table: bgcolor: "bisque" + </f:verbatim> + </h:panelGroup> + <f:verbatim><div id="div_1_ID">xx-large <br /> text </div></f:verbatim> + + <h:panelGroup> + <f:verbatim> + Rectangle: size: "90 x 150"; border-color: "red" + <br /> + effect(mouseover) + </f:verbatim> + </h:panelGroup> + <f:verbatim><div id="div_2_ID"> normal text</div></f:verbatim> + </h:panelGrid> + + + <rich:jQuery selector="li" timing="onload" query="find('ol').end().append('[li],work!')" /> + + + <rich:jQuery selector="tr:nth-child(odd)" timing="onload" query="addClass('oddTable')" /> + <rich:jQuery selector="#panelGridID tr" query="mouseover(function(){jQuery(this).addClass('activeTable')})"/> + <rich:jQuery selector="#panelGridID tr" query="mouseout(function(){jQuery(this).removeClass('activeTable')})"/> + + <rich:jQuery selector="p" timing="onload" query="find('span').html('text1').end().append('<p class='fontColor'>add text3<p>')"/> + <rich:jQuery selector="#div_1_ID" timing="onload" query="addClass('divSize_1')" /> + <rich:jQuery selector=".divSize_1" timing="onload" query="addClass('divColor_1')" /> + <rich:jQuery selector="#panelGridID #div_1_ID" timing="onload" query="addClass('divTextSize_1')" /> + <rich:jQuery selector="#form\\:panelGridID #div_2_ID" timing="onload" query="addClass('divSize_2')" /> + + </h:form> +</f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div/Div.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div/Div.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div/Div.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,21 @@ +<%@ 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"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> + + <div id="div_1_ID" style="position: relative; left:400px; top:400px; border-color: red, 2px;"> + <div id="div_2_ID" style="position: absolute; left:-380px; top:-380px; color: blue, 2px;"> + <jsp:include page="${richBean.src}" /> + </div> + </div> +</body> +</html> +</f:view> \ No newline at end of file Added: 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 (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,16 @@ +<%@ 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"%> +<f:view> +<html> +<head> +<title></title> +<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.src}" /> +</body> +</html> +</f:view> \ No newline at end of file Added: 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 (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,47 @@ +<%@ 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" %> +<f:subview id="richMenuID"> + <h:form> + <h:panelGrid columns="3"> + <rich:spacer width="750px"></rich:spacer> + <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> + <h:commandLink action="#{skinBean.change}" value="set skin" /> + + <rich:spacer width="750px"></rich:spacer> + <h:outputText value="Select component:" /> + <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> + <f:selectItem itemValue="" itemLabel="none" /> + <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" /> + <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" /> + <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" /> + <f:selectItem itemValue="/DataTable/DT.jsp" itemLabel="Date Table" /> + <f:selectItem itemValue="/DragAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" /> + <f:selectItem itemValue="/DropDownMenu/DDMenu.jsp" itemLabel="Drop Down Menu" /> + <f:selectItem itemValue="/Effect/Effect.jsp" itemLabel="Effect" /> + <f:selectItem itemValue="/Gmap/Gmap.jsp" itemLabel="Gmap" /> + <f:selectItem itemValue="/InputNumberSlider/InputNumberSlider.jsp" itemLabel="Input Number Slider" /> + <f:selectItem itemValue="/InputNumberSpinner/InputNumberSpinner.jsp" itemLabel="Input Number Spinner" /> + <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="Insert" /> + <f:selectItem itemValue="/Message/Message.jsp" itemLabel="Message" /> + <f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" /> + <f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" /> + <f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" /> + <f:selectItem itemValue="/Panel/Panel2.jsp" itemLabel="Panel2" /> + <f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" /> + <f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" /> + <f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" /> + <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.jsp" itemLabel="Simple Toggle Panel" /> + <f:selectItem itemValue="/Spacer/Spacer.jsp" itemLabel="Spacer" /> + <f:selectItem itemValue="/SuggestionBox/SuggestionBox.jsp" itemLabel="Suggestion Box" /> + <f:selectItem itemValue="/TabPanel/TabPanel.jsp" itemLabel="Tab Panel" /> + <f:selectItem itemValue="/TogglePanel/TogglePanel.jsp" itemLabel="Toggle Panel" /> + <f:selectItem itemValue="/ToolBar/ToolBar.jsp" itemLabel="Tool Bar" /> + <f:selectItem itemValue="/Tooltip/Tooltip.jsp" itemLabel="Tooltip" /> + <f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" /> + <f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" /> + </h:selectOneMenu> + + </h:panelGrid> + </h:form> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/Map.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/Map.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/Map.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,22 @@ +<%@ 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"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> + + <div id="divID" style="position: absolute; top:60px; left: 10px; z-index: 1"> + <jsp:include page="SelectOneMenuPage.jsp" /> + </div> + <div id="divPageID" style="position: absolute; top:110px; left: 10px;"> + <jsp:include page="${richBean.src}" /> + </div> +</body> +</html> +</f:view> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/SelectOneMenuPage.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/SelectOneMenuPage.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/SelectOneMenuPage.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -0,0 +1,176 @@ +<%@ 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"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> + +<f:subview id="selectOneMenuPage"> + <h:panelGrid columns="7" cellpadding="20px" cellspacing="30px"> + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + </h:panelGrid> +</f:subview> \ No newline at end of file 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-10-22 12:53:55 UTC (rev 3463) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-10-22 12:55:14 UTC (rev 3464) @@ -11,12 +11,13 @@ <f:view> <h:form> <div align="center"><h:outputText - value="VCP 3.2.0 Test Application (JSF 1.1RI(1.2RI))" styleClass="maintext"></h:outputText></div> + value="VCP Test Application (JSF 1.1RI(1.2RI))" styleClass="maintext"></h:outputText></div> <rich:panel> <h:panelGrid columns="2" cellpadding="5px"> <h:commandLink value="RichFaces" action="RichTest"></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> </h:panelGrid> </rich:panel> </h:form>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r3463 - in branches/3.1.x/test-applications/facelets/src/main: java/calendar and 52 other directories.

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

Author: ayanul Date: 2007-10-22 08:53:55 -0400 (Mon, 22 Oct 2007) New Revision: 3463 Added: branches/3.1.x/test-applications/facelets/src/main/java/rich/ branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/ branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichBean.xml branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/ branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/SelectOneMenuPage.xhtml 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/CalendarDataModelImpl.java branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarDataModelItemImpl.java branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarValidator.java branches/3.1.x/test-applications/facelets/src/main/java/dataTable/Data.java branches/3.1.x/test-applications/facelets/src/main/java/dataTable/DataTable.java branches/3.1.x/test-applications/facelets/src/main/java/demo/PhaseTracker.java branches/3.1.x/test-applications/facelets/src/main/java/dfs/DemoSliderBean.java branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSpinner/InputNumberSpinner.java branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java branches/3.1.x/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java branches/3.1.x/test-applications/facelets/src/main/java/sb/Sb.java branches/3.1.x/test-applications/facelets/src/main/java/spacer/Spacer.java branches/3.1.x/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java branches/3.1.x/test-applications/facelets/src/main/java/toolBar/ToolBar.java branches/3.1.x/test-applications/facelets/src/main/java/tree/Bean.java branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DS.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DT.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DradAndDrop/DragAndDrop.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DDMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.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/ModalPanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/panel2.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.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-DataFilterSlider.xml 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/web.xml branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSlider/inputNumberSlider.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSpinner/inputNumberSpinner.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/main.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/styles/styles.css Log: 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-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -21,7 +21,6 @@ package calendar; -import java.lang.reflect.Array; import java.text.DateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -30,21 +29,19 @@ import java.util.StringTokenizer; import java.util.TimeZone; -import javax.faces.component.UIComponent; import javax.faces.event.ValueChangeEvent; -import javax.faces.webapp.UIComponentTag; import org.richfaces.event.CurrentDateChangeEvent; 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[] { "Monday", - "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "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 [] 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 +" }; @@ -73,7 +70,6 @@ private String boundary; private String icon; private String toolTipMode; - private String scrollMode; private String label; private String timeZone; private int zindex; @@ -123,13 +119,6 @@ this.pattern = pattern; } - public void selectPattern(ValueChangeEvent event) { - String tPatern = (String) event.getNewValue(); - if (tPatern != null) { - pattern = tPatern; - } - } - public CalendarBean() { height = "400px"; width = "400px"; @@ -149,12 +138,11 @@ rendered = true; zindex = 2; toolTipMode = "none"; - scrollMode = "client"; required = false; - weekDay = "none"; + weekDay = "long"; month = "none"; timeZone = "Eastern European Time"; - preloadDateRangeBegin = "10.09.2007"; + preloadDateRangeBegin = "10.08.2007"; //d.m.y preloadDateRangeEnd = "11.10.2007"; } @@ -166,9 +154,8 @@ date.add(Integer.parseInt(st.nextToken())); } cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0); - System.out.println(cal.getTime()); + System.out.println("prBegin " + cal.getTime()); return cal.getTime(); - } public Date getPrDateRangeEnd() { @@ -179,7 +166,7 @@ date.add(Integer.parseInt(st.nextToken())); } cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0); - System.out.println(cal.getTime()); + System.out.println("prEnd " + cal.getTime()); return cal.getTime(); } @@ -207,19 +194,10 @@ this.readonly = readonly; } - public void selectLocale(ValueChangeEvent event) { - String tLocale = (String) event.getNewValue(); - if (tLocale != null) { - String lang = tLocale.substring(0, 2); - String country = tLocale.substring(3); - locale = new Locale(lang, country, ""); - } - } - public Object getWeekDayLabels() { if(weekDay.equals("long")) return CalendarBean.WEEK_DAY; - else return null; + else return null; } public Object getWeekDayLabelsShort() { @@ -234,10 +212,6 @@ else return null; } - public void weekDay(ValueChangeEvent event) { - weekDay = (String) event.getNewValue(); - } - public Object getMonthLabelsShort() { if(month.equals("short")) return CalendarBean.MOUNT_LABELS_SHORT; @@ -245,9 +219,12 @@ } + public String getMonth() { + return month; + } - public void month(ValueChangeEvent event) { - month = (String) event.getNewValue(); + public void setMonth(String month) { + this.month = month; } public String getCurrentDateAsText() { @@ -284,9 +261,6 @@ this.jointPoint = jointPoint; } - public void selectJointPoint(ValueChangeEvent event) { - jointPoint = (String) event.getNewValue(); - } public String getDirection() { return direction; @@ -296,10 +270,6 @@ this.direction = direction; } - public void selectDirection(ValueChangeEvent event) { - direction = (String) event.getNewValue(); - } - public String getBoundary() { return boundary; } @@ -379,14 +349,6 @@ this.toolTipMode = toolTipMode; } - public String getScrollMode() { - return scrollMode; - } - - public void setScrollMode(String scrollMode) { - this.scrollMode = scrollMode; - } - public int getZindex() { return zindex; } @@ -442,4 +404,12 @@ public void setPreloadDateRangeEnd(String preloadDateRangeEnd) { this.preloadDateRangeEnd = preloadDateRangeEnd; } + + public String getWeekDay() { + return weekDay; + } + + public void setWeekDay(String weekDay) { + this.weekDay = weekDay; + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarDataModelImpl.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarDataModelImpl.java 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarDataModelImpl.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -22,10 +22,12 @@ package calendar; import java.text.DateFormat; +import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import java.util.Random; import org.richfaces.model.CalendarDataModel; import org.richfaces.model.CalendarDataModelItem; @@ -62,8 +64,20 @@ data.put("enLabel", enFormatter.format(date)); data.put("frLabel", frFormatter.format(date)); data.put("deLabel", deFormatter.format(date)); + /*Calendar c = Calendar.getInstance(); + c.setTime(date); + item.setDay(c.get(Calendar.DAY_OF_MONTH));*/ + + if (new Random().nextInt(10) > 5) { + item.setEnabled(true); + } else { + item.setEnabled(false); + } + item.setData(data); - + + System.out.println(item.getData() + " " + item.isEnabled()); + return item; } @@ -72,7 +86,6 @@ */ public Object getToolTip(Date date) { - // TODO Auto-generated method stub return null; } Modified: branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarDataModelItemImpl.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarDataModelItemImpl.java 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarDataModelItemImpl.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -35,6 +35,7 @@ private Object toolTip; private boolean enabled = true; + /* (non-Javadoc) * @see org.richfaces.component.CalendarDataModelItem#getData() */ @@ -97,10 +98,8 @@ public void setEnabled(boolean enabled) { this.enabled = enabled; } - + public int getDay() { - // TODO Auto-generated method stub return 0; } - } Modified: branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarValidator.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarValidator.java 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/calendar/CalendarValidator.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,3 +1,6 @@ +/** + * + */ package calendar; import java.util.Calendar; Modified: branches/3.1.x/test-applications/facelets/src/main/java/dataTable/Data.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/dataTable/Data.java 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/dataTable/Data.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -19,7 +19,6 @@ * */ public Data() { - // TODO Auto-generated constructor stub } /** Modified: branches/3.1.x/test-applications/facelets/src/main/java/dataTable/DataTable.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/dataTable/DataTable.java 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/dataTable/DataTable.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -13,7 +13,6 @@ private List mounths = new ArrayList(); private List numbers = new ArrayList(); private String align; - private String bgcolor; private String border; private String width; private String columnsWidth; @@ -22,7 +21,6 @@ public DataTable() { align = "center"; - bgcolor = "aqua"; border = "1"; width = "400px"; columnsWidth = "200px"; @@ -109,14 +107,6 @@ this.align = align; } - public String getBgcolor() { - return bgcolor; - } - - public void setBgcolor(String bgcolor) { - this.bgcolor = bgcolor; - } - public String getBorder() { return border; } Modified: branches/3.1.x/test-applications/facelets/src/main/java/demo/PhaseTracker.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/demo/PhaseTracker.java 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/demo/PhaseTracker.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -31,7 +31,6 @@ * @see javax.faces.event.PhaseListener#getPhaseId() */ public PhaseId getPhaseId() { - // TODO Auto-generated method stub return PhaseId.ANY_PHASE; } Modified: branches/3.1.x/test-applications/facelets/src/main/java/dfs/DemoSliderBean.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/dfs/DemoSliderBean.java 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/dfs/DemoSliderBean.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -29,10 +29,13 @@ * */ public class DemoSliderBean { - + private boolean rendered; DemoInventoryList demoInventoryList; - + public DemoSliderBean() { + rendered = true; + } + public void setDemoInventoryList(DemoInventoryList demoInventoryList) { this.demoInventoryList = demoInventoryList; } @@ -46,4 +49,23 @@ } + public void doRendered() + { + if(rendered) + rendered = false; + else rendered = true; + } + + public String getRenderedName() { + if(rendered) return "Rendered on"; + else return "Rendered off"; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } } \ No newline at end of file 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-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSlider/InputNumberSlider.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,10 +1,15 @@ package inputNumberSlider; +import javax.faces.event.ValueChangeListener; + public class InputNumberSlider { - private int inputSize; private int maxlength; + private String requiredMessage; + private String inputPosition; + private String tabindex; + private String value; private String width; private String minValue; private String maxValue; @@ -14,7 +19,9 @@ private String inputStyle; private String tipStyle; private String handleStyle; - + private boolean immediate; + private boolean required; + private boolean showToolTip; private boolean disabled; private boolean showInput; private boolean rendered; @@ -22,8 +29,13 @@ private boolean showBoundaryValues; public InputNumberSlider() { - // TODO Auto-generated constructor stub - + immediate = false; + rendered = false; + showToolTip = false; + requiredMessage = "requiredMessage work!"; + inputPosition = "right"; + tabindex = "2"; + value = "30"; inputSize = 5; maxlength = 3; width = "300px"; @@ -42,6 +54,9 @@ showBoundaryValues=true; } + public void changeListener(ValueChangeListener event) { + System.out.println(event.toString()); + } public boolean isDisabled() { return disabled; @@ -201,5 +216,61 @@ public void setMaxlength(int maxlength) { this.maxlength = maxlength; } + + public boolean isImmediate() { + return immediate; + } + + public void setImmediate(boolean immediate) { + this.immediate = immediate; + } + + public boolean isRequired() { + return required; + } + + public void setRequired(boolean required) { + this.required = required; + } + + public boolean isShowToolTip() { + return showToolTip; + } + + public void setShowToolTip(boolean showToolTip) { + this.showToolTip = showToolTip; + } + + public String getRequiredMessage() { + return requiredMessage; + } + + public void setRequiredMessage(String requiredMessage) { + this.requiredMessage = requiredMessage; + } + + public String getInputPosition() { + return inputPosition; + } + + public void setInputPosition(String inputPosition) { + this.inputPosition = inputPosition; + } + + public String getTabindex() { + return tabindex; + } + + public void setTabindex(String tabindex) { + this.tabindex = tabindex; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSpinner/InputNumberSpinner.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSpinner/InputNumberSpinner.java 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/inputNumberSpinner/InputNumberSpinner.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -18,7 +18,6 @@ private boolean rendered; public InputNumberSpinner() { - // TODO Auto-generated constructor stub // size= "200"; inputSize = 2; cycled = false; 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-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -21,7 +21,7 @@ moveable=true; resizeable=true; - // TODO Auto-generated constructor stub + } public int getHeight() { Added: branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -0,0 +1,17 @@ +package rich; + +public class RichBean { + private String src; + + public RichBean() { + src = "/Calendar/Calendar.xhtml"; + } + + public String getSrc() { + return src; + } + + public void setSrc(String src) { + this.src = src; + } +} Modified: branches/3.1.x/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -10,7 +10,6 @@ private boolean rendered; public SimpleTogglePanel() { - // TODO Auto-generated constructor stub width = "75%"; height = "100%"; switchType = "server"; 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-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/sb/Sb.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -53,7 +53,6 @@ frequency = "0"; rules = "none"; setCities(getAllData()); - // TODO Auto-generated constructor stub } public List autocomplete(Object event) { Modified: branches/3.1.x/test-applications/facelets/src/main/java/spacer/Spacer.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/spacer/Spacer.java 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/spacer/Spacer.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -13,7 +13,6 @@ private boolean rendered; public Spacer() { - // TODO Auto-generated constructor stub height = "50px"; width = "300px"; Modified: branches/3.1.x/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -9,7 +9,6 @@ public TogglePanel() { - // TODO Auto-generated constructor stub initialState="asus"; switchType="server"; stateOrder="asus,benq,toshiba"; Modified: branches/3.1.x/test-applications/facelets/src/main/java/toolBar/ToolBar.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/toolBar/ToolBar.java 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/toolBar/ToolBar.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -22,7 +22,6 @@ location="left"; contentStyle=null; separatorStyle=null; - // TODO Auto-generated constructor stub } Modified: branches/3.1.x/test-applications/facelets/src/main/java/tree/Bean.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/tree/Bean.java 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/java/tree/Bean.java 2007-10-22 12:53:55 UTC (rev 3463) @@ -198,7 +198,7 @@ try { tree.queueNodeExpand(new ListRowKey(expandPath)); } catch (IOException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } } @@ -231,7 +231,7 @@ try { this.tree.queueExpandAll(); } catch (IOException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } return null; Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,84 +1,139 @@ -<h:form xmlns:a4j="http://richfaces.org/a4j" +<f:subview id="calendarSubviewID" + 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"> + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich"> - <style type="text/css"> -.smallText { - font-size: xx-small; -} +<h:form> -.largeText { - font-size: xx-large; -} - -.Selecteddayclass { - background-color: #0087FF; -} -</style> + <rich:messages showDetail="true"></rich:messages> - <f:verbatim> - <br /> - </f:verbatim> - - <rich:calendar id="calendarID" dataModel="#{calendarDataModel}" - locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" - datePattern="#{calendarBean.pattern}" - preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" - preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" - weekDayLabels="#{calendarBean.weekDayLabels}" - weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" - monthLabels="#{calendarBean.monthLabels}" - monthLabelsShort="#{calendarBean.monthLabelsShort}" - value="#{calendarBean.selectedDate}" - currentDate="#{calendarBean.currentDate}" - jointPoint="#{calendarBean.jointPoint}" - direction="#{calendarBean.direction}" - enableManualInput="#{calendarBean.enableManualInput}" - showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" - boundaryDatesMode="#{calendarBean.boundary}" - currentDateChangeListener="#{calendarBean.dcl}" - valueChangeListener="#{calendarBean.ddd}" reRender="counter" - inputClass="ic" buttonClass="bc" - ajaxSingle="#{calendarBean.ajaxSingle}" - buttonIcon="#{calendarBean.icon}" - buttonIconDisabled="#{icon.iconFileManagerReject}" - disabled="#{calendarBean.disabled}" - bypassUpdates="#{calendarBean.bypassUpdates}" - height="#{calendarBean.height}" - width="#{calendarBean.width}" - zindex="#{calendarBean.zindex}" - toolTipMode="#{calendarBean.toolTipMode}" - scrollMode="#{calendarBean.scrollMode}" - rendered="#{calendarBean.rendered}" - focus="popupModeID" + <h:panelGrid columns="2"> + <h:outputText value="Client mode" /> + <h:outputText value="Ajax mode" /> - required="#{calendarBean.required}" - requiredMessage="Required Message"> - <f:facet name="optionalHeader"> - <h:outputText value="optionalHeader Facet" /> - </f:facet> - <f:facet name="optionalFooter"> - <h:outputText value="optionalFooter Facet" /> - </f:facet> - <f:validator validatorId="org.richfaces.CalendarValidator" /> + <rich:calendar id="calendarClientID" dataModel="#{calendarDataModel}" + locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" + preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" + preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" + datePattern="#{calendarBean.pattern}" + weekDayLabels="#{calendarBean.weekDayLabels}" + weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" + monthLabels="#{calendarBean.monthLabels}" + monthLabelsShort="#{calendarBean.monthLabelsShort}" + value="#{calendarBean.selectedDate}" + currentDate="#{calendarBean.currentDate}" + jointPoint="#{calendarBean.jointPoint}" + direction="#{calendarBean.direction}" + enableManualInput="#{calendarBean.enableManualInput}" + showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" + boundaryDatesMode="#{calendarBean.boundary}" + currentDateChangeListener="#{calendarBean.dcl}" + valueChangeListener="#{calendarBean.ddd}" reRender="counter" + inputClass="ic" buttonClass="bc" + ajaxSingle="#{calendarBean.ajaxSingle}" + buttonIcon="#{calendarBean.icon}" + buttonIconDisabled="#{icon.iconFileManagerReject}" + disabled="#{calendarBean.disabled}" + bypassUpdates="#{calendarBean.bypassUpdates}" + height="#{calendarBean.height}" + width="#{calendarBean.width}" + zindex="#{calendarBean.zindex}" + toolTipMode="#{calendarBean.toolTipMode}" + rendered="#{calendarBean.rendered}" + focus="popupModeID" + mode="client" + required="#{calendarBean.required}" + requiredMessage="Required Message" + > + <f:facet name="weekDay"> + <f:verbatim><span style="padding: 2px; font-size: 4" >{weekDayLabel + weekDayLabelShort}</span></f:verbatim> + </f:facet> + + <f:facet name="optionalHeader"> + <h:outputText value="optionalHeader Facet" /> + </f:facet> + + <f:facet name="optionalFooter"> + <h:outputText value="optionalFooter Facet" /> + </f:facet> + + <f:validator validatorId="org.richfaces.CalendarValidator" /> + + <h:panelGrid columns="2"> + <f:verbatim> + <span style="padding: 2px;">{day}</span> + </f:verbatim> + <h:panelGrid> + <h:outputText styleClass="smallText" value="{data.enLabel}" /> + <h:outputText styleClass="smallText" value="{data.frLabel}" /> + <h:outputText styleClass="smallText" value="{data.deLabel}" /> + </h:panelGrid> + </h:panelGrid> + </rich:calendar> + <rich:calendar id="calendarAjaxID" dataModel="#{calendarDataModel}" + locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" + datePattern="#{calendarBean.pattern}" + weekDayLabels="#{calendarBean.weekDayLabels}" + weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" + monthLabels="#{calendarBean.monthLabels}" + monthLabelsShort="#{calendarBean.monthLabelsShort}" + value="#{calendarBean.selectedDate}" + currentDate="#{calendarBean.currentDate}" + jointPoint="#{calendarBean.jointPoint}" + direction="#{calendarBean.direction}" + enableManualInput="#{calendarBean.enableManualInput}" + showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" + boundaryDatesMode="#{calendarBean.boundary}" + currentDateChangeListener="#{calendarBean.dcl}" + valueChangeListener="#{calendarBean.ddd}" reRender="counter" + inputClass="ic" buttonClass="bc" + ajaxSingle="#{calendarBean.ajaxSingle}" + buttonIcon="#{calendarBean.icon}" + buttonIconDisabled="#{icon.iconFileManagerReject}" + disabled="#{calendarBean.disabled}" + bypassUpdates="#{calendarBean.bypassUpdates}" + height="#{calendarBean.height}" + width="#{calendarBean.width}" + zindex="#{calendarBean.zindex}" + toolTipMode="#{calendarBean.toolTipMode}" + rendered="#{calendarBean.rendered}" + focus="popupModeID" + mode="ajax" + required="#{calendarBean.required}" + requiredMessage="Required Message"> + <f:facet name="weekDay"> + <f:verbatim><span style="padding: 2px; font-size: 4" >{weekDayLabel + weekDayLabelShort}</span></f:verbatim> + </f:facet> + + <f:facet name="optionalHeader"> + <h:outputText value="optionalHeader Facet" /> + </f:facet> + + <f:facet name="optionalFooter"> + <h:outputText value="optionalFooter Facet" /> + </f:facet> + + <f:validator validatorId="org.richfaces.CalendarValidator" /> + + <h:panelGrid columns="2"> + <f:verbatim> + <span style="padding: 2px;">{day}</span> + </f:verbatim> + <h:panelGrid> + <h:outputText styleClass="smallText" value="{data.enLabel}" /> + <h:outputText styleClass="smallText" value="{data.frLabel}" /> + <h:outputText styleClass="smallText" value="{data.deLabel}" /> + </h:panelGrid> + </h:panelGrid> + </rich:calendar> + </h:panelGrid> + + <h:panelGrid columns="2"> - <f:verbatim> - <span style="padding: 2px;">{day}</span> - </f:verbatim> - <h:panelGrid> - <h:outputText styleClass="smallText" value="{data.enLabel}" /> - <h:outputText styleClass="smallText" value="{data.frLabel}" /> - <h:outputText styleClass="smallText" value="{data.deLabel}" /> - </h:panelGrid> - </h:panelGrid> - </rich:calendar> - - <h:panelGrid columns="2"> <h:outputText value="Select Locale:" /> - <h:selectOneRadio onchange="submit()" value="en/US" - valueChangeListener="#{calendarBean.selectLocale}"> + <h:selectOneRadio onchange="submit()" value="en/US"> <f:selectItem itemLabel="US" itemValue="en/US" /> <f:selectItem itemLabel="DE" itemValue="de/DE" /> <f:selectItem itemLabel="FR" itemValue="fr/FR" /> @@ -90,27 +145,27 @@ onclick="submit()" /> <h:outputText value="Custom day labels" /> - <h:selectOneRadio valueChangeListener="#{calendarBean.weekDay}" - onclick="submit()" > + <h:selectOneRadio value="#{calendarBean.weekDay}"> <f:selectItem itemLabel="none" itemValue="none"/> <f:selectItem itemLabel="day labels" itemValue="long"/> <f:selectItem itemLabel="day labels short" itemValue="short"/> + <a4j:support event="onclick" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:selectOneRadio> <h:outputText value="Custom month labels" /> - <h:selectOneRadio valueChangeListener="#{calendarBean.month}" - onclick="submit()" > + <h:selectOneRadio value="#{calendarBean.month}"> <f:selectItem itemLabel="none" itemValue="none"/> <f:selectItem itemLabel="day labels" itemValue="long"/> <f:selectItem itemLabel="day labels short" itemValue="short"/> + <a4j:support event="onclick" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:selectOneRadio> <h:outputText value="Select Date Pattern:" /> - <h:selectOneMenu value="MMM d, yyyy" onchange="submit()" - valueChangeListener="#{calendarBean.selectPattern}"> + <h:selectOneMenu value="MMM d, yyyy" onchange="submit()"> <f:selectItem itemLabel="d/M/yy" itemValue="d/M/yy" /> <f:selectItem itemLabel="dd/M/yy" itemValue="dd/M/yy" /> <f:selectItem itemLabel="d/MMM/y" itemValue="d/MMM/y" /> + <f:selectItem itemLabel="dd.MM.yyyy" itemValue="dd.MM.yyyy" /> <f:selectItem itemLabel="MMM d, yyyy" itemValue="MMM d, yyyy" /> </h:selectOneMenu> @@ -118,7 +173,7 @@ <h:commandButton type="button" value="Select Date" onclick="$(this.form.id+':calendarID').component.selectDate(this.form[this.form.id+':selectdate'].value);" /> - <h:outputText value="Preload date range begin(d.m.y)" /> + <h:outputText value="Preload date range begin(d.m.y)" /> <h:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();"/> <h:outputText value="Preload date range end(d.m.y)" /> @@ -126,17 +181,17 @@ <h:outputText value="z-index:" /> <h:inputText value="#{calendarBean.zindex}"> - <a4j:support event="onchange" reRender="calendarID"></a4j:support> + <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:inputText> <h:outputText value="Height:" /> <h:inputText value="#{calendarBean.height}"> - <a4j:support event="onchange" reRender="calendarID"></a4j:support> + <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:inputText> <h:outputText value="Width:" /> <h:inputText value="#{calendarBean.width}"> - <a4j:support event="onchange" reRender="calendarID"></a4j:support> + <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:inputText> <h:outputText value="reRender (counter):" /> @@ -147,8 +202,7 @@ <h:outputText value="Select Popup Joint Point:" /> <h:selectOneRadio onchange="submit()" - value="#{calendarBean.jointPoint}" - valueChangeListener="#{calendarBean.selectJointPoint}"> + value="#{calendarBean.jointPoint}"> <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> <f:selectItem itemLabel="top-right" itemValue="top-right" /> @@ -157,8 +211,7 @@ <h:outputText value="Select Popup Direction:" /> <h:selectOneRadio onchange="submit()" - value="#{calendarBean.direction}" - valueChangeListener="#{calendarBean.selectDirection}"> + value="#{calendarBean.direction}"> <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> <f:selectItem itemLabel="top-right" itemValue="top-right" /> @@ -180,12 +233,6 @@ <f:selectItem itemLabel="single" itemValue="single"/> <f:selectItem itemLabel="batch" itemValue="batch"/> </h:selectOneRadio> - - <h:outputText value="Scroll Mode:" /> - <h:selectOneRadio value="#{calendarBean.scrollMode}" onchange="submit();"> - <f:selectItem itemLabel="client" itemValue="client"/> - <f:selectItem itemLabel="ajax" itemValue="ajax"/> - </h:selectOneRadio> <h:outputText value="BoundaryDatesMode:" /> <h:selectOneRadio onclick="submit()" value="#{calendarBean.boundary}"> @@ -221,14 +268,6 @@ <f:verbatim></f:verbatim> <h:commandButton value="Submit" /> - - <rich:messages showDetail="true"></rich:messages> </h:panelGrid> - - <f:verbatim> - <br /> - </f:verbatim> - - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> - +</f:subview> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -0,0 +1,17 @@ +<!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: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> +<link rel="stylesheet" + href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" + type="text/css" /> +</head> +<f:view> + <h:form> + + </h:form> +</f:view> +</html> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,58 +1,16 @@ +<f:subview id="DataFilterSliderSubviewID" + 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"> + <a4j:form id="form1" reRender="list-body" ajaxSubmit="true" - ignoreDupResponses="true" requestDelay="100" - 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"> - <style type="text/css"> + ignoreDupResponses="true" requestDelay="100"> - 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> - <a4j:region id="stat1"> - - <a4j:outputPanel id="slider-body"> - <rich:dataFilterSlider sliderListener="#{mybean.doSlide}" + <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" @@ -62,14 +20,11 @@ trailerStyleClass="trailer" handleStyleClass="handle" handleValue="10000" id="slider_1"> </rich:dataFilterSlider> - </a4j:outputPanel> - <a4j:outputPanel id="list-body"> - <f:verbatim> - </f:verbatim> + <a4j:outputPanel id="list-body" style="border: 1px"> <h:dataTable id="carIndex" rows="10" binding="#{inventoryList.carMakeIndexUIData}" value="#{inventoryList.carMakeIndex}" var="category" @@ -91,19 +46,20 @@ 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" @@ -111,6 +67,7 @@ </f:facet> <h:outputText value="#{category.price}" /> </h:column> + <h:column> <f:facet name="header"> <h:outputText styleClass="headerText" @@ -121,5 +78,11 @@ </h:dataTable> </a4j:outputPanel> </a4j:region> - <h:commandLink value="Back" action="main"></h:commandLink> + <h:panelGrid columns="2"> + <h:outputText value="Rendered:" /> + <h:selectBooleanCheckbox value="#{dfs.rendered}" > + <a4j:support event="onclick" reRender="p1"></a4j:support> + </h:selectBooleanCheckbox> + </h:panelGrid> </a4j:form> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DS.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DS.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataScroller/DS.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,9 +1,10 @@ -<h:form dir="DSform" +<f:subview id="DataScrollerSubviewID" 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"> +<h:form dir="DSform"> <h:dataTable id="dataTableId" value="#{dataScroller.dataTable}" var="dT" cellpadding="5px" rows="5" border="1"> @@ -64,4 +65,4 @@ </h:panelGrid> <h:commandLink value="Back" action="main"></h:commandLink> </h:form> - +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DT.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DT.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DataTable/DT.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,15 +1,17 @@ -<h:form dir="DSform" - 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"> +<f:subview id="DataScrollerSubviewID" + 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"> + +<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" - onRowClick="alert('row #{key}')" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="#{dataTable.bgcolor}" + headerClass="header" footerClass="footer" cellpadding="" cellspacing="" + onRowClick="alert('row #{key}')" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite"> <f:facet name="caption"> <h:outputText value="caption" /> @@ -93,23 +95,6 @@ <a4j:support event="onchange" reRender="dataTableID"></a4j:support> </h:inputText> - <h:outputText value="Background Colour"></h:outputText> - <h:selectOneMenu value="#{dataTable.bgcolor}"> - <f:selectItem itemLabel="aqua" itemValue="aqua" /> - <f:selectItem itemLabel="blue" itemValue="blue" /> - <f:selectItem itemLabel="fuchsia" itemValue="fuchsia" /> - <f:selectItem itemLabel="gray" itemValue="gray" /> - <f:selectItem itemLabel="lime" itemValue="lime" /> - <f:selectItem itemLabel="maroon" itemValue="maroon" /> - <f:selectItem itemLabel="purple" itemValue="purple" /> - <f:selectItem itemLabel="red" itemValue="red" /> - <f:selectItem itemLabel="silver" itemValue="silver" /> - <f:selectItem itemLabel="teal" itemValue="teal" /> - <f:selectItem itemLabel="yellow" itemValue="yellow" /> - <f:selectItem itemLabel="white" itemValue="white" /> - <a4j:support event="onclick" reRender="dataTableID"></a4j:support> - </h:selectOneMenu> - <h:outputText value="rendered:" /> <h:selectBooleanCheckbox value="#{dataTable.rendered}" onclick="submit();" /> @@ -119,6 +104,5 @@ onclick="submit();" /> </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> - +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DradAndDrop/DragAndDrop.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DradAndDrop/DragAndDrop.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DradAndDrop/DragAndDrop.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,24 +1,11 @@ - <h:form id="form" +<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"> - <style type="text/css"> - .dropzoneDecoration { - width: 70px; height: 70px; border: 2px dotted navy; - } - - .accept { - border: 3px dotted green; - padding: 10px; - } + + <h:form id="form"> - .reject { - border: 3px dashed red; - padding: 10px; - } - </style> - <h:panelGroup id="dragValueText"> <h:outputText value="#{dndBean.dragValue}" /> </h:panelGroup> @@ -188,4 +175,4 @@ <h:messages /> </a4j:outputPanel> </h:form> - +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DDMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DDMenu.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DropDownMenu/DDMenu.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,15 +1,11 @@ - <h:form +<f:subview id="DropDownMenuSubviewID" 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:c="http://java.sun.com/jsp/jstl/core"> - <style> - .mousemove { - border: 3px dotted green; - padding: 5px; - } - </style> + <h:form> + <h:panelGrid columns="3"> <h:panelGrid columns="2"> <h:outputText value="HideDelay (ms):" /> @@ -153,8 +149,6 @@ </rich:panel> </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> - <a4j:log></a4j:log> </h:form> - +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,7 +1,9 @@ - <h:form xmlns:h="http://java.sun.com/jsf/html" +<f:subview id="effectSubviewID" + xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.ajax4jsf.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + <h:form> <rich:panel id="indexID"> <a4j:commandLink value="Hide all" onclick="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()"></a4j:commandLink> @@ -52,7 +54,7 @@ <h:inputText value="#{effect.time}" /> <f:verbatim> - <span onclick="hidePanel1(), hedeImage1()"><font color="blue">Hide Panel</font> + <span onclick="hidePanel1(), hideImage1()"><font color="blue">Hide Panel</font> </span> </f:verbatim> <h:graphicImage value="/pics/fatal.gif" @@ -293,6 +295,5 @@ <rich:effect for="frm5" name="showFrm5" type="Appear" /> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> - +</f:subview> 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-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,10 +1,11 @@ - <h:form - xmlns:h="http://java.sun.com/jsf/html" +<f:subview id="GmapSubviewID" + xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jstl/core" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + <h:form> <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" style="width:500px;height:400px" @@ -102,5 +103,5 @@ </script> </a4j:outputPanel> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/Insert.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,8 +1,10 @@ - <h:form +<f:subview id="insertSubviewID" + xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> + <h:form> <h:messages /> <rich:panel id="panelID" header="Highlight: #{insert.highlight}; File: #{insert.src}"> @@ -42,5 +44,5 @@ <h:outputText value="Rendered" /> <h:selectBooleanCheckbox value="#{insert.rendered}" onchange="submit();"/> </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> - </h:form> \ No newline at end of file + </h:form> +</f:subview> 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-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Message/Message.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,8 +1,9 @@ - <h:form +<f:subview id="messageSubviewID" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> + <h:form> <rich:panel> <h:panelGrid columns="2"> <h:outputText value="1." /> @@ -161,5 +162,5 @@ <f:verbatim> <br /> </f:verbatim> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,19 +1,23 @@ - <h:form id="MPform" +<f:subview id="modalPanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> + + <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}"> + resizeable="#{modalPanel.resizeable}" keepVisualState="" visualOptions="" > <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"> @@ -60,7 +64,5 @@ </h:selectBooleanCheckbox> </h:panelGrid> - - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> - +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Paint2D/Paint2D.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,15 +1,9 @@ -<!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" +<f:subview id="paint2DSubviewID" + 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"> - <head> - <link rel="stylesheet" - href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" - type="text/css" /> - </head> - <body> <h:form> <rich:paint2D id="paint2d" paint="#{paint2D.paint}" data="#{paintData}" width="#{paint2D.width}" @@ -95,8 +89,5 @@ <a4j:support event="onclick" reRender="paint2d"></a4j:support> </h:selectBooleanCheckbox> </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> - </body> - -</html> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/Panel.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,9 +1,10 @@ - <h:form +<f:subview id="panelSubviewID" xmlns:rich="http://richfaces.org/rich" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core"> + <h:form> <h:outputText value="Panel 1, rendered: #{!panel.rendered}; Panel 2, rendered #{panel.rendered};"></h:outputText> @@ -65,9 +66,6 @@ <h:outputText value="Rendered:"></h:outputText> <h:selectBooleanCheckbox value="#{panel.rendered}" onclick="submit()"></h:selectBooleanCheckbox> </h:panelGrid> - <h:commandLink value="Sample 2" action="Sample2"></h:commandLink> - <br /> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> +</f:subview> - Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/panel2.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/panel2.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Panel/panel2.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,53 +1,10 @@ - <h:form +<f:subview id="panel2SubviewID" 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:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> - <style> - .panel { - vertical-align:top; - } - .rich-panel-header { - color:#F00 !important; - - } - .top { - width:200px !important;height:100px !important; - } - .hea { - color:#FCC !important; - } - .bo { - color:#F00 !important; - } - - .top2 { - width:200px !important;height:100px !important; - border:2px solid #4C9600 !important; - background-color:#E4FFC8 !important; - } - - - .hea2 { - background-image : url() !important; - background-color : #4C9600 !important; - height:18px !important; - text-align:center !important; - vertical-align:middle !important; - color:#CFF !important; - padding:4px 0 !important; - } - - .bo2 { - color:#4C9600; - } - .bo3 { - height:100px; - overflow:auto; - } - - </style> + <h:form> <h:panelGrid columnClasses="panel" border="0" columns="3"> <rich:panel styleClass="top"> <f:facet name="header"> @@ -136,9 +93,5 @@ <h:outputText value="inside the form" /> </h:form> </rich:panel> - <f:verbatim> - <br /> - </f:verbatim> - <h:commandLink value="Back to Panel" action="BackP"></h:commandLink> </h:form> - +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelBar/PanelBar.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,8 +1,10 @@ - <h:form +<f:subview id="panelBarSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich"> + <h:form> + <h:messages></h:messages> <rich:panelBar id="pBId" height="#{panelBar.height}" @@ -66,5 +68,5 @@ value="#{panelBar.btnLabel}" /> </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,8 +1,9 @@ - <h:form +<f:subview id="panelMenuSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich"> + <h:form> <rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild" expandSingle="#{panelMenu.expandSingle}" mode="#{panelMenu.mode}" @@ -533,9 +534,5 @@ <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> </h:selectOneMenu> </h:panelGrid> - - <f:verbatim> - <br /> - </f:verbatim> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -11,21 +11,115 @@ </head> <body> <h:form id="richTestID"> - <ui:include src="/Rich/menu.xhtml" /> + <ui:include src="/rich/menu.xhtml" /> <h:panelGrid columns="2"> <rich:panel> <f:facet name="header"> <h:outputText value="panel" /> </f:facet> - <rich:tabPanel switchType="ajax"> - <rich:tab> - <h:outputText value="Text" /> - </rich:tab> - </rich:tabPanel> + <rich:tabPanel switchType="ajax" height="200px" width="300px"> + <rich:tab label="Tab 1"> + <f:facet name="header"> + <h:outputText value="tab1" /> + </f:facet> + <h:outputText value="Text" /> + <f:verbatim> + <br /> + </f:verbatim> + <h:outputText value="Text" /> + <f:verbatim> + <br /> + </f:verbatim> + <h:outputText value="Text" /> + <f:verbatim> + <br /> + </f:verbatim> + <h:outputText value="Text" /> + </rich:tab> + + <rich:tab label="Tab 2"> + <h:outputText value="Image" /> + <h:graphicImage value="/pics/masshtaby_01.jpg" height="150px" + width="200px" /> + </rich:tab> + + <rich:tab label="Tab 3"> + <f:facet name="header"> + <h:outputText value="tab1" /> + </f:facet> + <f:verbatim> + <a + href="javascript:Richfaces.showModalPanel('mp',{width:450, top:200})">Show + this panel</a> + </f:verbatim> + <rich:modalPanel id="mp" minHeight="200" minWidth="450" + height="200" width="500" zindex="2000"> + <f:facet name="header"> + <h:outputText value="Modal Panel Title" /> + </f:facet> + <f:facet name="controls"> + <h:graphicImage value="/pics/error.gif" style="cursor:pointer" + onclick="Richfaces.hideModalPanel('mp')" /> + </f:facet> + <f:verbatim> + RichFaces Modal Panel is a container that blocks an operation on the base page when the modal panel is shown. + <a href="javascript:Richfaces.hideModalPanel('mp')">Hide + this panel</a> + </f:verbatim> + </rich:modalPanel> + </rich:tab> + + <rich:tab label="Tab 4"> + <f:facet name="header"> + <h:outputText value="tab1" /> + </f:facet> + <h:inputTextarea value="text" cols="30" rows="8"></h:inputTextarea> + </rich:tab> + + <rich:tab label="Tab 5"> + <f:facet name="header"> + <h:outputText value="tab1" /> + </f:facet> + <rich:panel> + <f:facet name="header"> + <h:outputText value="Panel" /> + </f:facet> + <rich:tabPanel switchType="ajax"> + <rich:tab label="tab 1"> + <h:outputText value="text1" /> + </rich:tab> + + <rich:tab label="tab 2"> + <h:outputText value="text2" /> + </rich:tab> + </rich:tabPanel> + </rich:panel> + </rich:tab> + + <rich:tab label="Tab 6"> + <rich:dataGrid columns="3" elements="12" + value="#{dataTable.mounths}" var="dt"> + <rich:panel> + <f:facet name="header"> + <h:outputText value="mmm"></h:outputText> + </f:facet> + <h:panelGrid columns="2"> + <h:outputText value="Mounth:" styleClass="label"></h:outputText> + <h:outputText value="#{dt.mounth}" /> + <h:outputText value="Town:" styleClass="label"></h:outputText> + <h:outputText value="#{dt.town}" /> + <h:outputText value="Day:" styleClass="label"></h:outputText> + <h:outputText value="#{dt.day}" /> + <h:outputText value="Number:" styleClass="label"></h:outputText> + <h:outputText value="#{dt.total}" /> + </h:panelGrid> + </rich:panel> + </rich:dataGrid> + </rich:tab> + </rich:tabPanel> </rich:panel> </h:panelGrid> <rich:separator></rich:separator> - </h:form> </body> </f:view> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,10 +1,10 @@ - <h:form +<f:subview id="scrollableDataTableSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> - - <rich:scrollableDataTable var="sdt" value="#{scrollableDT.data}" rows="30" width="400px"> + <h:form> + <rich:scrollableDataTable var="sdt" value="#{scrollableDT.data}" rows="30" width="400px" > <rich:column width="100px" sortable="false"> <f:facet name="header"> <h:outputText value="Number" /> @@ -33,4 +33,5 @@ <h:outputText value="#{sdt.data3}" /> </rich:column> </rich:scrollableDataTable> - </h:form> \ No newline at end of file + </h:form> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,10 +1,11 @@ - <h:form +<f:subview id="separatorSubviewID" xmlns:rich="http://richfaces.org/rich" xmlns:scriptfree="http://jakarta.apache.org/taglibs/standard/scriptfree" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core"> + <h:form> <h:messages></h:messages> <h:outputText value="Event:"></h:outputText> <rich:separator height="20px" width="300px" @@ -61,5 +62,5 @@ <h:commandButton action="#{separator.doStyles}" value="#{separator.btnLabel}" /> </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,18 +1,10 @@ - <h:form +<f:subview id="simpleTogglePanelSubviewID" 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"> - <style type="text/css"> - .head - { - background-color: aqua; - } - .body - { - background-color: pink; - } - </style> + + <h:form> <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" width="#{simpleTogglePanel.width}" @@ -97,6 +89,5 @@ </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> - +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,10 +1,11 @@ - <h:form +<f:subview id="spacerSubviewID" 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:sql="http://java.sun.com/jsp/jstl/sql"> - <style type="text/css"> + <h:form> +<style type="text/css"> .text { font-size:20px; @@ -52,5 +53,5 @@ <f:verbatim> <br /> </f:verbatim> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,14 +1,15 @@ - <h:form id="suggestionbox_form" +<f:subview id="suggestionBoxSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> +<h:form id="suggestionbox_form"> <f:verbatim>Suggestion Box will suggest you Town's names if it's started with the "a" or "A" letter <br /> </f:verbatim> <h:inputText id="text" /> <rich:suggestionbox id="suggestionBoxId" for="text" - zindex="#{sb.zindex}" rules="#{sb.rules}" + zindex="#{sb.zindex}" rules="#{sb.rules}" styleClass="styleClass" suggestionAction="#{sb.autocomplete}" var="result" width="#{sb.width}" height="#{sb.height}" border="#{sb.border}" cellpadding="#{sb.cellpadding}" cellspacing="#{sb.cellspacing}" @@ -122,5 +123,5 @@ <h:outputText value="reRender"></h:outputText> <h:selectBooleanCheckbox value="#{sb.reRender}"></h:selectBooleanCheckbox> </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,22 +1,10 @@ -<h:form +<f:subview id="tabPanelSubviewID" 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:c="http://java.sun.com/jsp/jstl/core"> - -<style type="text/css"> -.text -{ -font-size: 20px -} -.bgc -{ -border: thick; -background-color: green -} -</style> - +<h:form> <rich:tabPanel id="tabPanelId" headerAlignment="#{tabPanel.headerAlignment}" width="#{tabPanel.width}" height="#{tabPanel.height}" @@ -120,5 +108,5 @@ </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,10 +1,10 @@ - - <h:form id="tooggleTest" +<f:subview id="togglePanelSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> + <h:form id="tooggleTest"> <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" style="width:300px!important"> @@ -55,9 +55,12 @@ </rich:panel> </f:facet> </rich:togglePanel> - <br /> - <br /> - + + <f:verbatim> + <br /> + <br /> + </f:verbatim> + <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" initialState="#{togglePanel.initialState}" stateOrder="#{togglePanel.stateOrder}"> @@ -195,7 +198,6 @@ <a4j:support event="onclick" reRender="panel1,panel2"></a4j:support> </h:selectOneRadio> </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> <ui:debug hotkey="L"></ui:debug> </h:form> - +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,8 +1,9 @@ - <h:form +<f:subview id="toolBarSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> + <h:form> <h:messages></h:messages> <rich:toolBar id="toolBarId" width="#{toolBar.width}" @@ -56,5 +57,5 @@ action="#{toolBar.doStyles}" reRender="toolBarId,slBtn"> </a4j:commandButton> </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> +</f:subview> 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-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,8 +1,10 @@ - <h:form +<f:subview id="tooltipSubviewID" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich"> + <h:form> + <h:messages></h:messages> <h:outputText value="DEFAULT VALUE:"></h:outputText> @@ -132,12 +134,6 @@ <a4j:support event="onclick" reRender="tooltipID" /> </h:selectBooleanCheckbox> </h:panelGrid> -  - <f:verbatim> - <br /> - </f:verbatim> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> - +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,9 +1,10 @@ - <h:form +<f:subview id="treeSubviewID" 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:dnd="http://richfaces.ajax4jsf.org/drag-drop"> + <h:form> <a4j:outputPanel ajaxRendered="true"> <h:messages /> </a4j:outputPanel> @@ -117,6 +118,5 @@ </rich:tree> <rich:spacer></rich:spacer> - - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> +</f:subview> 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-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,10 +1,11 @@ - <h:form +<f:subview id="virtualEarthSubviewID" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jstl/core" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + <h:form> <h:panelGrid columns="2"> <rich:virtualEarth style="width:800px;" id="gm" lat="37.97" dashboardSize="Normal" zoom="#{virtualEarth.zoom}" mapStyle="Hybrid" @@ -72,8 +73,5 @@ } </script> </a4j:outputPanel> - <f:verbatim> - <br /> - </f:verbatim> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> +</f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml 2007-10-22 12:53:55 UTC (rev 3463) @@ -3,7 +3,7 @@ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> <faces-config> <managed-bean> - <managed-bean-name>mybean</managed-bean-name> + <managed-bean-name>dfs</managed-bean-name> <managed-bean-class>dfs.DemoSliderBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> <managed-property> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichBean.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichBean.xml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichBean.xml 2007-10-22 12:53:55 UTC (rev 3463) @@ -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>richBean</managed-bean-name> + <managed-bean-class>rich.RichBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-10-22 12:53:55 UTC (rev 3463) @@ -6,7 +6,7 @@ <from-view-id>/pages/main.xhtml</from-view-id> <navigation-case> <from-outcome>TestDiv</from-outcome> - <to-view-id>/pages/Div.xhtml</to-view-id> + <to-view-id>/pages/Div/Div.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>Spinner</from-outcome> @@ -118,16 +118,20 @@ </navigation-case> <navigation-case> <from-outcome>Test</from-outcome> - <to-view-id>/pages/Test.xhtml</to-view-id> + <to-view-id>/pages/Rich/Rich.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>Map</from-outcome> - <to-view-id>/pages/Map.xhtml</to-view-id> + <to-view-id>/pages/Select/Map.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>RichTest</from-outcome> <to-view-id>/Rich/RichTest.xhtml</to-view-id> </navigation-case> + <navigation-case> + <from-outcome>CustomizePage</from-outcome> + <to-view-id>/CustomizePage/CustomizePage.xhtml</to-view-id> + </navigation-case> </navigation-rule> <navigation-rule> <from-view-id>/Panel/Panel.xhtml</from-view-id> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-10-22 12:53:55 UTC (rev 3463) @@ -33,8 +33,12 @@ </context-param> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-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-DradAbdDrop.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-Div.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-SelectOneMenuPage.xml,/WEB-INF/faces-config-RichTest.xml</param-value> + <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-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-DradAbdDrop.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-SelectOneMenuPage.xml,/WEB-INF/faces-config-RichTest.xml</param-value> </context-param> + <context-param> + <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> + <param-value>false</param-value> + </context-param> <filter> <display-name>Ajax4jsf Filter</display-name> <filter-name>ajax4jsf</filter-name> 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-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSlider/inputNumberSlider.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,16 +1,27 @@ - - <h:form +<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:form> + <h:panelGrid columns="1"> + <a4j:log level="ALL" popup="false" width="400" height="200"/> <h:outputText value="Event:"></h:outputText> <rich:inputNumberSlider minValue="0" maxValue="100" width="300px" - onmousedown="alert('OnMouseDown');"></rich:inputNumberSlider> + onmousedown="alert('OnMouseDown');" onblur="" onchange="" onclick="" ondblclick="" onerror="" onfocus="" onselect="" onkeydown="" + onkeypress="" onkeyup="" onmousemove="" onmouseout="" onmouseover="" onmouseup=""></rich:inputNumberSlider> <rich:spacer height="15px" width="300px"></rich:spacer> <rich:inputNumberSlider id="SliderId" + immediate="#{inputNumberSlider.immediate}" + required="#{inputNumberSlider.rendered}" + requiredMessage="#{inputNumberSlider.requiredMessage}" + inputPosition="#{inputNumberSlider.inputPosition}" + showToolTip="#{inputNumberSlider.showToolTip}" + tabindex="#{inputNumberSlider.tabindex}" + value="#{inputNumberSlider.value}" + valueChangeListener="#{inputNumberSlider.changeListener}" disabled="#{inputNumberSlider.disabled}" enableManualInput="#{inputNumberSlider.enableManualInput}" inputSize="#{inputNumberSlider.inputSize}" @@ -29,9 +40,21 @@ maxlength="#{inputNumberSlider.maxlength}"></rich:inputNumberSlider> <rich:spacer height="20px"></rich:spacer> - + </h:panelGrid> + <h:panelGrid columns="2" cellspacing="10px" border="1"> - + + <h:outputText value="value" /> + <h:outputText value="#{inputNumberSlider.value}" /> + + + + <h:outputText value="inputPosition"></h:outputText> + <h:selectOneRadio value="#{inputNumberSlider.inputPosition}"> + <f:selectItem itemLabel="right" itemValue="right"/> + <f:selectItem itemLabel="left" itemValue="left"/> + </h:selectOneRadio> + <h:outputText value="Width:"></h:outputText> <h:inputText value="#{inputNumberSlider.width}"> <a4j:support event="onchange" reRender="SliderId"></a4j:support> @@ -61,6 +84,11 @@ <h:inputText value="#{inputNumberSlider.step}"> <a4j:support event="onchange" reRender="SliderId"></a4j:support> </h:inputText> + + <h:outputText value="tabindex" /> + <h:inputText value="#{inputNumberSlider.tabindex}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> <h:outputText value="Disabled:"></h:outputText> <h:selectBooleanCheckbox value="#{inputNumberSlider.disabled}"> @@ -88,16 +116,31 @@ <h:selectBooleanCheckbox value="#{inputNumberSlider.showInput}"> <a4j:support event="onchange" reRender="SliderId"></a4j:support> </h:selectBooleanCheckbox> + + <h:outputText value="showToolTip" /> + <h:selectBooleanCheckbox value="#{inputNumberSlider.showToolTip}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + <h:outputText value="required" /> + <h:selectBooleanCheckbox value="#{inputNumberSlider.required}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="requiredMessage" /> + <h:inputText value="#{inputNumberSlider.requiredMessage}" > + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> + + <h:outputText value="immediate" /> + <h:selectBooleanCheckbox value="#{inputNumberSlider.immediate}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + <h:outputText value="Switch Styles" /> <a4j:commandButton id="slBtn" value="#{inputNumberSlider.btnLabel}" action="#{inputNumberSlider.doStyles}" reRender="SliderId,slBtn"> </a4j:commandButton> - </h:panelGrid> - <f:verbatim> - <br /> - </f:verbatim> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> - +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSpinner/inputNumberSpinner.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSpinner/inputNumberSpinner.xhtml 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSpinner/inputNumberSpinner.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,10 +1,11 @@ - <h:form - xmlns:rich="http://richfaces.org/rich" +<f:subview id="inputNumberSpinnerSubviewID" + xmlns:rich="http://richfaces.org/rich" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jstl/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:scriptfree="http://jakarta.apache.org/taglibs/standard/scriptfree"> + <h:form> <h:messages></h:messages> <h:outputText value="Event:"></h:outputText> <rich:inputNumberSpinner minValue="0" maxValue="10" @@ -77,5 +78,5 @@ <h:commandButton action="#{inputNumberSpinner.doStyles}" value="#{inputNumberSpinner.btnLabel}" /> </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> - </h:form> \ No newline at end of file + </h:form> +</f:subview> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/jQuery/jQuery.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -0,0 +1,104 @@ +<!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:rich="http://richfaces.org/rich" + xmlns:a4j="http://richfaces.org/a4j"> +<style> +.divSize_1 { + width: 150px; + height: 90px; + margin: 10px; + border: 2px solid #DAA520; +} + +.divColor_1 { + + background-color: #1E90FF; +} + +.divTextSize_1 { + font-size: xx-large; +} +.divSize_2 { + width: 90px; + height: 150px; + margin: 10px; + border: 2px solid #FF0000; +} + +.divColor_2 { + background-color: #7FFF00; +} + +.oddTable{ + background-color: #FFE4C4; +} +.activeTable{ + background-color: #AFEEEE; +} +.fontColor { + font-style: italic; + color: #228B22; +} +</style> + + +<f:view contentType="text/html"> + <body> + <h:form id="form"> + + <h:panelGrid id="panelGridID" columns="2" border="1"> + <h:outputText value="add text: [li],work!, e.g. A. one [li],work!" /> + <h:panelGroup> + <f:verbatim> + <ol type="A" title="li"> + <li>one </li> + <li>two </li> + <li>three</li> + </ol> + </f:verbatim> + </h:panelGroup> + + <h:outputText value="green text: add text3 " /> + <f:verbatim> <p><span>Text1 </span>text2</p> </f:verbatim> + + <h:panelGroup> + <h:outputText value="Rectangle: size: "150 x 90"; bgcolor: "dodgerblue"" /> + <f:verbatim><br /></f:verbatim> + <h:outputText value="Table: bgcolor: "bisque"" /> + </h:panelGroup> + <f:verbatim><div id="div_1_ID">xx-large <br /> text </div></f:verbatim> + + <h:panelGroup> + <h:outputText value="Rectangle: size: "90 x 150"; border-color "red"" /> + <f:verbatim><br /></f:verbatim> + <h:outputText value="Table: bgcolor: "none"" /> + <f:verbatim><br /></f:verbatim> + <h:outputText value="effect(mouseover)" /> + </h:panelGroup> + <f:verbatim><div id="div_2_ID"> normal text</div></f:verbatim> + </h:panelGrid> + + + <rich:jQuery selector="li" timing="onload" query="find('ol').end().append('[li],work!')" /> + + + <rich:jQuery selector="tr:nth-child(odd)" timing="onload" query="addClass('oddTable')" /> + <rich:jQuery selector="#panelGridID tr" query="mouseover(function(){jQuery(this).addClass('activeTable')})"/> + <rich:jQuery selector="#panelGridID tr" query="mouseout(function(){jQuery(this).removeClass('activeTable')})"/> + + <rich:jQuery selector="#div_2_ID" timing="onload" query="mouseover(function(){jQuery(this).fadeOut({height: 'hide'}, 500).text('New text').animate({height: 'show'}, 500)})" /> + <rich:jQuery selector="p" timing="onload" query="find('span').html('text1').end().append('<p class=\'fontColor\'>add text3<p>')"/> + <rich:jQuery selector="#div_1_ID" timing="onload" query="addClass('divSize_1')" /> + <rich:jQuery selector=".divSize_1" timing="onload" query="addClass('divColor_1')" /> + <rich:jQuery selector="#panelGridID #div_1_ID" timing="onload" query="addClass('divTextSize_1')" /> + <rich:jQuery selector="#form\\:panelGridID #div_2_ID" timing="onload" query="addClass('divSize_2')" /> + + </h:form> + </body> +</f:view> +</html> + Added: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -0,0 +1,27 @@ +<!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> + <head> + <title></title> + <link rel="stylesheet" + href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" + type="text/css" /> + </head> + <body> + <div id="divOpthID" align="right" style="z-index: 200"> + <ui:include src="/pages/RichMenu/RichMenu.xhtml"/> + </div> + + <div id="div_1_ID" style="position: relative; left:600px; top:500px; z-index:1;"> + <div id="div_2_ID" style="position: absolute; left:-580px; top:-450px;"> + <ui:include src="${richBean.src}" /> + </div> + </div> + </body> +</f:view> +</html> Added: 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 (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -0,0 +1,23 @@ +<!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> + <head> + <title></title> + <link rel="stylesheet" + href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" + type="text/css" /> + </head> + <body> + <div id="divOpthID" align="right" style="z-index: 200"> + <ui:include src="/pages/RichMenu/RichMenu.xhtml"/> + </div> + + <ui:include src="${richBean.src}" /> + </body> +</f:view> +</html> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -0,0 +1,46 @@ +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich"> + + <h:form id="forvDivOpthID"> + <h:panelGrid columns="2"> + <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> + <h:commandLink action="#{skinBean.change}" value="set skin" /> + + <h:outputText value="Select component:" /> + <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> + <f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" /> + <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.xhtml" itemLabel="Data Filter Slider" /> + <f:selectItem itemValue="/DataScroller/DS.xhtml" itemLabel="Date Scroller" /> + <f:selectItem itemValue="/DataTable/DT.xhtml" itemLabel="Date Table" /> + <f:selectItem itemValue="/DradAndDrop/DragAndDrop.xhtml" itemLabel="Drag And Drop" /> + <f:selectItem itemValue="/DropDownMenu/DDMenu.xhtml" itemLabel="Drop Down Menu" /> + <f:selectItem itemValue="/Effect/Effect.xhtml" itemLabel="Effect" /> + <f:selectItem itemValue="/Gmap/Gmap.xhtml" itemLabel="Gmap" /> + <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.xhtml" itemLabel="Input Number Slider" /> + <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.xhtml" itemLabel="Input Number Spinner" /> + <f:selectItem itemValue="/Insert/Insert.xhtml" itemLabel="Insert" /> + <f:selectItem itemValue="/Message/Message.xhtml" itemLabel="Message" /> + <f:selectItem itemValue="/ModalPanel/ModalPanel.xhtml" itemLabel="Modal Panel" /> + <f:selectItem itemValue="/Paint2D/Paint2D.xhtml" itemLabel="Paint2D" /> + <f:selectItem itemValue="/Panel/Panel.xhtml" itemLabel="Panel" /> + <f:selectItem itemValue="/Panel/panel2.xhtml" itemLabel="Panel2" /> + <f:selectItem itemValue="/PanelBar/PanelBar.xhtml" itemLabel="Panel Bar" /> + <f:selectItem itemValue="/PanelMenu/PanelMenu.xhtml" itemLabel="Panel Menu" /> + <f:selectItem itemValue="/Separator/Separator.xhtml" itemLabel="Separator" /> + <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.xhtml" itemLabel="Simple Toggle Panel" /> + <f:selectItem itemValue="/Spacer/Spacer.xhtml" itemLabel="Spacer" /> + <f:selectItem itemValue="/SuggestionBox/SuggestionBox.xhtml" itemLabel="Suggestion Box" /> + <f:selectItem itemValue="/TabPanel/TabPanel.xhtml" itemLabel="Tab Panel" /> + <f:selectItem itemValue="/TogglePanel/TogglePanel.xhtml" itemLabel="Toggle Panel" /> + <f:selectItem itemValue="/ToolBar/ToolBar.xhtml" itemLabel="Tool Bar" /> + <f:selectItem itemValue="/Tooltip/Tooltip.xhtml" itemLabel="Tooltip" /> + <f:selectItem itemValue="/Tree/Tree.xhtml" itemLabel="Tree" /> + <f:selectItem itemValue="/VirtualEarth/VirtualEarth.xhtml" itemLabel="Virtual Earth" /> + <f:selectItem itemValue="/ScrollableDataTable/ScrollableDataTable.xhtml" itemLabel="ScrollableDataTable" /> + </h:selectOneMenu> + </h:panelGrid> + <h:commandLink value="Back" action="main"></h:commandLink> + </h:form> +</html> \ No newline at end of file Added: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -0,0 +1,29 @@ +<!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> + <head> + <title></title> + <link rel="stylesheet" + href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" + type="text/css" /> + </head> + <body> + <div id="divOpthID" align="right" style="z-index: 200"> + <ui:include src="/pages/RichMenu/RichMenu.xhtml"/> + </div> + + <div id="divPageID" style="position: absolute; background-color:gray; top:60px; left: 10px; z-index: 2"> + <ui:include src="${richBean.src}" /> + </div> + + <div id="divID" style="absolute; relative; top:60px; left: 10px; z-index: 1"> + <ui:include src="/pages/Select/SelectOneMenuPage.xhtml" /> + </div> + </body> +</f:view> +</html> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/SelectOneMenuPage.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/SelectOneMenuPage.xhtml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/Select/SelectOneMenuPage.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -0,0 +1,871 @@ +<h:form id="formSOMID" 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="12" cellpadding="0" cellspacing="0" border="0"> + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + </h:panelGrid> +</h:form> 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-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/main.xhtml 2007-10-22 12:53:55 UTC (rev 3463) @@ -11,14 +11,14 @@ <body> <h:form> <div align="center"><h:outputText - value="VCP 3.2.0 Test Application (JSF 1.1RI(1.2RI) with Facelets)" + value="VCP Test Application (JSF 1.1RI(1.2RI) with Facelets)" style="font-size: 30px"></h:outputText></div> <rich:panel> <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px"> <h:commandLink value="RichFaces" action="Test"></h:commandLink> <h:commandLink value="Div" action="TestDiv"></h:commandLink> <h:commandLink value="Select" action="Map"></h:commandLink> - <h:commandLink value="temp" action="RichTest"></h:commandLink> + <h:commandLink value="Customize page" action="CustomizePage"></h:commandLink> </h:panelGrid> </rich:panel> </h:form> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/styles/styles.css =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/styles/styles.css 2007-10-22 12:19:12 UTC (rev 3462) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/styles/styles.css 2007-10-22 12:53:55 UTC (rev 3463) @@ -1,92 +1,247 @@ -.rich-message-label{ +/* Message and messages */ +.rich-message-label { padding: 0px 10px; } -.rich-messages-label{ +.rich-messages-label { padding: 0px 10px -} +} -.rich-message-marker{ +.rich-message-marker { + } -.rich-message{ +.rich-message { + } -.errorLabel{ - color: #FF0000; +.errorLabel { + color: #FF0000; } -.warnLabel{ - color: #0000FF; +.warnLabel { + color: #0000FF; } -.infoLabel{ +.infoLabel { color: #00FF00; } -.fatalLabel{ +.fatalLabel { color: #FF1493; } + .maintext { font-size: 30px !important; } -.text1{ + +.text1 { font-size: 14px !important; } -.style{ -background: teal; -border: solid 3px red; -font: bold 14px; + +.style { + background: teal; + border: solid 3px red; + font: bold 14px; } + /* inputNumderSlider Styles */ -.barStyle{ -background-color: purple !important; -border: red 3px solid; +.barStyle { + background-color: purple !important; + border: red 3px solid; } -.inputStyle -{ -background-color: lime !important; -border: red 3px solid; -font-family: monospace; + +.inputStyle { + background-color: lime !important; + border: red 3px solid; + font-family: monospace; } -.tipStyle{ -border: green 3px solid; -background-color: yellow; -font: italic bold 14px; + +.tipStyle { + border: green 3px solid; + background-color: yellow; + font: italic bold 14px; } -.handleStyle{ -border: green 3px solid; -background-color: yellow; + +.handleStyle { + border: green 3px solid; + background-color: yellow; } + /* TabPanel Styles */ -.activeTabStyle{ -background: lime; -border: solid 3px black; -font: italic 14px; +.activeTabStyle { + background: lime; + border: solid 3px black; + font: italic 14px; } -.inactiveTabStyle{ -background: gray; -border: solid 3px blue; -font: bold 14px; + +.inactiveTabStyle { + background: gray; + border: solid 3px blue; + font: bold 14px; } -.disabledTabStyle{ -background: silver; -border: dotted 3px blue; -font: small-caps 14px; + +.disabledTabStyle { + background: silver; + border: dotted 3px blue; + font: small-caps 14px; } -.contentStyle{ -background: silver; -border: 1px red; -font: 20px; + +.contentStyle { + background: silver; + border: 1px red; + font: 20px; } + /* inputNumerSpinner Styles*/ -.inputStyle{ -background: aqua ; -border: thin red; -font: fantasy 15px; +.inputStyle { + background: aqua; + border: thin red; + font: fantasy 15px; } + /* ToolBar Styles*/ -.separatorStyle{ -border: 3px solid red; -background: lime; +.separatorStyle { + border: 3px solid red; + background: lime; } + +/*Calendar*/ +.smallText { + font-size: xx-small; +} + +.largeText { + font-size: xx-large; +} + +.Selecteddayclass { + background-color: #0087FF; +} + +/*Data FilterSlider*/ +.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; +} + +/*Drag and drop*/ +.dropzoneDecoration { + width: 70px; + height: 70px; + border: 2px dotted navy; +} + +.accept { + border: 3px dotted green; + padding: 10px; +} + +.reject { + border: 3px dashed red; + padding: 10px; +} + +.mousemove { + border: 3px dotted green; + padding: 5px; +} + +/*Panel2*/ +.panel { + vertical-align: top; +} + +.rich-panel-header { + color: #F00 !important; +} + +.top { + width: 200px !important; + height: 100px !important; +} + +.hea { + color: #FCC !important; +} + +.bo { + color: #F00 !important; +} + +.top2 { + width: 200px !important; + height: 100px !important; + border: 2px solid #4C9600 !important; + background-color: #E4FFC8 !important; +} + +.hea2 { + background-image: url() !important; + background-color: #4C9600 !important; + height: 18px !important; + text-align: center !important; + vertical-align: middle !important; + color: #CFF !important; + padding: 4px 0 !important; +} + +.bo2 { + color: #4C9600; +} + +.bo3 { + height: 100px; + overflow: auto; +} + +/*TabPanel*/ +.text { + font-size: 20px +} + +.bgc { + border: thick; + background-color: green +} + +/*SimpleTogglePanel*/ +.head { + background-color: aqua; +} + +.body { + background-color: pink; +} \ No newline at end of file

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r3462 - in trunk: cdk/generator/src/main/resources/META-INF/templates12 and 1 other directories.

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

Author: maksimkaszynski Date: 2007-10-22 08:19:12 -0400 (Mon, 22 Oct 2007) New Revision: 3462 Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ComponentBaseBean.java trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml Log: fixed build for suggestion box Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ComponentBaseBean.java =================================================================== --- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ComponentBaseBean.java 2007-10-22 10:51:24 UTC (rev 3461) +++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ComponentBaseBean.java 2007-10-22 12:19:12 UTC (rev 3462) @@ -253,6 +253,7 @@ property.setExist(false); } } + if(null == setter || (! Modifier.isPublic(setter.getModifiers())) ){ getLog().debug("Detect as hidden property "+descriptor.getName()); property.setHidden(true); Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm 2007-10-22 10:51:24 UTC (rev 3461) +++ trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm 2007-10-22 12:19:12 UTC (rev 3462) @@ -23,7 +23,7 @@ // Fields #foreach( $prop in $component.properties ) - #if( !$prop.existintag ) + #if( !$prop.existintag && !$prop.hidden) #if($prop.classname == "javax.el.MethodExpression" || $prop.classname == "javax.faces.el.MethodBinding") #set($type = "MethodExpression") #else @@ -67,7 +67,7 @@ // TODO Auto-generated method stub super.release(); #foreach( $prop in $component.properties ) - #if( !$prop.existintag ) + #if( !$prop.existintag && !$prop.hidden) this._${prop.name} = null; #end #end @@ -82,7 +82,7 @@ super.setProperties(component); ${component.simpleClassName} comp = (${component.simpleClassName}) component; #foreach( $prop in $component.properties ) - #if( !$prop.existintag ) + #if( !$prop.existintag && !$prop.hidden) #if(!$prop.el) if(null != this._${prop.name} && !this._${prop.name}.isLiteralText()){ throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext()) +" not allowed EL expression for property ${prop.name}"); Modified: trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml =================================================================== --- trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml 2007-10-22 10:51:24 UTC (rev 3461) +++ trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml 2007-10-22 12:19:12 UTC (rev 3462) @@ -333,6 +333,10 @@ <classname>java.lang.Object</classname> <description>submitedValue</description> </property> + <property hidden="true" disabled="true"> + <name>upValue</name> + <classname>javax.faces.context.FacesContext</classname> + </property> <property hidden="true"> <name>rows</name> </property> @@ -344,8 +348,6 @@ It isn't selectable and list is closed as always after click on it and nothing is put to input. </description> </property> - <property hidden="true" disabled="true"> - <name>upValue</name> - </property> + </component> </components>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r3461 - trunk/docs/userguide/en/src/main/resources/images.

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

Author: ochikvina Date: 2007-10-22 06:51:24 -0400 (Mon, 22 Oct 2007) New Revision: 3461 Modified: trunk/docs/userguide/en/src/main/resources/images/datascroller3.png Log: http://jira.jboss.com/jira/browse/RF-1008 - adding class to screenshot Modified: trunk/docs/userguide/en/src/main/resources/images/datascroller3.png =================================================================== (Binary files differ)

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r3460 - in trunk: cdk/generator/src/main/java/org/ajax4jsf/builder/config and 37 other directories.

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

Author: nbelaevski Date: 2007-10-21 23:26:53 -0400 (Sun, 21 Oct 2007) New Revision: 3460 Added: trunk/framework/impl/src/main/java/org/richfaces/webapp/ trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/ trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/MethodBindingMethodExpressionAdaptor.java trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/SimpleComponentTag.java trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/ValueBindingValueExpressionAdaptor.java Removed: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/SimpleActionMethodBinding.java trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/UIComponentBodyTagBase.java Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/ant/JSFGeneratorTask.java trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/PropertyBean.java trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/TagBean.java trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/velocity/BuilderContext.java trunk/cdk/generator/src/main/resources/META-INF/schema/component-config.dtd trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_region_attributes.ent trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ui_command_attributes.ent trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ui_input_attributes.ent trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm trunk/cdk/generator/src/main/resources/META-INF/templates/tag.vm trunk/cdk/generator/src/main/resources/META-INF/templates/taghandler.vm trunk/cdk/generator/src/main/resources/META-INF/templates/tagtest.vm trunk/cdk/generator/src/main/resources/META-INF/templates12/component.vm trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm trunk/cdk/generator/src/main/resources/META-INF/templates12/tag.vm trunk/cdk/generator/src/main/resources/META-INF/templates12/taghandler.vm trunk/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm trunk/cdk/generator/src/main/resources/META-INF/templates12/tagtest.vm trunk/cdk/generator/src/main/resources/META-INF/templates12/validatorTag.vm trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateMojo.java trunk/cdk/maven-cdk-plugin/src/main/resources/templates12/tld.vm trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/HtmlComponentTagBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/UIComponentTagBase.java trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.properties trunk/samples/virtualEarth-sample/ trunk/ui/core/pom.xml trunk/ui/core/src/main/config/component/actionParameter.xml trunk/ui/core/src/main/config/component/commandButton.xml trunk/ui/core/src/main/config/component/commandLink.xml trunk/ui/core/src/main/config/component/form.xml trunk/ui/core/src/main/config/component/function.xml trunk/ui/core/src/main/config/component/poll.xml trunk/ui/core/src/main/config/component/push.xml trunk/ui/core/src/main/config/component/repeat.xml trunk/ui/core/src/main/config/component/support.xml trunk/ui/core/src/main/config/taglib/ajax.tld.include trunk/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml trunk/ui/dataTable/src/main/config/component/colgroup.xml trunk/ui/dataTable/src/main/config/component/dataGrid.xml trunk/ui/dataTable/src/main/config/component/dataList.xml trunk/ui/dataTable/src/main/config/component/dataTable.xml trunk/ui/dataTable/src/main/config/component/subTable.xml trunk/ui/datascroller/src/main/config/component/datascroller.xml trunk/ui/drag-drop/src/main/config/component/dragSupport.xml trunk/ui/drag-drop/src/main/config/component/dropSupport.xml trunk/ui/inputnumber-spinner/src/main/config/resources/resources-config.xml trunk/ui/menu-components/src/main/config/component/menucomponents.xml trunk/ui/panel/src/test/java/org/richfaces/taglib/PanelTagTest.java trunk/ui/panelbar/src/main/config/component/panelbar.xml trunk/ui/panelmenu/src/main/config/component/panelMenu.xml trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml trunk/ui/simpleTogglePanel/src/main/config/component/simpleTogglePanel.xml trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/taglib/SimpleTogglePanelTagBase.java trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java trunk/ui/suggestionbox/src/main/java/org/richfaces/taglib/SuggestionBoxTagHandler.java trunk/ui/tabPanel/src/main/config/component/tabPanel.xml trunk/ui/tabPanel/src/main/java/org/richfaces/taglib/TabPanelTagBase.java trunk/ui/togglePanel/src/main/config/component/togglePanel.xml trunk/ui/tree/src/main/config/component/tree.xml Log: switch to JSF 1.2/JSP 2.1 in progress Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/ant/JSFGeneratorTask.java =================================================================== --- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/ant/JSFGeneratorTask.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/ant/JSFGeneratorTask.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -296,7 +296,7 @@ _config.parseConfig(new File(getConfigs().getDir(getProject()),file)); } } - _config.checkComopnentProperties(); + _config.checkComponentProperties(); } catch (ParsingException e) { e.printStackTrace(); throw new BuildException("Error building ", e); Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java =================================================================== --- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -400,7 +400,7 @@ * classpath to find user components, renderers, tags * @throws ConfigurationException */ - public void checkComopnentProperties() throws ParsingException { + public void checkComponentProperties() throws ParsingException { // ClassLoader loader = getProject().createClassLoader(classpath); // if(null == loader) { // loader = this.getClass().getClassLoader(); @@ -433,9 +433,7 @@ listenerProperty.setElonly(true); listenerProperty.setAttachedstate(true); listenerProperty.setMethodargs(listener - .getEventclass() - + ".class"); - + .getEventclass()); listener.addSuitableComponent(bean); } } Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/PropertyBean.java =================================================================== --- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/PropertyBean.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/PropertyBean.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -98,17 +98,27 @@ private String _methodargs = null; /** + * Return type for {@link javax.faces.el.MethodBinding} + * or other reflection-based properties. + * instanses of calls. + */ + private String _returntype = null; + + /** * Indicate what this property Required for component. */ private boolean _required = false; - + static { defaults = new HashMap<String,String>(); - defaults.put("boolean","false"); - defaults.put("int","Integer.MIN_VALUE"); - defaults.put("long","Long.MIN_VALUE"); - defaults.put("float","Float.MIN_VALUE"); - defaults.put("double","Double.MIN_VALUE"); + defaults.put(Boolean.TYPE.getName(),"false"); + defaults.put(Byte.TYPE.getName(), "Byte.MIN_VALUE"); + defaults.put(Character.TYPE.getName(), "Character.MIN_VALUE"); + defaults.put(Integer.TYPE.getName(), "Integer.MIN_VALUE"); + defaults.put(Long.TYPE.getName(), "Long.MIN_VALUE"); + defaults.put(Float.TYPE.getName(), "Float.MIN_VALUE"); + defaults.put(Double.TYPE.getName(), "Double.MIN_VALUE"); + defaults.put(Short.TYPE.getName(), "Short.MIN_VALUE"); } /** @@ -243,13 +253,23 @@ public String getMethodArgsClasses(){ if(null != this._methodargs){ StringBuffer result = new StringBuffer(); - String[] classes = SEPARATOR_PATTERN.split(this._methodargs); + String[] classes = SEPARATOR_PATTERN.split(this._methodargs.trim()); for (int i = 0; i < classes.length; i++) { String argumentClass = classes[i]; - if(i!=0){ - result.append(','); + + if (argumentClass.length() != 0) { + if(i!=0){ + result.append(','); + } + result.append(argumentClass).append(".class"); + } else { + if (classes.length == 1) { + //no arguments + break; + } else { + throw new IllegalArgumentException("Error parsing methodargs: " + this._methodargs); + } } - result.append(argumentClass).append(".class"); } return result.toString(); } else { @@ -321,7 +341,7 @@ if (null != getClassname()) { return super.getSimpleClassName(); } - return "void"; + return Void.TYPE.getName(); } /** @@ -342,6 +362,17 @@ } + public String getReturntype() { + if (null != _returntype) { + return _returntype; + } + return Void.TYPE.getName(); + } + + public void setReturntype(String _returntype) { + this._returntype = _returntype; + } + public boolean isSimpleType() { return defaults.containsKey(getClassname()); } @@ -352,7 +383,7 @@ if("Int".equals(name)){ name="Integer"; } else if("Char".equals(name)){ - name="Charter"; + name="Character"; } return name; } Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/TagBean.java =================================================================== --- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/TagBean.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/TagBean.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -42,7 +42,7 @@ */ public TagBean() { super(); - setSuperclass("com.exadel.vcp.framework.taglib.UIComponentTagBase"); + setSuperclass("org.ajax4jsf.webapp.taglib.UIComponentTagBase"); } /** Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/velocity/BuilderContext.java =================================================================== --- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/velocity/BuilderContext.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/velocity/BuilderContext.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -50,7 +50,7 @@ Properties velocityProperties = new Properties(); try { velocityProperties.load(BuilderContext.class.getClassLoader() - .getResourceAsStream(TEMPLATES_PATH+"/velocity.properties")); + .getResourceAsStream(TEMPLATES12_PATH+"/velocity.properties")); } catch (Exception e) { e.printStackTrace(); } Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/component-config.dtd =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/schema/component-config.dtd 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/schema/component-config.dtd 2007-10-22 03:26:53 UTC (rev 3460) @@ -88,7 +88,7 @@ <!ELEMENT properties ((include|properties|property)*)>  -<!ELEMENT property (name,classname?,description?,defaultvalue?,methodargs?,alias*)> +<!ELEMENT property (name,classname?,description?,defaultvalue?,methodargs?,returntype?,alias*)>  <!ELEMENT defaultvalue (#PCDATA)> @@ -96,6 +96,9 @@  <!ELEMENT methodargs (#PCDATA)> + +<!ELEMENT returntype (#PCDATA)> +  <!ELEMENT alias (#PCDATA)> @@ -246,4 +249,4 @@ <!ENTITY standard_select_one_listbox_attributes PUBLIC "standard_select_one_listbox_attributes" "entities/standard_select_one_listbox_attributes.ent"> <!ENTITY standard_select_one_menu_attributes PUBLIC "standard_select_one_menu_attributes" "entities/standard_select_one_menu_attributes.ent"> <!ENTITY standard_select_one_radio_attributes PUBLIC "standard_select_one_radio_attributes" "entities/standard_select_one_radio_attributes.ent"> ---> \ No newline at end of file +--> Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_region_attributes.ent =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_region_attributes.ent 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_region_attributes.ent 2007-10-22 03:26:53 UTC (rev 3460) @@ -3,7 +3,7 @@ <name>ajaxListener</name> <defaultvalue>null</defaultvalue> <classname>javax.faces.el.MethodBinding</classname> - <methodargs>org.ajax4jsf.event.AjaxEvent.class</methodargs> + <methodargs>org.ajax4jsf.event.AjaxEvent</methodargs> <description> MethodBinding representing an action listener method that will be notified when this component is activated by the ajax Request and handle it. The expression must evaluate to a public method that takes an AjaxEvent parameter, with a return type of void</description> </property> <property hidden="true"> Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent 2007-10-22 03:26:53 UTC (rev 3460) @@ -24,13 +24,13 @@ <classname>java.lang.String</classname> <description>A JavaScript event handler called after a drag operation</description> </property> - <property elonly="true" attachedstate="true"> - <name>dragListener</name> - <classname>javax.faces.el.MethodBinding</classname> - <description> - MethodBinding representing an listener method that will be notified afrer drag operation. - </description> - <methodargs>org.ajax4jsf.event.DragEvent.class</methodargs> - </property> + <property elonly="true" attachedstate="true"> + <name>dragListener</name> + <classname>javax.faces.el.MethodBinding</classname> + <description> + MethodBinding representing an listener method that will be notified afrer drag operation. + </description> + <methodargs>org.ajax4jsf.event.DragEvent</methodargs> + </property> </properties> Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent 2007-10-22 03:26:53 UTC (rev 3460) @@ -43,6 +43,6 @@ MethodBinding representing an action listener method that will be notified afrer drop operation ]]> </description> - <methodargs>org.ajax4jsf.event.DropEvent.class</methodargs> + <methodargs>org.ajax4jsf.event.DropEvent</methodargs> </property> </properties> Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ui_command_attributes.ent =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ui_command_attributes.ent 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ui_command_attributes.ent 2007-10-22 03:26:53 UTC (rev 3460) @@ -13,6 +13,7 @@ processing lifecycle, depending on the value of the immediate property </description> + <returntype>java.lang.Object</returntype> <methodargs> </methodargs> </property> <property elonly="true" attachedstate="true"> @@ -21,7 +22,7 @@ <description> MethodBinding pointing at method accepting an ActionEvent with return type void </description> - <methodargs>javax.faces.event.ActionEvent.class</methodargs> + <methodargs>javax.faces.event.ActionEvent</methodargs> </property> <property> <name>immediate</name> Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ui_input_attributes.ent =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ui_input_attributes.ent 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ui_input_attributes.ent 2007-10-22 03:26:53 UTC (rev 3460) @@ -20,7 +20,7 @@ <property attachedstate="true"> <name>validator</name> <classname>javax.faces.el.MethodBinding</classname> - <methodargs> </methodargs> + <methodargs>javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.Object</methodargs> <description> MethodBinding pointing at a method that is called during Process Validations phase of the request processing lifecycle, @@ -30,7 +30,7 @@ <property attachedstate="true"> <name>valueChangeListener</name> <classname>javax.faces.el.MethodBinding</classname> - <methodargs> </methodargs> + <methodargs>javax.faces.event.ValueChangeEvent</methodargs> <description>Listener for value changes</description> </property> Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm 2007-10-22 03:26:53 UTC (rev 3460) @@ -99,7 +99,7 @@ if (isValueReference(this._${prop.name})) { MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name}, - new Class[]{${prop.methodargs}}); + new Class[]{${prop.methodArgsClasses}}); ((${component.simpleClassName})component).${prop.setterName}(mb); } else Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/tag.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates/tag.vm 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/templates/tag.vm 2007-10-22 03:26:53 UTC (rev 3460) @@ -116,7 +116,7 @@ if (isValueReference(this._${prop.name})) { MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name}, - new Class[]{${prop.methodargs}}); + new Class[]{${prop.methodArgsClasses}}); ((${component.simpleClassName})component).${prop.setterName}(mb); } else Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/taghandler.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates/taghandler.vm 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/templates/taghandler.vm 2007-10-22 03:26:53 UTC (rev 3460) @@ -75,7 +75,7 @@ static class ${prop.name}Mapper extends Metadata { - private static final Class[] SIGNATURE = new Class[] {${prop.methodargs}}; + private static final Class[] SIGNATURE = new Class[] {${prop.methodArgsClasses}}; private final TagAttribute _action; /** Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/tagtest.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates/tagtest.vm 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/templates/tagtest.vm 2007-10-22 03:26:53 UTC (rev 3460) @@ -144,7 +144,7 @@ if (isValueReference(this._${prop.name})) { MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name}, - new Class[]{${prop.methodargs}}); + new Class[]{${prop.methodArgsClasses}}); ((${component.simpleClassName})component).${prop.setterName}(mb); } else Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/component.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates12/component.vm 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/templates12/component.vm 2007-10-22 03:26:53 UTC (rev 3460) @@ -10,14 +10,9 @@ #end import javax.faces.context.FacesContext; -import javax.faces.el.ValueBinding; -#if(${generator.key}) +import javax.el.ValueExpression; +import javax.el.ELException; -import java.io.IOException; -import javax.faces.FacesException; -import org.ajax4jsf.framework.util.base64.Codec; -#end - /** * Component-Type ${component.name} * Component-Family ${component.family} @@ -87,9 +82,9 @@ if(this._${prop.name}Set){ return this._${prop.name}; } - ValueBinding vb = getValueBinding("${prop.name}"); - if (vb != null) { - ${prop.boxingClass} value = (${prop.boxingClass}) vb.getValue(getFacesContext()); + ValueExpression ve = getValueExpression("${prop.name}"); + if (ve != null) { + ${prop.boxingClass} value = (${prop.boxingClass}) ve.getValue(getFacesContext().getELContext()); if (null == value) { return this._${prop.name}; } @@ -101,11 +96,11 @@ if (null != this._${prop.name}) { return this._${prop.name}; - #if( !$prop.isInstanceof("javax.faces.el.MethodBinding") && !$prop.isInstanceof("javax.faces.el.ValueBinding")) + #if( !$prop.isInstanceof("javax.el.MethodExpression") && !$prop.isInstanceof("javax.el.ValueExpression")) } - ValueBinding vb = getValueBinding("${prop.name}"); - if (null != vb){ - return (${prop.simpleClassName})vb.getValue(getFacesContext()); + ValueExpression ve = getValueExpression("${prop.name}"); + if (null != ve){ + return (${prop.simpleClassName})ve.getValue(getFacesContext().getELContext()); #end } else { return ${prop.defaultvalue}; Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm 2007-10-22 03:26:53 UTC (rev 3460) @@ -7,7 +7,16 @@ #foreach($import in $imports) import $import ; #end + +import javax.el.ELException; +import javax.faces.FacesException; import javax.faces.component.UIComponent; +import javax.el.MethodExpression; +import javax.faces.el.MethodBinding; +import javax.faces.el.ValueBinding; +import javax.el.ValueExpression; +import org.richfaces.webapp.taglib.MethodBindingMethodExpressionAdaptor; +import org.richfaces.webapp.taglib.ValueBindingValueExpressionAdaptor; import ${component.classname}; public class $tag.simpleClassName extends $tag.superclass { @@ -15,42 +24,39 @@ // Fields #foreach( $prop in $component.properties ) #if( !$prop.existintag ) + #if($prop.classname == "javax.el.MethodExpression" || $prop.classname == "javax.faces.el.MethodBinding") + #set($type = "MethodExpression") + #else + #set($type = "ValueExpression") + #end + /* * $prop.name * ${prop.xmlEncodedDescription} */ - private String _$prop.name = null; - - #end -#end -// Setters -#foreach( $prop in $component.properties ) - #if( !$prop.existintag ) - /* - * $prop.name - * ${prop.xmlEncodedDescription} - */ + private $type _${prop.name}; /** * $prop.description * Setter for $prop.name * @param $prop.name - new value */ - public void ${prop.setterName}( String __${prop.name} ){ + public void ${prop.setterName}( $type __${prop.name} ){ this._${prop.name} = __${prop.name}; } - - #end + #if( $prop.alias) /** * ${prop.xmlEncodedDescription} * Setter for alias of $prop.name as $prop.alias * @param $prop.name - new value */ - public void set${prop.upperFirstChar($prop.alias)}( String __${prop.alias} ){ + public void set${prop.upperFirstChar($prop.alias)}( $type __${prop.alias} ){ this.${prop.setterName}(__${prop.alias}); } #end -#end + #end +#end + // Release /* (non-Javadoc) @@ -74,32 +80,36 @@ { // TODO Auto-generated method stub super.setProperties(component); - + ${component.simpleClassName} comp = (${component.simpleClassName}) component; #foreach( $prop in $component.properties ) #if( !$prop.existintag ) #if(!$prop.el) - if(null != this._${prop.name} && isValueReference(this._${prop.name})){ + if(null != this._${prop.name} && !this._${prop.name}.isLiteralText()){ throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext()) +" not allowed EL expression for property ${prop.name}"); } - #end + #end + + #if($prop.elonly) + if(null != this._${prop.name} && this._${prop.name}.isLiteralText()){ + throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext()) +" allows only EL expressions for property ${prop.name}"); + } + #end + #if($prop.name == "action") - setActionProperty(component, this._${prop.name}); + setActionProperty(comp, this._${prop.name}); #elseif($prop.name == "actionListener") - setActionListenerProperty(component, this._${prop.name}); + setActionListenerProperty(comp, this._${prop.name}); #elseif($prop.name == "converter") - setConverterProperty(component, this._${prop.name}); + setConverterProperty(comp, this._${prop.name}); #elseif($prop.name == "validator") - setValidatorProperty(component, this._${prop.name}); + setValidatorProperty(comp, this._${prop.name}); #elseif($prop.name == "valueChangeListener") - setValueChangedListenerProperty(component, this._${prop.name}); - #elseif($prop.name == "value") - setValueProperty(component, this._${prop.name}); + setValueChangeListenerProperty(comp, this._${prop.name}); #elseif( $prop.isInstanceof("javax.faces.el.MethodBinding") ) if(null != this._${prop.name}){ - if (isValueReference(this._${prop.name})) + if (!this._${prop.name}.isLiteralText()) { - MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name}, - new Class[]{${prop.methodargs}}); + MethodBinding mb = new MethodBindingMethodExpressionAdaptor(this._${prop.name}); ((${component.simpleClassName})component).${prop.setterName}(mb); } else @@ -107,21 +117,43 @@ getFacesContext().getExternalContext().log("Component " + component.getClientId(getFacesContext()) + " has invalid ${prop.name} value: " + this._${prop.name}); } } - #elseif($prop.elonly || $prop.isInstanceof("javax.faces.el.ValueBinding") ) - setValueBinding(component, "${prop.name}",this._${prop.name}); - #elseif(${prop.simpleType}) - // Simple type - ${prop.simpleClassName} - set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name}); - #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long") - set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name}); - #elseif( $prop.classname == "java.lang.String") - setStringProperty(component, "${prop.name}",this._${prop.name}); - #elseif( $prop.classname == "java.lang.Object") - // TODO - handle object - setStringProperty(component, "${prop.name}",this._${prop.name}); + #elseif($prop.isInstanceof("javax.faces.el.ValueBinding") ) + if(null != this._${prop.name}){ + ValueBinding vb = new ValueBindingValueExpressionAdaptor(this._${prop.name}); + ((${component.simpleClassName})component).${prop.setterName}(vb); + } + #elseif($prop.isInstanceof("javax.el.MethodExpression") ) + if(null != this._${prop.name}){ + ((${component.simpleClassName})component).${prop.setterName}(this._${prop.name}); + } #else - // TODO - setup properties for other cases. - // name ${prop.name} with type $prop.classname + if (this._${prop.name} != null) { + if (this._${prop.name}.isLiteralText()) { + try { + #if (${prop.simpleType}) + #set ($propertyClass = ${prop.boxingClass}) + #else + #set ($propertyClass = ${prop.classname}) + #end + + $propertyClass __${prop.name} = ($propertyClass) getFacesContext(). + getApplication(). + getExpressionFactory(). + coerceToType(this._${prop.name}.getExpressionString(), + ${propertyClass}.class); + + #if (${prop.simpleType}) + comp.${prop.setterName}(__${prop.name}.${prop.classname}Value()); + #else + comp.${prop.setterName}(__${prop.name}); + #end + } catch (ELException e) { + throw new FacesException(e); + } + } else { + component.setValueExpression("${prop.name}", this._${prop.name}); + } + } #end #end #end Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/tag.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates12/tag.vm 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/templates12/tag.vm 2007-10-22 03:26:53 UTC (rev 3460) @@ -96,7 +96,7 @@ #elseif($prop.name == "validator") setValidatorProperty(component, this._${prop.name}); #elseif($prop.name == "valueChangeListener") - setValueChangedListenerProperty(component, this._${prop.name}); + setValueChangeListenerProperty(component, this._${prop.name}); #elseif($prop.name == "value") setValueProperty(component, this._${prop.name}); #elseif($prop.elonly || $prop.isInstanceof("javax.faces.el.ValueBinding") ) @@ -116,7 +116,7 @@ if (isValueReference(this._${prop.name})) { MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name}, - new Class[]{${prop.methodargs}}); + new Class[]{${prop.methodArgsClasses}}); ((${component.simpleClassName})component).${prop.setterName}(mb); } else Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/taghandler.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates12/taghandler.vm 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/templates12/taghandler.vm 2007-10-22 03:26:53 UTC (rev 3460) @@ -75,7 +75,7 @@ static class ${prop.name}Mapper extends Metadata { - private static final Class[] SIGNATURE = new Class[] {${prop.methodargs}}; + private static final Class[] SIGNATURE = new Class[] {${prop.methodArgsClasses}}; private final TagAttribute _action; /** Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm 2007-10-22 03:26:53 UTC (rev 3460) @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" - "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"> -<taglib> + +<taglib xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_${taglib.jspversion.r...'.', '_')}.xsd" + version="${taglib.jspversion}"> <tlib-version>${taglib.tlibversion}</tlib-version> - <jsp-version>${taglib.jspversion}</jsp-version> +## <jsp-version>${taglib.jspversion}</jsp-version> #if(${taglib.shortname}) <short-name>${taglib.shortname}</short-name> #end @@ -16,28 +18,40 @@ #foreach( $component in ${components}) #if($component.tag) <tag> - <name>${component.tag.name}</name> - <tag-class>${component.tag.classname}</tag-class> - <body-content>${component.tag.bodyContent}</body-content> - #if(${component.tag.displayname}) - <display-name>${component.tag.xmlEncodedDisplayname}</display-name> - #elseif(${component.displayname}) - <display-name>${component.xmlEncodedDisplayname}</display-name> - #end #if(${component.tag.description}) <description>${component.tag.xmlEncodedDescription}</description> #else <description>${component.xmlEncodedDescription}</description> #end + #if(${component.tag.displayname}) + <display-name>${component.tag.xmlEncodedDisplayname}</display-name> + #elseif(${component.displayname}) + <display-name>${component.xmlEncodedDisplayname}</display-name> + #end + <name>${component.tag.name}</name> + <tag-class>${component.tag.classname}</tag-class> + <body-content>${component.tag.bodyContent}</body-content> #foreach( $prop in ${component.properties} ) #if( !${prop.hidden} && !${prop.disabled} ) <attribute> + <description>${prop.xmlEncodedDescription}</description> <name>${prop.name}</name> #if(${prop.required}) <required>true</required> #end - <rtexprvalue>false</rtexprvalue> - <description>${prop.xmlEncodedDescription}</description> + #if(${prop.el}) + #if( !$prop.isInstanceof("javax.faces.el.MethodBinding") ) + <deferred-value> + <type>${prop.classname}</type> + </deferred-value> + #else + <deferred-method> + <method-signature>${prop.returntype} ${prop.name}(${prop.methodargs})</method-signature> + </deferred-method> + #end + #else + <rtexprvalue>false</rtexprvalue> + #end </attribute> #if( $prop.alias ) <attribute> @@ -133,11 +147,7 @@ #foreach( $listener in ${listeners}) #if($listener.tag) <tag> - #if($listener.tag.name) <name>${listener.tag.name}</name> - #else - <name>${listener.name}</name> - #end <tag-class>${listener.tag.classname}</tag-class> <body-content>${listener.tag.bodyContent}</body-content> #if(${listener.tag.displayname}) @@ -150,24 +160,6 @@ #elseif(${listener.xmlEncodedDescription}) <description>${listener.xmlEncodedDescription}</description> #end - - <attribute> - <name>type</name> - <rtexprvalue>false</rtexprvalue> - <description> - Attribute defines the fully qualified Java class name for listener - </description> - </attribute> - - <attribute> - <name>binding</name> - <rtexprvalue>false</rtexprvalue> - <description> - The attribute takes a value-binding expression for a component property of a backing bean - </description> - </attribute> - - #foreach( $prop in ${listener.properties} ) #if( !${prop.hidden} && !${prop.disabled} ) <attribute> @@ -192,4 +184,4 @@ #end -</taglib> \ No newline at end of file +</taglib> Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/tagtest.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates12/tagtest.vm 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/templates12/tagtest.vm 2007-10-22 03:26:53 UTC (rev 3460) @@ -124,7 +124,7 @@ #elseif($prop.name == "validator") setValidatorProperty(component, this._${prop.name}); #elseif($prop.name == "valueChangeListener") - setValueChangedListenerProperty(component, this._${prop.name}); + setValueChangeListenerProperty(component, this._${prop.name}); #elseif($prop.name == "value") setValueProperty(component, this._${prop.name}); #elseif($prop.elonly || $prop.isInstanceof("javax.faces.el.ValueBinding") ) @@ -144,7 +144,7 @@ if (isValueReference(this._${prop.name})) { MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name}, - new Class[]{${prop.methodargs}}); + new Class[]{${prop.methodArgsClasses}}); ((${component.simpleClassName})component).${prop.setterName}(mb); } else Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/validatorTag.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates12/validatorTag.vm 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/generator/src/main/resources/META-INF/templates12/validatorTag.vm 2007-10-22 03:26:53 UTC (rev 3460) @@ -18,10 +18,7 @@ public class $tag.simpleClassName extends $tag.superclass { - //private String validatorId = "${validator.id}"; - - -// Fields + // Fields #foreach( $prop in $validator.properties ) #if( !$prop.existintag ) /* Modified: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -198,12 +198,16 @@ library.setRenderkits(renderkits); } Taglib taglib = library.getTaglib(); - if (null == taglib) { + if (null != taglib) { + getLog().debug("Taglib uri is " + taglib.getUri()); + getLog().debug("Taglib shortname is " + taglib.getShortName()); + } else { taglib = new Taglib(); library.setTaglib(taglib); } if (null == taglib.getDisplayName()) { taglib.setDisplayName(project.getDescription()); + } if( null == taglib.getJspVersion()){ // Jsf 1.2 can use JSP 2.1 only, other - 2.0 @@ -312,4 +316,4 @@ } -} \ No newline at end of file +} Modified: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateMojo.java =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateMojo.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateMojo.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -252,7 +252,7 @@ for (int i = 0; i < files.length; i++) { builderConfig.parseConfig(files[i]); } - builderConfig.checkComopnentProperties(); + builderConfig.checkComponentProperties(); return builderConfig; } Modified: trunk/cdk/maven-cdk-plugin/src/main/resources/templates12/tld.vm =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/resources/templates12/tld.vm 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/cdk/maven-cdk-plugin/src/main/resources/templates12/tld.vm 2007-10-22 03:26:53 UTC (rev 3460) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" - "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"> -<taglib> - <tlib-version>${taglib.tlibVersion}</tlib-version> - <jsp-version>${taglib.jspVersion}</jsp-version> + +<taglib xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd" + xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="${library.taglib.jspVersion}"> + +<tlib-version>${taglib.tlibVersion}</tlib-version> #if(${taglib.shortName}) <short-name>${taglib.shortName}</short-name> #end @@ -11,8 +11,8 @@ #if(${taglib.displayName}) <display-name>${taglib.displayName}</display-name> #end -#if(${library.description}) - <description>${library.description}</description> +#if(${taglib.description}) + <description>${taglib.description}</description> #end #if(${taglib.validatorClass}) <validator> Modified: trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -256,6 +256,7 @@ public static final String NO_EDITABLE_VALUE_HOLDER_ERROR = "NO_EDITABLE_VALUE_HOLDER_ERROR"; public static final String INVALID_VALIDATION_EXPRESSION = "INVALID_VALIDATION_EXPRESSION"; public static final String NO_ACTION_SOURCE_ERROR = "NO_ACTION_SOURCE_ERROR"; + public static final String NO_ACTION_SOURCE2_ERROR = "NO_ACTION_SOURCE2_ERROR"; public static final String INVALID_ACTION_LISTENER = "INVALID_ACTION_LISTENER"; public static final String INVALID_VALUE_CHANGE_LISTENER = "INVALID_VALUE_CHANGE_LISTENER"; public static final String NO_VALUE_REFERENCE_ERROR = "NO_VALUE_REFERENCE_ERROR"; Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/HtmlComponentTagBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/HtmlComponentTagBase.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/HtmlComponentTagBase.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -21,6 +21,7 @@ package org.ajax4jsf.webapp.taglib; +import javax.el.ValueExpression; import javax.faces.component.UIComponent; import org.ajax4jsf.renderkit.RendererUtils.HTML; @@ -34,23 +35,23 @@ */ public abstract class HtmlComponentTagBase extends UIComponentTagBase { //HTML universal attributes - private String _dir; - private String _lang; - private String _style; - private String _styleClass; - private String _title; + private ValueExpression _dir; + private ValueExpression _lang; + private ValueExpression _style; + private ValueExpression _styleClass; + private ValueExpression _title; //HTML event handler attributes - private String _onclick; - private String _ondblclick; - private String _onkeydown; - private String _onkeypress; - private String _onkeyup; - private String _onmousedown; - private String _onmousemove; - private String _onmouseout; - private String _onmouseover; - private String _onmouseup; + private ValueExpression _onclick; + private ValueExpression _ondblclick; + private ValueExpression _onkeydown; + private ValueExpression _onkeypress; + private ValueExpression _onkeyup; + private ValueExpression _onmousedown; + private ValueExpression _onmousemove; + private ValueExpression _onmouseout; + private ValueExpression _onmouseover; + private ValueExpression _onmouseup; public void release() { super.release(); @@ -76,94 +77,94 @@ protected void setProperties(UIComponent component) { super.setProperties(component); - setStringProperty(component, HTML.dir_ATTRIBUTE, _dir); - setStringProperty(component, HTML.lang_ATTRIBUTE, _lang); - setStringProperty(component, HTML.style_ATTRIBUTE, _style); - setStringProperty(component, HTML.title_ATTRIBUTE, _title); - setStringProperty(component, HTML.STYLE_CLASS_ATTR, _styleClass); - setStringProperty(component, HTML.onclick_ATTRIBUTE, _onclick); - setStringProperty(component, HTML.ondblclick_ATTRIBUTE, _ondblclick); - setStringProperty(component, HTML.onmousedown_ATTRIBUTE, _onmousedown); - setStringProperty(component, HTML.onmouseup_ATTRIBUTE, _onmouseup); - setStringProperty(component, HTML.onmouseover_ATTRIBUTE, _onmouseover); - setStringProperty(component, HTML.onmousemove_ATTRIBUTE, _onmousemove); - setStringProperty(component, HTML.onmouseout_ATTRIBUTE, _onmouseout); - setStringProperty(component, HTML.onkeypress_ATTRIBUTE, _onkeypress); - setStringProperty(component, HTML.onkeydown_ATTRIBUTE, _onkeydown); - setStringProperty(component, HTML.onkeyup_ATTRIBUTE, _onkeyup); + component.setValueExpression(HTML.dir_ATTRIBUTE, _dir); + component.setValueExpression(HTML.lang_ATTRIBUTE, _lang); + component.setValueExpression(HTML.style_ATTRIBUTE, _style); + component.setValueExpression(HTML.title_ATTRIBUTE, _title); + component.setValueExpression(HTML.STYLE_CLASS_ATTR, _styleClass); + component.setValueExpression(HTML.onclick_ATTRIBUTE, _onclick); + component.setValueExpression(HTML.ondblclick_ATTRIBUTE, _ondblclick); + component.setValueExpression(HTML.onmousedown_ATTRIBUTE, _onmousedown); + component.setValueExpression(HTML.onmouseup_ATTRIBUTE, _onmouseup); + component.setValueExpression(HTML.onmouseover_ATTRIBUTE, _onmouseover); + component.setValueExpression(HTML.onmousemove_ATTRIBUTE, _onmousemove); + component.setValueExpression(HTML.onmouseout_ATTRIBUTE, _onmouseout); + component.setValueExpression(HTML.onkeypress_ATTRIBUTE, _onkeypress); + component.setValueExpression(HTML.onkeydown_ATTRIBUTE, _onkeydown); + component.setValueExpression(HTML.onkeyup_ATTRIBUTE, _onkeyup); } - public void setStyleClass(String styleClass) + public void setStyleClass(ValueExpression styleClass) { _styleClass = styleClass; } - public void setDir(String dir) + public void setDir(ValueExpression dir) { _dir = dir; } - public void setLang(String lang) + public void setLang(ValueExpression lang) { _lang = lang; } - public void setStyle(String style) + public void setStyle(ValueExpression style) { _style = style; } - public void setTitle(String title) + public void setTitle(ValueExpression title) { _title = title; } - public void setOnclick(String onclick) + public void setOnclick(ValueExpression onclick) { _onclick = onclick; } - public void setOndblclick(String ondblclick) + public void setOndblclick(ValueExpression ondblclick) { _ondblclick = ondblclick; } - public void setOnmousedown(String onmousedown) + public void setOnmousedown(ValueExpression onmousedown) { _onmousedown = onmousedown; } - public void setOnmouseup(String onmouseup) + public void setOnmouseup(ValueExpression onmouseup) { _onmouseup = onmouseup; } - public void setOnmouseover(String onmouseover) + public void setOnmouseover(ValueExpression onmouseover) { _onmouseover = onmouseover; } - public void setOnmousemove(String onmousemove) + public void setOnmousemove(ValueExpression onmousemove) { _onmousemove = onmousemove; } - public void setOnmouseout(String onmouseout) + public void setOnmouseout(ValueExpression onmouseout) { _onmouseout = onmouseout; } - public void setOnkeypress(String onkeypress) + public void setOnkeypress(ValueExpression onkeypress) { _onkeypress = onkeypress; } - public void setOnkeydown(String onkeydown) + public void setOnkeydown(ValueExpression onkeydown) { _onkeydown = onkeydown; } - public void setOnkeyup(String onkeyup) + public void setOnkeyup(ValueExpression onkeyup) { _onkeyup = onkeyup; } Deleted: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/SimpleActionMethodBinding.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/SimpleActionMethodBinding.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/SimpleActionMethodBinding.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -1,93 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.webapp.taglib; - -import javax.faces.component.StateHolder; -import javax.faces.context.FacesContext; -import javax.faces.el.EvaluationException; -import javax.faces.el.MethodBinding; -import javax.faces.el.MethodNotFoundException; - -/** - * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:59:56 $ - * - */ -/** - * Simple method binding for constant action outcome. - * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:59:56 $ - * - */ -public class SimpleActionMethodBinding extends MethodBinding implements StateHolder { - // private static final Log log = - // LogFactory.getLog(SimpleActionMethodBinding.class); - - private String _outcome; - - public SimpleActionMethodBinding(String outcome) { - _outcome = outcome; - } - - public Object invoke(FacesContext facescontext, Object aobj[]) - throws EvaluationException, MethodNotFoundException { - return _outcome; - } - - public Class getType(FacesContext facescontext) - throws MethodNotFoundException { - return String.class; - } - - // ~ StateHolder support - // ---------------------------------------------------------------------------- - - private boolean _transient = false; - - /** - * Empty constructor, so that new instances can be created when restoring - * state. - */ - public SimpleActionMethodBinding() { - _outcome = null; - } - - public Object saveState(FacesContext facescontext) { - return _outcome; - } - - public void restoreState(FacesContext facescontext, Object obj) { - _outcome = (String) obj; - } - - public boolean isTransient() { - return _transient; - } - - public void setTransient(boolean flag) { - _transient = flag; - } - - public String toString() { - return _outcome; - } -} Deleted: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/UIComponentBodyTagBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/UIComponentBodyTagBase.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/UIComponentBodyTagBase.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -1,382 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.webapp.taglib; - -import javax.faces.component.ActionSource; -import javax.faces.component.EditableValueHolder; -import javax.faces.component.UICommand; -import javax.faces.component.UIComponent; -import javax.faces.component.UIGraphic; -import javax.faces.component.UIParameter; -import javax.faces.component.UISelectBoolean; -import javax.faces.component.ValueHolder; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.el.MethodBinding; -import javax.faces.el.ValueBinding; -import javax.faces.event.ActionEvent; -import javax.faces.event.ValueChangeEvent; -import javax.faces.webapp.UIComponentBodyTag; - -import org.ajax4jsf.Messages; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Base class with utility functions for all JSF tags. Get from apache MyFaces - * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:59:55 $ - * - */ -public abstract class UIComponentBodyTagBase extends UIComponentBodyTag { - - //Special UIComponent attributes (ValueHolder, ConvertibleValueHolder) - private String _value; - private String _converter; - //attributes id, rendered and binding are handled by UIComponentTag - - /** - * @param converter The converter to set. - */ - public void setConverter(String converter) { - _converter = converter; - } - - /** - * @param value The value to set. - */ - public void setValue(String value) { - _value = value; - } - - public void release() { - super.release(); - - _value=null; - _converter=null; - } - - protected void setProperties(UIComponent component) - { - super.setProperties(component); - - - //rendererType already handled by UIComponentTag - - setValueProperty(component, _value); - setConverterProperty(component, _converter); - } - - // sub class helpers - private static final Log log = LogFactory.getLog(UIComponentBodyTagBase.class); - - private static final Class[] VALIDATOR_ARGS = {FacesContext.class, - UIComponent.class, - Object.class}; - private static final Class[] ACTION_LISTENER_ARGS = {ActionEvent.class}; - private static final Class[] VALUE_LISTENER_ARGS = {ValueChangeEvent.class}; - - protected void setCharterProperty(UIComponent component, String propName, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - //FIXME: should use converter maybe? - component.getAttributes().put(propName, new Character(value.charAt(0))); - } - } - } - protected void setIntegerProperty(UIComponent component, String propName, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - //FIXME: should use converter maybe? - component.getAttributes().put(propName, Integer.valueOf(value)); - } - } - } - - protected void setLongProperty(UIComponent component, String propName, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - //FIXME: should use converter maybe? - component.getAttributes().put(propName, Long.valueOf(value)); - } - } - } - - protected void setFloatProperty(UIComponent component, String propName, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - //FIXME: should use converter maybe? - component.getAttributes().put(propName, Float.valueOf(value)); - } - } - } - protected void setDoubleProperty(UIComponent component, String propName, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - //FIXME: should use converter maybe? - component.getAttributes().put(propName, Double.valueOf(value)); - } - } - } - - protected void setStringProperty(UIComponent component, String propName, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - //TODO: Warning if component has no such property (with reflection) - component.getAttributes().put(propName, value); - } - } - } - - protected void setBooleanProperty(UIComponent component, String propName, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - //TODO: More sophisticated way to convert boolean value (yes/no, 1/0, on/off, etc.) - component.getAttributes().put(propName, Boolean.valueOf(value)); - } - } - } - - protected void setValueProperty(UIComponent component, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding("value", vb); - } - else if (component instanceof UICommand) - { - ((UICommand)component).setValue(value); - } - else if (component instanceof UIParameter) - { - ((UIParameter)component).setValue(value); - } - else if (component instanceof UISelectBoolean) - { - ((UISelectBoolean)component).setValue(Boolean.valueOf(value)); - } - else if (component instanceof UIGraphic) - { - ((UIGraphic)component).setValue(value); - } - //Since many input components are ValueHolders the special components - //must come first, ValueHolder is the last resort. - else if (component instanceof ValueHolder) - { - ((ValueHolder)component).setValue(value); - } - else - { - log.error(Messages.getMessage(Messages.NO_VALUE_HOLDER_ERROR, component.getClass().getName())); - } - } - } - - protected void setConverterProperty(UIComponent component, String value) - { - if (value != null) - { - if (component instanceof ValueHolder) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding("converter", vb); - } - else - { - FacesContext facesContext = FacesContext.getCurrentInstance(); - Converter converter = facesContext.getApplication().createConverter(value); - ((ValueHolder)component).setConverter(converter); - } - } - else - { - log.error(Messages.getMessage(Messages.NO_VALUE_HOLDER_ERROR, component.getClass().getName())); - } - } - } - - protected void setValidatorProperty(UIComponent component, String validator) - { - if (validator != null) - { - if (!(component instanceof EditableValueHolder)) - { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_EDITABLE_VALUE_HOLDER_ERROR, component.getId())); - } - if (isValueReference(validator)) - { - MethodBinding mb = getFacesContext().getApplication().createMethodBinding(validator, - VALIDATOR_ARGS); - ((EditableValueHolder)component).setValidator(mb); - } - else - { - log.error(Messages.getMessage(Messages.INVALID_VALIDATION_EXPRESSION, component.getId(), validator)); - } - } - } - - protected void setActionProperty(UIComponent component, String action) - { - if (action != null) - { - if (!(component instanceof ActionSource)) - { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_ACTION_SOURCE_ERROR, component.getClientId(getFacesContext()))); - } - MethodBinding mb; - if (isValueReference(action)) - { - mb = getFacesContext().getApplication().createMethodBinding(action, null); - } - else - { - mb = new SimpleActionMethodBinding(action); - } - ((ActionSource)component).setAction(mb); - } - } - - protected void setActionListenerProperty(UIComponent component, String actionListener) - { - if (actionListener != null) - { - if (!(component instanceof ActionSource)) - { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_ACTION_SOURCE_ERROR, component.getClientId(getFacesContext()))); - } - if (isValueReference(actionListener)) - { - MethodBinding mb = getFacesContext().getApplication().createMethodBinding(actionListener, - ACTION_LISTENER_ARGS); - ((ActionSource)component).setActionListener(mb); - } - else - { - log.error(Messages.getMessage(Messages.INVALID_ACTION_LISTENER, component.getClientId(getFacesContext()), actionListener)); - } - } - } - - protected void setValueChangedListenerProperty(UIComponent component, String valueChangedListener) - { - if (valueChangedListener != null) - { - if (!(component instanceof EditableValueHolder)) - { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_EDITABLE_VALUE_HOLDER_ERROR, component.getClientId(getFacesContext()))); - } - if (isValueReference(valueChangedListener)) - { - MethodBinding mb = getFacesContext().getApplication().createMethodBinding(valueChangedListener, - VALUE_LISTENER_ARGS); - ((EditableValueHolder)component).setValueChangeListener(mb); - } - else - { - log.error(Messages.getMessage(Messages.INVALID_VALUE_CHANGE_LISTENER, component.getClientId(getFacesContext()), valueChangedListener)); - } - } - } - - protected void setValueBinding(UIComponent component, - String propName, - String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_VALUE_REFERENCE_ERROR, new Object[]{component.getId(), propName, value})); - } - } - } - - - -} Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/UIComponentTagBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/UIComponentTagBase.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/UIComponentTagBase.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -1,383 +1,130 @@ /** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * */ - package org.ajax4jsf.webapp.taglib; -import javax.faces.component.ActionSource; -import javax.faces.component.EditableValueHolder; +import javax.el.ExpressionFactory; +import javax.el.MethodExpression; +import javax.el.ValueExpression; import javax.faces.component.UICommand; import javax.faces.component.UIComponent; import javax.faces.component.UIGraphic; import javax.faces.component.UIParameter; import javax.faces.component.UISelectBoolean; import javax.faces.component.ValueHolder; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.el.MethodBinding; -import javax.faces.el.ValueBinding; import javax.faces.event.ActionEvent; import javax.faces.event.ValueChangeEvent; -import javax.faces.webapp.UIComponentTag; -import org.ajax4jsf.Messages; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.richfaces.webapp.taglib.UIComponentELTagBase; /** - * Base class with utility functions for all JSF tags. Get from apache MyFaces - * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:59:55 $ - * + * @author Maksim Kaszynski + * */ -public abstract class UIComponentTagBase extends UIComponentTag { +public abstract class UIComponentTagBase extends UIComponentELTagBase { - //Special UIComponent attributes (ValueHolder, ConvertibleValueHolder) - private String _value; - private String _converter; - //attributes id, rendered and binding are handled by UIComponentTag + protected ExpressionFactory getExpressionFactory() { + return getFacesContext().getApplication().getExpressionFactory(); + } - /** - * @param converter The converter to set. - */ - public void setConverter(String converter) { - _converter = converter; + protected void setProperty(UIComponent component, Class<?> type, + String propName, String value) { + if (value != null) { + ValueExpression valueExpression = getExpressionFactory() + .createValueExpression(getELContext(), value, type); + + if (valueExpression.isLiteralText()) { + component.getAttributes().put(propName, + getExpressionFactory().coerceToType(value, type)); + } else { + component.setValueExpression(propName, valueExpression); + } + } } - /** - * @param value The value to set. - */ - public void setValue(String value) { - _value = value; + protected void setIntegerProperty(UIComponent component, String propName, + String value) { + setProperty(component, Integer.class, propName, value); } - public void release() { - super.release(); + protected void setLongProperty(UIComponent component, String propName, + String value) { + setProperty(component, Long.class, propName, value); + } - _value=null; - _converter=null; - } + protected void setFloatProperty(UIComponent component, String propName, + String value) { + setProperty(component, Float.class, propName, value); + } - protected void setProperties(UIComponent component) - { - super.setProperties(component); + protected void setDoubleProperty(UIComponent component, String propName, + String value) { + setProperty(component, Double.class, propName, value); + } + protected void setStringProperty(UIComponent component, String propName, + String value) { + setProperty(component, String.class, propName, value); + } - //rendererType already handled by UIComponentTag + protected void setBooleanProperty(UIComponent component, String propName, + String value) { + setProperty(component, Boolean.class, propName, value); + } - setValueProperty(component, _value); - setConverterProperty(component, _converter); - } + protected void setValueProperty(UIComponent component, String value) { + if (value != null) { + ValueExpression expression = getExpressionFactory() + .createValueExpression(getELContext(), value, Object.class); - // sub class helpers - private static final Log log = LogFactory.getLog(UIComponentTagBase.class); + if (!expression.isLiteralText()) { + component.setValueExpression("value", expression); + } else if (component instanceof UICommand) { + ((UICommand) component).setValue(value); + } else if (component instanceof UIParameter) { + ((UIParameter) component).setValue(value); + } else if (component instanceof UISelectBoolean) { + ((UISelectBoolean) component).setValue(Boolean.valueOf(value)); + } else if (component instanceof UIGraphic) { + ((UIGraphic) component).setValue(value); + } + // Since many input components are ValueHolders the special + // components + // must come first, ValueHolder is the last resort. + else if (component instanceof ValueHolder) { + ((ValueHolder) component).setValue(value); + } else { + component.getAttributes().put("value", value); + } + } + } - private static final Class[] VALIDATOR_ARGS = {FacesContext.class, - UIComponent.class, - Object.class}; - private static final Class[] ACTION_LISTENER_ARGS = {ActionEvent.class}; - private static final Class[] VALUE_LISTENER_ARGS = {ValueChangeEvent.class}; - - protected void setCharterProperty(UIComponent component, String propName, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - //FIXME: should use converter maybe? - component.getAttributes().put(propName, new Character(value.charAt(0))); - } + public boolean isValueReference(String s) { + return !getExpressionFactory().createValueExpression(s, Object.class).isLiteralText(); + } + + protected void setActionProperty(UIComponent component, String action) { + if (action != null) { + MethodExpression expression = + getExpressionFactory().createMethodExpression(getELContext(), action, String.class, new Class[] {}); + setActionProperty(component, expression); } } - protected void setIntegerProperty(UIComponent component, String propName, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - //FIXME: should use converter maybe? - component.getAttributes().put(propName, Integer.valueOf(value)); - } - } - } - protected void setLongProperty(UIComponent component, String propName, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - //FIXME: should use converter maybe? - component.getAttributes().put(propName, Long.valueOf(value)); - } + protected void setActionListenerProperty(UIComponent component, String actionListener){ + if (actionListener != null) { + MethodExpression expression = + getExpressionFactory().createMethodExpression(getELContext(), actionListener, String.class, new Class[] {ActionEvent.class}); + setActionListenerProperty(component, expression); } } - protected void setFloatProperty(UIComponent component, String propName, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - //FIXME: should use converter maybe? - component.getAttributes().put(propName, Float.valueOf(value)); - } + protected void setValueChangedListenerProperty(UIComponent component, String valueChangedListener) { + if (valueChangedListener != null) { + MethodExpression expression = + getExpressionFactory().createMethodExpression(getELContext(), valueChangedListener, String.class, new Class[] {ValueChangeEvent.class}); + setValueChangeListenerProperty(component, expression); } } - protected void setDoubleProperty(UIComponent component, String propName, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - //FIXME: should use converter maybe? - component.getAttributes().put(propName, Double.valueOf(value)); - } - } - } - - protected void setStringProperty(UIComponent component, String propName, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - //TODO: Warning if component has no such property (with reflection) - component.getAttributes().put(propName, value); - } - } - } - protected void setBooleanProperty(UIComponent component, String propName, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - //TODO: More sophisticated way to convert boolean value (yes/no, 1/0, on/off, etc.) - component.getAttributes().put(propName, Boolean.valueOf(value)); - } - } - } - - protected void setValueProperty(UIComponent component, String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding("value", vb); - } - else if (component instanceof UICommand) - { - ((UICommand)component).setValue(value); - } - else if (component instanceof UIParameter) - { - ((UIParameter)component).setValue(value); - } - else if (component instanceof UISelectBoolean) - { - ((UISelectBoolean)component).setValue(Boolean.valueOf(value)); - } - else if (component instanceof UIGraphic) - { - ((UIGraphic)component).setValue(value); - } - //Since many input components are ValueHolders the special components - //must come first, ValueHolder is the last resort. - else if (component instanceof ValueHolder) - { - ((ValueHolder)component).setValue(value); - } - else - { - component.getAttributes().put("value", value); - } - } - } - - protected void setConverterProperty(UIComponent component, String value) - { - if (value != null) - { - if (component instanceof ValueHolder) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding("converter", vb); - } - else - { - FacesContext facesContext = FacesContext.getCurrentInstance(); - Converter converter = facesContext.getApplication().createConverter(value); - ((ValueHolder)component).setConverter(converter); - } - } - else - { - log.error(Messages.getMessage(Messages.NO_VALUE_HOLDER_ERROR, component.getClass().getName())); - } - } - } - - protected void setValidatorProperty(UIComponent component, String validator) - { - if (validator != null) - { - if (!(component instanceof EditableValueHolder)) - { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_EDITABLE_VALUE_HOLDER_ERROR, component.getId())); - } - if (isValueReference(validator)) - { - MethodBinding mb = getFacesContext().getApplication().createMethodBinding(validator, - VALIDATOR_ARGS); - ((EditableValueHolder)component).setValidator(mb); - } - else - { - log.error(Messages.getMessage(Messages.INVALID_VALIDATION_EXPRESSION, component.getId(), validator)); - } - } - } - - protected void setActionProperty(UIComponent component, String action) - { - if (action != null) - { - if (!(component instanceof ActionSource)) - { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_ACTION_SOURCE_ERROR, component.getClientId(getFacesContext()))); - } - MethodBinding mb; - if (isValueReference(action)) - { - mb = getFacesContext().getApplication().createMethodBinding(action, null); - } - else - { - mb = new SimpleActionMethodBinding(action); - } - ((ActionSource)component).setAction(mb); - } - } - - protected void setActionListenerProperty(UIComponent component, String actionListener) - { - if (actionListener != null) - { - if (!(component instanceof ActionSource)) - { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_ACTION_SOURCE_ERROR, component.getClientId(getFacesContext()))); - } - if (isValueReference(actionListener)) - { - MethodBinding mb = getFacesContext().getApplication().createMethodBinding(actionListener, - ACTION_LISTENER_ARGS); - ((ActionSource)component).setActionListener(mb); - } - else - { - log.error(Messages.getMessage(Messages.INVALID_ACTION_LISTENER, component.getClientId(getFacesContext()), actionListener)); - } - } - } - - protected void setValueChangedListenerProperty(UIComponent component, String valueChangedListener) - { - if (valueChangedListener != null) - { - if (!(component instanceof EditableValueHolder)) - { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_EDITABLE_VALUE_HOLDER_ERROR, component.getClientId(getFacesContext()))); - } - if (isValueReference(valueChangedListener)) - { - MethodBinding mb = getFacesContext().getApplication().createMethodBinding(valueChangedListener, - VALUE_LISTENER_ARGS); - ((EditableValueHolder)component).setValueChangeListener(mb); - } - else - { - log.error(Messages.getMessage(Messages.INVALID_VALUE_CHANGE_LISTENER, component.getClientId(getFacesContext()), valueChangedListener)); - } - } - } - - protected void setValueBinding(UIComponent component, - String propName, - String value) - { - if (value != null) - { - if (isValueReference(value)) - { - ValueBinding vb = getFacesContext().getApplication().createValueBinding(value); - component.setValueBinding(propName, vb); - } - else - { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_VALUE_REFERENCE_ERROR, new Object[]{component.getId(), propName, value})); - } - } - } - - - } - Added: trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/MethodBindingMethodExpressionAdaptor.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/MethodBindingMethodExpressionAdaptor.java (rev 0) +++ trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/MethodBindingMethodExpressionAdaptor.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -0,0 +1,77 @@ +/** + * + */ +package org.richfaces.webapp.taglib; + +import javax.el.ELException; +import javax.el.MethodExpression; +import javax.faces.component.StateHolder; +import javax.faces.context.FacesContext; +import javax.faces.el.EvaluationException; +import javax.faces.el.MethodBinding; +import javax.faces.el.MethodNotFoundException; + +/** + * Maps {@link MethodExpression} to {@link MethodBinding} + * @author Maksim Kaszynski + * + */ +@SuppressWarnings("deprecation") +public class MethodBindingMethodExpressionAdaptor extends MethodBinding implements StateHolder{ + + private MethodExpression expression; + private boolean tranzient; + /* (non-Javadoc) + * @see javax.faces.el.MethodBinding#getType(javax.faces.context.FacesContext) + */ + + public MethodBindingMethodExpressionAdaptor(MethodExpression expression) { + super(); + this.expression = expression; + } + + @Override + public Class<?> getType(FacesContext context) throws MethodNotFoundException { + try { + return expression.getMethodInfo(context.getELContext()).getReturnType(); + } catch (javax.el.MethodNotFoundException e) { + throw new MethodNotFoundException(e); + } + } + + /* (non-Javadoc) + * @see javax.faces.el.MethodBinding#invoke(javax.faces.context.FacesContext, java.lang.Object[]) + */ + @Override + public Object invoke(FacesContext context, Object[] params) + throws EvaluationException, MethodNotFoundException { + try { + return expression.invoke(context.getELContext(), params); + } catch (javax.el.MethodNotFoundException e) { + throw new MethodNotFoundException(e); + } catch (ELException e) { + throw new EvaluationException(e); + } + } + + public boolean isTransient() { + return tranzient; + } + + public void restoreState(FacesContext context, Object state) { + expression = (MethodExpression) state; + } + + public Object saveState(FacesContext context) { + return expression; + } + + public void setTransient(boolean newTransientValue) { + tranzient = newTransientValue; + } + + @Override + public String getExpressionString() { + return expression.getExpressionString(); + } +} Added: trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/SimpleComponentTag.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/SimpleComponentTag.java (rev 0) +++ trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/SimpleComponentTag.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -0,0 +1,158 @@ +/** + * + */ +package org.richfaces.webapp.taglib; + +import javax.el.MethodExpression; +import javax.el.ValueExpression; +import javax.faces.component.UIComponent; +import javax.faces.component.UIComponentBase; +import javax.faces.component.UIInput; +import javax.faces.el.MethodBinding; + +/** + * @author Maksim Kaszynski + * + */ +public class SimpleComponentTag extends UIComponentELTagBase { + + private MethodExpression _action; + private MethodExpression _actionListener; + private MethodExpression _valueChangeListener; + private MethodExpression _validator; + private ValueExpression _converter; + private ValueExpression _title; + private ValueExpression _value; + private MethodExpression _legacyBinding; + private MethodExpression _methodExpression; + + static class MyUIComponent extends UIComponentBase { + private MethodExpression methodExpression; + private MethodBinding legacyMethodBinding; + + @Override + public String getFamily() { + // TODO Auto-generated method stub + return null; + } + public MethodBinding getLegacyMethodBinding() { + return legacyMethodBinding; + } + + public void setLegacyMethodBinding(MethodBinding legacyMethodBinding) { + this.legacyMethodBinding = legacyMethodBinding; + } + + public MethodExpression getMethodExpression() { + return methodExpression; + } + + public void setMethodExpression(MethodExpression methodExpression) { + this.methodExpression = methodExpression; + } + + } + + public SimpleComponentTag() { + // TODO Auto-generated constructor stub + } + + @Override + public String getComponentType() { + return UIInput.COMPONENT_TYPE; + } + + @Override + public String getRendererType() { + return "javax.faces.Text"; + } + + @Override + protected void setProperties(UIComponent component) { + super.setProperties(component); + MyUIComponent myUIComponent = (MyUIComponent) component; + + myUIComponent.setValueExpression("value", _value); + + setActionListenerProperty(myUIComponent, _actionListener); + setActionProperty(myUIComponent, _action); + setConverterProperty(myUIComponent, _converter); + setValidatorProperty(myUIComponent, _validator); + + + if (_methodExpression != null) { + myUIComponent.setMethodExpression(_methodExpression); + } + + if (_legacyBinding != null) { + myUIComponent.setLegacyMethodBinding(new MethodBindingMethodExpressionAdaptor(_legacyBinding)); + } + + + } + + @Override + public void release() { + super.release(); + + } + + public void setAction(MethodExpression _action) { + this._action = _action; + } + + public MethodExpression getAction() { + return _action; + } + + + public MethodExpression getActionListener() { + return _actionListener; + } + + public void setActionListener(MethodExpression listener) { + _actionListener = listener; + } + + public MethodExpression getValueChangeListener() { + return _valueChangeListener; + } + + public void setValueChangeListener(MethodExpression changeListener) { + _valueChangeListener = changeListener; + } + + public MethodExpression getValidator() { + return _validator; + } + + public void setValidator(MethodExpression _validator) { + this._validator = _validator; + } + + public ValueExpression getConverter() { + return _converter; + } + + public void setConverter(ValueExpression _converter) { + this._converter = _converter; + } + + public ValueExpression getTitle() { + return _title; + } + + public void setTitle(ValueExpression _title) { + this._title = _title; + } + + public ValueExpression getValue() { + return _value; + } + + public void setValue(ValueExpression _value) { + this._value = _value; + } + + +} Added: trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java (rev 0) +++ trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -0,0 +1,92 @@ +/** + * + */ +package org.richfaces.webapp.taglib; + +import javax.el.MethodExpression; +import javax.el.ValueExpression; +import javax.faces.component.ActionSource2; +import javax.faces.component.EditableValueHolder; +import javax.faces.component.UIComponent; +import javax.faces.component.ValueHolder; +import javax.faces.context.FacesContext; +import javax.faces.convert.Converter; +import javax.faces.el.MethodBinding; +import javax.faces.event.MethodExpressionActionListener; +import javax.faces.event.MethodExpressionValueChangeListener; +import javax.faces.validator.MethodExpressionValidator; +import javax.faces.webapp.UIComponentELTag; + +import org.ajax4jsf.Messages; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * @author Maksim Kaszynski + * + */ +public abstract class UIComponentELTagBase extends UIComponentELTag { + + private static final Log log = LogFactory.getLog(UIComponentELTagBase.class); + + protected void setActionListenerProperty(UIComponent component, MethodExpression actionListener) { + if (actionListener != null) { + if (component instanceof ActionSource2) { + ActionSource2 actionSource2 = (ActionSource2) component; + actionSource2.addActionListener(new MethodExpressionActionListener(actionListener)); + } else { + throw new IllegalArgumentException(Messages.getMessage(Messages.NO_ACTION_SOURCE2_ERROR, component.getClientId(getFacesContext()))); + } + } + } + + protected void setActionProperty(UIComponent component, MethodExpression action) { + if (action != null) { + if (component instanceof ActionSource2) { + ActionSource2 actionSource2 = (ActionSource2) component; + actionSource2.setActionExpression(action); + } else { + throw new IllegalArgumentException(Messages.getMessage(Messages.NO_ACTION_SOURCE2_ERROR, component.getClientId(getFacesContext()))); + } + } + } + + protected void setConverterProperty(UIComponent component, ValueExpression converter) { + if (converter != null) { + if (component instanceof ValueHolder) { + ValueHolder output = (ValueHolder) component; + if (!converter.isLiteralText()) { + component.setValueExpression("converter", converter); + } else { + Converter conv = FacesContext.getCurrentInstance().getApplication().createConverter(converter.getExpressionString()); + output.setConverter(conv); + } + } else { + throw new IllegalArgumentException(Messages.getMessage(Messages.NO_VALUE_HOLDER_ERROR, component.getClass().getName())); + } + } + } + + protected void setValidatorProperty(UIComponent component, MethodExpression validator) { + + if (validator != null) { + if (component instanceof EditableValueHolder) { + EditableValueHolder input = (EditableValueHolder) component; + input.addValidator(new MethodExpressionValidator(validator)); + } else { + throw new IllegalArgumentException(Messages.getMessage(Messages.NO_EDITABLE_VALUE_HOLDER_ERROR, component.getId())); + } + } + } + + protected void setValueChangeListenerProperty(UIComponent component, MethodExpression valueChangeListener) { + if (valueChangeListener != null) { + if (component instanceof EditableValueHolder) { + EditableValueHolder input = (EditableValueHolder) component; + input.addValueChangeListener(new MethodExpressionValueChangeListener(valueChangeListener)); + } else { + throw new IllegalArgumentException(Messages.getMessage(Messages.NO_EDITABLE_VALUE_HOLDER_ERROR, component.getId())); + } + } + } +} Added: trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/ValueBindingValueExpressionAdaptor.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/ValueBindingValueExpressionAdaptor.java (rev 0) +++ trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/ValueBindingValueExpressionAdaptor.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -0,0 +1,116 @@ +/** + * + */ +package org.richfaces.webapp.taglib; + +import javax.el.ELException; +import javax.el.ValueExpression; +import javax.faces.component.StateHolder; +import javax.faces.context.FacesContext; +import javax.faces.el.EvaluationException; +import javax.faces.el.PropertyNotFoundException; +import javax.faces.el.ValueBinding; + +/** + * @author Maksim Kaszynski + * + */ +@SuppressWarnings("deprecation") +public class ValueBindingValueExpressionAdaptor extends ValueBinding implements StateHolder { + + private ValueExpression expression; + private boolean tranzient; + + /* (non-Javadoc) + * @see javax.faces.el.ValueBinding#getType(javax.faces.context.FacesContext) + */ + @Override + public Class<?> getType(FacesContext context) throws EvaluationException, + PropertyNotFoundException { + try { + return expression.getType(context.getELContext()); + } catch (javax.el.PropertyNotFoundException e) { + throw new PropertyNotFoundException(e); + } catch (ELException e) { + throw new EvaluationException(e); + } + } + + /* (non-Javadoc) + * @see javax.faces.el.ValueBinding#getValue(javax.faces.context.FacesContext) + */ + @Override + public Object getValue(FacesContext context) throws EvaluationException, + PropertyNotFoundException { + try { + return expression.getValue(context.getELContext()); + } catch(javax.el.PropertyNotFoundException e) { + throw new PropertyNotFoundException(e); + } catch (ELException e) { + throw new EvaluationException(e); + } + } + + /* (non-Javadoc) + * @see javax.faces.el.ValueBinding#isReadOnly(javax.faces.context.FacesContext) + */ + @Override + public boolean isReadOnly(FacesContext context) throws EvaluationException, + PropertyNotFoundException { + try { + return expression.isReadOnly(context.getELContext()); + } catch(javax.el.PropertyNotFoundException e) { + throw new PropertyNotFoundException(e); + } catch (ELException e) { + throw new EvaluationException(e); + } + } + + /* (non-Javadoc) + * @see javax.faces.el.ValueBinding#setValue(javax.faces.context.FacesContext, java.lang.Object) + */ + @Override + public void setValue(FacesContext context, Object value) + throws EvaluationException, PropertyNotFoundException { + + try { + expression.setValue(context.getELContext(), value); + } catch(javax.el.PropertyNotFoundException e) { + throw new PropertyNotFoundException(e); + } catch (ELException e) { + throw new EvaluationException(e); + } + + } + + public boolean isTransient() { + return tranzient; + } + + public void restoreState(FacesContext context, Object state) { + expression = (ValueExpression) state; + } + + public Object saveState(FacesContext context) { + return expression; + } + + public void setTransient(boolean newTransientValue) { + tranzient = newTransientValue; + } + + public ValueExpression getExpression() { + return expression; + } + + public void setExpression(ValueExpression expression) { + this.expression = expression; + } + + public ValueBindingValueExpressionAdaptor(ValueExpression expression) { + super(); + this.expression = expression; + } + + +} Modified: trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.properties =================================================================== --- trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.properties 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.properties 2007-10-22 03:26:53 UTC (rev 3460) @@ -189,6 +189,7 @@ NO_EDITABLE_VALUE_HOLDER_ERROR=Component {0} is no EditableValueHolder INVALID_VALIDATION_EXPRESSION=Component {0} has invalid validation expression {1} NO_ACTION_SOURCE_ERROR=Component {0} is no ActionSource +NO_ACTION_SOURCE2_ERROR=Component {0} is no ActionSource2 INVALID_ACTION_LISTENER=Component {0} has invalid actionListener value\: {1} INVALID_VALUE_CHANGE_LISTENER=Component {0} has invalid valueChangedListener expression {1} NO_VALUE_REFERENCE_ERROR=Component {0} attribute {1} must be a value reference, was {2} Property changes on: trunk/samples/virtualEarth-sample ___________________________________________________________________ Name: svn:ignore - target + target .classpath .project .settings Modified: trunk/ui/core/pom.xml =================================================================== --- trunk/ui/core/pom.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/core/pom.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -44,4 +44,4 @@ </build> <dependencies> </dependencies> -</project> \ No newline at end of file +</project> Modified: trunk/ui/core/src/main/config/component/actionParameter.xml =================================================================== --- trunk/ui/core/src/main/config/component/actionParameter.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/core/src/main/config/component/actionParameter.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -89,4 +89,4 @@ </property> </component> -</components> \ No newline at end of file +</components> Modified: trunk/ui/core/src/main/config/component/commandButton.xml =================================================================== --- trunk/ui/core/src/main/config/component/commandButton.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/core/src/main/config/component/commandButton.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -106,10 +106,8 @@ <classname>int</classname> <description>Timeout ( in ms ) for request.</description> </property> - <property> + <property hidden="true"> <name>actionExpression</name> - <classname>java.lang.String</classname> - <description>The action method binding expression.</description> </property> </component> </components> \ No newline at end of file Modified: trunk/ui/core/src/main/config/component/commandLink.xml =================================================================== --- trunk/ui/core/src/main/config/component/commandLink.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/core/src/main/config/component/commandLink.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -87,10 +87,8 @@ <classname>int</classname> <description>Timeout ( in ms ) for request.</description> </property> - <property> + <property hidden="true"> <name>actionExpression</name> - <classname>java.lang.String</classname> - <description>The action method binding expression.</description> </property> </component> </components> \ No newline at end of file Modified: trunk/ui/core/src/main/config/component/form.xml =================================================================== --- trunk/ui/core/src/main/config/component/form.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/core/src/main/config/component/form.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -62,7 +62,7 @@ </property> <property> <name>prependId</name> - <classname>java.lang.String</classname> + <classname>boolean</classname> <description>The flag indicating whether or not this form should prepend its id to its descendent id during the clientId generation process. If this flag is not set, the default value is true.</description> </property> <property disabled="true"> @@ -108,20 +108,16 @@ &ui_command_attributes; &html_anchor_attributes; &html_events; - <property> + <property hidden="true"> <name>actionExpression</name> - <classname>java.lang.String</classname> - <description>The action method binding expression.</description> </property> <property> <name>disabled</name> <classname>boolean</classname> <description>When set for a form control, this boolean attribute disables the control for user input.</description> </property> - <property> + <property hidden="true"> <name>actionExpression</name> - <classname>java.lang.String</classname> - <description>The action method binding expression.</description> </property> </component> Modified: trunk/ui/core/src/main/config/component/function.xml =================================================================== --- trunk/ui/core/src/main/config/component/function.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/core/src/main/config/component/function.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -60,10 +60,8 @@ <name>value</name> <classname>java.lang.Object</classname> </property> - <property> + <property hidden="true"> <name>actionExpression</name> - <classname>java.lang.String</classname> - <description>The action method binding expression.</description> </property> </component> </components> \ No newline at end of file Modified: trunk/ui/core/src/main/config/component/poll.xml =================================================================== --- trunk/ui/core/src/main/config/component/poll.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/core/src/main/config/component/poll.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -50,10 +50,8 @@ &ui_component_attributes; &ui_command_attributes; &ajax_component_attributes; - <property> + <property hidden="true"> <name>actionExpression</name> - <classname>java.lang.String</classname> - <description>The action method binding expression.</description> </property> <property> <name>onsubmit</name> Modified: trunk/ui/core/src/main/config/component/push.xml =================================================================== --- trunk/ui/core/src/main/config/component/push.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/core/src/main/config/component/push.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -60,10 +60,8 @@ </description> <methodargs>java.util.EventListener</methodargs> </property> - <property> + <property hidden="true"> <name>actionExpression</name> - <classname>java.lang.String</classname> - <description>The action method binding expression.</description> </property>  <property> <name>ajaxKeys</name> - <classname>java.lang.String</classname> + <classname>java.util.Set</classname> <description>This attribute defines rows that are updated after an AJAX request</description> </property> <property> @@ -226,7 +226,7 @@ </property> <property> <name>componentState</name> - <classname>java.lang.String</classname> + <classname>org.ajax4jsf.model.DataComponentState</classname> <description>It defines EL-binding for a component state for saving or redefinition</description> </property> Modified: trunk/ui/dataTable/src/main/config/component/dataTable.xml =================================================================== --- trunk/ui/dataTable/src/main/config/component/dataTable.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/dataTable/src/main/config/component/dataTable.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -34,7 +34,7 @@ &spec_table_attributes; <property> <name>ajaxKeys</name> - <classname>java.lang.String</classname> + <classname>java.util.Set</classname> <description>This attribute defines rows that are updated after an AJAX request</description> </property> <property> @@ -99,7 +99,7 @@ <property> <name>componentState</name> - <classname>java.lang.String</classname> + <classname>org.ajax4jsf.model.DataComponentState</classname> <description>It defines EL-binding for a component state for saving or redefinition</description> </property> <property> Modified: trunk/ui/dataTable/src/main/config/component/subTable.xml =================================================================== --- trunk/ui/dataTable/src/main/config/component/subTable.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/dataTable/src/main/config/component/subTable.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -33,7 +33,7 @@ &spec_table_attributes; <property> <name>ajaxKeys</name> - <classname>java.lang.String</classname> + <classname>java.util.Set</classname> <description>This attribute defines rows that are updated after an AJAX request</description> </property> <property disabled="true" hidden="true"> @@ -42,7 +42,7 @@ <description> </description> </property> - <property disabled="true" hidden="true"> + <property disabled="false" hidden="true"> <name>sortable</name> <classname>boolean</classname> <description></description> @@ -51,7 +51,7 @@ <property> <name>componentState</name> - <classname>java.lang.String</classname> + <classname>org.ajax4jsf.model.DataComponentState</classname> <description>It defines EL-binding for a component state for saving or redefinition</description> </property> <property> Modified: trunk/ui/datascroller/src/main/config/component/datascroller.xml =================================================================== --- trunk/ui/datascroller/src/main/config/component/datascroller.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/datascroller/src/main/config/component/datascroller.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -255,16 +255,13 @@ <defaultvalue><![CDATA["show"]]></defaultvalue> </property> - <property> + <property hidden="true"> <name>actionExpression</name> - <classname>java.lang.String</classname> - <description>The action method binding expression</description> </property> <property hidden="true"> <name>firstRow</name> - <classname>java.lang.String</classname> </property> <property hidden="true"> Modified: trunk/ui/drag-drop/src/main/config/component/dragSupport.xml =================================================================== --- trunk/ui/drag-drop/src/main/config/component/dragSupport.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/drag-drop/src/main/config/component/dragSupport.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -42,11 +42,11 @@ --> <property elonly="true" attachedstate="true"> <name>dragListener</name> - <classname>javax.faces.el.MethodBinding</classname> + <classname>javax.el.MethodExpression</classname> <description> MethodBinding representing an action listener method that will be notified after drag operation </description> - <methodargs>org.richfaces.event.DragEvent.class</methodargs> + <methodargs>org.richfaces.event.DragEvent</methodargs> </property> <property> <name>disableDefault</name> @@ -64,8 +64,6 @@ </property> <property hidden="true" > <name>actionExpression</name> - <classname>java.lang.String</classname> - <description>The action method binding expression</description> </property> </component> Modified: trunk/ui/drag-drop/src/main/config/component/dropSupport.xml =================================================================== --- trunk/ui/drag-drop/src/main/config/component/dropSupport.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/drag-drop/src/main/config/component/dropSupport.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -32,14 +32,14 @@ &dropzone_attributes; &ajax_component_attributes; - <property> + <property elonly="true" attachedstate="true"> <name>dropListener</name> - <classname>javax.faces.el.MethodBinding</classname> + <classname>javax.el.MethodExpression</classname> <description><![CDATA[ MethodBinding representing an action listener method that will be notified after drop operation. ]]> </description> - <methodargs>org.richfaces.event.DropEvent.class</methodargs> + <methodargs>org.richfaces.event.DropEvent</methodargs> </property> <property> <name>disableDefault</name> @@ -67,8 +67,6 @@ <property hidden="true" > <name>actionExpression</name> - <classname>java.lang.String</classname> - <description>The action method binding expression</description> </property> </component> <listener> Modified: trunk/ui/inputnumber-spinner/src/main/config/resources/resources-config.xml =================================================================== --- trunk/ui/inputnumber-spinner/src/main/config/resources/resources-config.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/inputnumber-spinner/src/main/config/resources/resources-config.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -6,7 +6,7 @@ <resource class="org.richfaces.renderkit.html.images.background.SpinnerFieldGradient"> <name>org.richfaces.renderkit.html.images.background.SpinnerFieldGradient</name> </resource> - <resource class="org.richfaces.renderkit.html.images.buttons.SpinnerButtonImage"> +  </resource-config> Modified: trunk/ui/menu-components/src/main/config/component/menucomponents.xml =================================================================== --- trunk/ui/menu-components/src/main/config/component/menucomponents.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/menu-components/src/main/config/component/menucomponents.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -189,10 +189,8 @@ <description>Path to the icon to be displayed for the disabled item state. </description> </property> - <property> + <property hidden="true"> <name>actionExpression</name> - <classname>java.lang.String</classname> - <description>The action method binding expression</description> </property> <property> <name>disabled</name> Modified: trunk/ui/panel/src/test/java/org/richfaces/taglib/PanelTagTest.java =================================================================== --- trunk/ui/panel/src/test/java/org/richfaces/taglib/PanelTagTest.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/panel/src/test/java/org/richfaces/taglib/PanelTagTest.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -3,26 +3,12 @@ */ package org.richfaces.taglib; -import java.io.IOException; -import java.util.Enumeration; - import javax.faces.webapp.UIComponentTag; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpSession; import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.el.ExpressionEvaluator; -import javax.servlet.jsp.el.VariableResolver; import javax.servlet.jsp.tagext.Tag; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.apache.shale.test.el.MockValueExpression; import org.richfaces.component.html.HtmlPanel; /** @@ -86,8 +72,8 @@ */ public void testSetPropertiesUIComponent() throws JspException { HtmlPanel panel = new HtmlPanel(); - panelTag.setBodyClass("panel"); - panelTag.setHeaderClass("headClass"); + panelTag.setBodyClass(new MockValueExpression("panel", String.class)); + panelTag.setHeaderClass(new MockValueExpression("headClass", String.class)); panelTag.setProperties(panel); assertEquals("panel", panel.getBodyClass()); assertEquals("headClass", panel.getHeaderClass()); Modified: trunk/ui/panelbar/src/main/config/component/panelbar.xml =================================================================== --- trunk/ui/panelbar/src/main/config/component/panelbar.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/panelbar/src/main/config/component/panelbar.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -130,7 +130,6 @@ <property hidden="true"> <name>valid</name> - <classname>java.lang.String</classname> </property> </component> Modified: trunk/ui/panelmenu/src/main/config/component/panelMenu.xml =================================================================== --- trunk/ui/panelmenu/src/main/config/component/panelMenu.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/panelmenu/src/main/config/component/panelMenu.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -418,29 +418,12 @@ <description>Defines representation text for menuItem.</description> </property--> &listeners; - <property> - <name>action</name> - <classname>java.lang.String</classname> - <description>MethodBinding pointing at the application action to be invoked, if this UIComponent is activated by the user, during the Apply Request Values or Invoke Application phase of the request processing lifecycle, depending on the value of the immediate property</description> - </property> - <property> - <name>actionListener</name> - <classname>java.lang.String</classname> - <description>MethodBinding pointing at method accepting an ActionEvent with return type void</description> - </property> <property> <name>target</name> <classname>java.lang.String</classname> <description>Target frame for action to execute.</description> </property> - <property> - <name>immediate</name> - <classname>boolean</classname> - <description>A flag indicating that this component value must be converted and validated - immediately (that is, during Apply Request Values phase), rather than waiting until - a Process Validations phase. </description> - </property> &ui_component_attributes; &html_input_attributes; &html_input_events; @@ -448,6 +431,7 @@ &ui_output_attributes; &html_events; &ajax_component_attributes; + &ui_command_attributes; <property> <name>oncollapse</name> <classname>java.lang.String</classname> Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java =================================================================== --- trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -37,9 +37,6 @@ public static final String COMPONENT_TYPE = "org.richfaces.panelMenuGroup"; - private MethodBinding actionListener = null; - private MethodBinding action = null; - public abstract String getStyleClass(); public abstract void setStyleClass(String styleClass); @@ -92,14 +89,6 @@ addFacesListener(listener); } - public MethodBinding getAction() { - return action; - } - - public MethodBinding getActionListener() { - return (this.actionListener); - } - public ActionListener[] getActionListeners() { ActionListener al[] = (ActionListener []) getFacesListeners(ActionListener.class); @@ -111,30 +100,6 @@ removeFacesListener(listener); } - public void setAction(MethodBinding action) { - this.action = action; - } - - public void setActionListener(MethodBinding actionListener) { - this.actionListener = actionListener; - } - - public void restoreState(FacesContext context, Object state) { - Object values[] = (Object[]) state; - super.restoreState(context, values[0]); - action = (MethodBinding) restoreAttachedState(context, values[1]); - actionListener = (MethodBinding) restoreAttachedState(context, - values[2]); - } - - public Object saveState(FacesContext context) { - Object values[] = new Object[3]; - values[0] = super.saveState(context); - values[1] = saveAttachedState(context, action); - values[2] = saveAttachedState(context, actionListener); - return values; - } - public void queueEvent(FacesEvent event) { if(event instanceof ActionEvent && this == event.getSource()){ if (isImmediate()) { Modified: trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml =================================================================== --- trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -60,7 +60,7 @@ <property> <name>componentState</name> - <classname>java.lang.String</classname> + <classname>org.ajax4jsf.model.DataComponentState</classname> <description>It defines EL-binding for a component state for saving or redefinition</description> </property> @@ -234,7 +234,7 @@ <property> <name>ajaxKeys</name> - <classname>java.lang.String</classname> + <classname>java.util.Set</classname> <description>This attribute defines rows that are updated after an AJAX request</description> </property> Modified: trunk/ui/simpleTogglePanel/src/main/config/component/simpleTogglePanel.xml =================================================================== --- trunk/ui/simpleTogglePanel/src/main/config/component/simpleTogglePanel.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/simpleTogglePanel/src/main/config/component/simpleTogglePanel.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -49,11 +49,6 @@ </description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> - <property> - <name>actionExpression</name> - <classname>java.lang.String</classname> - <description>The action method binding expression</description> - </property> <property> <name>height</name> <classname>java.lang.String</classname> Modified: trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/taglib/SimpleTogglePanelTagBase.java =================================================================== --- trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/taglib/SimpleTogglePanelTagBase.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/taglib/SimpleTogglePanelTagBase.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -21,40 +21,60 @@ package org.richfaces.taglib; +import javax.el.ELException; +import javax.el.ValueExpression; +import javax.faces.FacesException; +import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import org.ajax4jsf.webapp.taglib.HtmlComponentTagBase; +import org.richfaces.component.UISimpleTogglePanel; public abstract class SimpleTogglePanelTagBase extends HtmlComponentTagBase { private boolean _openedSet = false; - private String _value = null; + private ValueExpression _value = null; - private void logValueDeprecation(String value) { + private void logValueDeprecation(ValueExpression value) { FacesContext facesContext = getFacesContext(); facesContext.getExternalContext().log("opened attribute has been already set for component with id: " + this.getId() + - "[" + this._value + "]. value attribute is deprecated and thus has been dropped!"); + "[" + value.getExpressionString() + "]. value attribute is deprecated and thus has been dropped!"); } - public void setOpened(String opened) { - if (_value != null) { + public void setOpened(ValueExpression opened) { + if (!_openedSet && _value != null) { logValueDeprecation(_value); } - _openedSet = false; - super.setValue(opened); + _value = opened; _openedSet = true; } - public void setValue(String value) { + public void setValue(ValueExpression value) { if (!_openedSet) { _value = value; - super.setValue(value); } else { - logValueDeprecation(value); + logValueDeprecation(_value); } } + + protected void setProperties(UIComponent component) { + super.setProperties(component); + if (_value != null) { + if (_value.isLiteralText()) { + try { + UISimpleTogglePanel panel = (UISimpleTogglePanel) component; + panel.setOpened(Boolean.valueOf(_value.getExpressionString())); + } catch (ELException e) { + throw new FacesException(e); + } + } else { + component.setValueExpression("opened", _value); + } + } + } + public void release() { super.release(); _openedSet = false; Modified: trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml =================================================================== --- trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -66,10 +66,13 @@ &html_table_attributes; <property elonly="true"> <name>suggestionAction</name> - <classname>javax.faces.el.MethodBinding</classname> + <classname>javax.el.MethodExpression</classname> <methodargs> java.lang.Object </methodargs> + <returntype> + java.lang.Object + </returntype> <description> <![CDATA[Method calls an expression to get a collection of suggestion data on request. It must have one parameter with a type of Object with content of input component and must return any type allowed for <h:datatable> ]]> </description> @@ -332,8 +335,6 @@ </property> <property hidden="true"> <name>rows</name> - <classname>java.lang.String</classname> - <description>rows</description> </property> <property> <name>nothingLabel</name> @@ -343,5 +344,8 @@ It isn't selectable and list is closed as always after click on it and nothing is put to input. </description> </property> + <property hidden="true" disabled="true"> + <name>upValue</name> + </property> </component> </components> Modified: trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java =================================================================== --- trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/suggestionbox/src/main/java/org/richfaces/component/UISuggestionBox.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -23,10 +23,10 @@ import java.util.Map; +import javax.el.MethodExpression; import javax.faces.component.UIData; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; -import javax.faces.el.MethodBinding; import javax.faces.event.AbortProcessingException; import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; @@ -102,14 +102,14 @@ * * @return suggestionAction value from local variable or value bindings */ - public abstract MethodBinding getSuggestionAction(); + public abstract MethodExpression getSuggestionAction(); /** * Setter for suggestionAction. * - * @param action {@link javax.faces.el.MethodBinding} + * @param action {@link javax.el.MethodExpression} */ - public abstract void setSuggestionAction(MethodBinding action); + public abstract void setSuggestionAction(MethodExpression action); /** * Getter for converter. @@ -337,10 +337,10 @@ public void setupValue(FacesContext context) { Object value = getSubmitedValue(); - MethodBinding suggestingAction = getSuggestionAction(); + MethodExpression suggestingAction = getSuggestionAction(); if (null != suggestingAction) { setValue(suggestingAction.invoke( - context, new Object[]{value})); + context.getELContext(), new Object[]{value})); } } Modified: trunk/ui/suggestionbox/src/main/java/org/richfaces/taglib/SuggestionBoxTagHandler.java =================================================================== --- trunk/ui/suggestionbox/src/main/java/org/richfaces/taglib/SuggestionBoxTagHandler.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/suggestionbox/src/main/java/org/richfaces/taglib/SuggestionBoxTagHandler.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -21,15 +21,15 @@ package org.richfaces.taglib; +import org.richfaces.component.UISuggestionBox; + import com.sun.facelets.FaceletContext; -import com.sun.facelets.el.LegacyMethodBinding; import com.sun.facelets.tag.MetaRule; import com.sun.facelets.tag.MetaRuleset; import com.sun.facelets.tag.Metadata; import com.sun.facelets.tag.MetadataTarget; import com.sun.facelets.tag.TagAttribute; import com.sun.facelets.tag.jsf.ComponentConfig; -import org.richfaces.component.UISuggestionBox; /** * Component tag handler for Facelets. @@ -136,8 +136,8 @@ public void applyMetadata(final FaceletContext context, final Object instance) { ((UISuggestionBox) instance) - .setSuggestionAction(new LegacyMethodBinding(this.action - .getMethodExpression(context, null, SIGNATURE))); + .setSuggestionAction(this.action + .getMethodExpression(context, null, SIGNATURE)); } } } Modified: trunk/ui/tabPanel/src/main/config/component/tabPanel.xml =================================================================== --- trunk/ui/tabPanel/src/main/config/component/tabPanel.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/tabPanel/src/main/config/component/tabPanel.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -175,10 +175,8 @@ <name>value</name> <classname>java.lang.Object</classname> </property> - <property> + <property hidden="true"> <name>actionExpression</name> - <classname>java.lang.String</classname> - <description>The action method binding expression</description> </property> <property> <name>name</name> Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/taglib/TabPanelTagBase.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/taglib/TabPanelTagBase.java 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/taglib/TabPanelTagBase.java 2007-10-22 03:26:53 UTC (rev 3460) @@ -21,9 +21,14 @@ package org.richfaces.taglib; +import javax.el.ELException; +import javax.el.ValueExpression; +import javax.faces.FacesException; +import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import org.ajax4jsf.webapp.taglib.HtmlComponentTagBase; +import org.richfaces.component.UITabPanel; /** * @@ -37,33 +42,48 @@ public abstract class TabPanelTagBase extends HtmlComponentTagBase { private boolean _selectedTabSet = false; - private String _value = null; + private ValueExpression _value = null; - private void logValueDeprecation(String value) { + private void logValueDeprecation(ValueExpression value) { FacesContext facesContext = getFacesContext(); facesContext.getExternalContext().log("selectedTab attribute has been already set for component with id: " + this.getId() + - "[" + this._value + "]. value attribute is deprecated and thus has been dropped!"); + "[" + value.getExpressionString() + "]. value attribute is deprecated and thus has been dropped!"); } - public void setSelectedTab(String tab) { - if (_value != null) { - logValueDeprecation(_value); + public void setSelectedTab(ValueExpression tab) { + if (!_selectedTabSet && _value != null) { + logValueDeprecation(tab); } - _selectedTabSet = false; - super.setValue(tab); + _value = tab; _selectedTabSet = true; } - public void setValue(String value) { + public void setValue(ValueExpression value) { if (!_selectedTabSet) { _value = value; - super.setValue(value); } else { - logValueDeprecation(value); + logValueDeprecation(_value); } } + protected void setProperties(UIComponent component) { + super.setProperties(component); + + if (_value != null) { + if (_value.isLiteralText()) { + UITabPanel tabPanel = (UITabPanel) component; + try { + tabPanel.setSelectedTab(_value.getExpressionString()); + } catch (ELException e) { + throw new FacesException(e); + } + } else { + component.setValueExpression("selectedTab", _value); + } + } + } + public void release() { super.release(); _selectedTabSet = false; Modified: trunk/ui/togglePanel/src/main/config/component/togglePanel.xml =================================================================== --- trunk/ui/togglePanel/src/main/config/component/togglePanel.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/togglePanel/src/main/config/component/togglePanel.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -92,12 +92,10 @@ </property> <property hidden="true"> <name>localValueSet</name> - <classname>boolean</classname> </property> <property hidden="true"> <name>valid</name> - <classname>java.lang.String</classname> </property> @@ -195,10 +193,8 @@ </description> </property> - <property> + <property hidden="true"> <name>actionExpression</name> - <classname>java.lang.String</classname> - <description>The action method binding expression</description> </property> <property> Modified: trunk/ui/tree/src/main/config/component/tree.xml =================================================================== --- trunk/ui/tree/src/main/config/component/tree.xml 2007-10-21 15:05:17 UTC (rev 3459) +++ trunk/ui/tree/src/main/config/component/tree.xml 2007-10-22 03:26:53 UTC (rev 3460) @@ -69,7 +69,7 @@ </property> <property> <name>componentState</name> - <classname>java.lang.String</classname> + <classname>org.ajax4jsf.model.DataComponentState</classname> <description>It defines EL-binding for a component state for saving or redefinition</description> </property> <property>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r3459 - in trunk/ui/spacer/src: test/java/org/richfaces/component and 1 other directory.

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

Author: nbelaevski Date: 2007-10-21 11:05:17 -0400 (Sun, 21 Oct 2007) New Revision: 3459 Modified: trunk/ui/spacer/src/main/java/org/richfaces/component/UISpacer.java trunk/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java Log: Legacy getter/setter removed for UISpacer Modified: trunk/ui/spacer/src/main/java/org/richfaces/component/UISpacer.java =================================================================== --- trunk/ui/spacer/src/main/java/org/richfaces/component/UISpacer.java 2007-10-21 15:01:30 UTC (rev 3458) +++ trunk/ui/spacer/src/main/java/org/richfaces/component/UISpacer.java 2007-10-21 15:05:17 UTC (rev 3459) @@ -29,14 +29,4 @@ */ public abstract class UISpacer extends UIComponentBase { - - public abstract void setWidth(String string); - public abstract String getWidth(); - - public abstract void setHeight(String string); - public abstract String getHeight(); - - public abstract void setStyle(String string); - public abstract String getStyle(); - } Modified: trunk/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java =================================================================== --- trunk/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java 2007-10-21 15:01:30 UTC (rev 3458) +++ trunk/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java 2007-10-21 15:05:17 UTC (rev 3459) @@ -67,9 +67,9 @@ form.getChildren().add(spacer); spacer.setId("spacer"); - spacer.setWidth("30"); - spacer.setHeight("10"); - spacer.setStyle("background-color: lime"); + spacer.getAttributes().put("width", "30"); + spacer.getAttributes().put("height", "10"); + spacer.getAttributes().put("style", "background-color: lime"); // spacer.getAttributes().put("height", new Integer(10));

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r3458 - trunk/ui/core/src/main/config/component.

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

Author: nbelaevski Date: 2007-10-21 11:01:30 -0400 (Sun, 21 Oct 2007) New Revision: 3458 Modified: trunk/ui/core/src/main/config/component/mediaOutput.xml trunk/ui/core/src/main/config/component/push.xml Log: Legacy ".class" removed from UI config files Modified: trunk/ui/core/src/main/config/component/mediaOutput.xml =================================================================== --- trunk/ui/core/src/main/config/component/mediaOutput.xml 2007-10-21 15:01:04 UTC (rev 3457) +++ trunk/ui/core/src/main/config/component/mediaOutput.xml 2007-10-21 15:01:30 UTC (rev 3458) @@ -139,7 +139,7 @@ ]]> </description> <methodargs> - java.io.OutputStream.class,java.lang.Object.class + java.io.OutputStream,java.lang.Object </methodargs> </property> <property> Modified: trunk/ui/core/src/main/config/component/push.xml =================================================================== --- trunk/ui/core/src/main/config/component/push.xml 2007-10-21 15:01:04 UTC (rev 3457) +++ trunk/ui/core/src/main/config/component/push.xml 2007-10-21 15:01:30 UTC (rev 3458) @@ -58,7 +58,7 @@ MethodBinding pointing at method accepting an PushEventListener with return type void. User bean must register this listener and send EventObject to this listener on ready. </description> - <methodargs>java.util.EventListener.class</methodargs> + <methodargs>java.util.EventListener</methodargs> </property> <property> <name>actionExpression</name>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r3457 - trunk/ui/paint2D/src/main/config/component.

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

Author: nbelaevski Date: 2007-10-21 11:01:04 -0400 (Sun, 21 Oct 2007) New Revision: 3457 Modified: trunk/ui/paint2D/src/main/config/component/paint2D.xml Log: Legacy ".class" removed from UI config files Modified: trunk/ui/paint2D/src/main/config/component/paint2D.xml =================================================================== --- trunk/ui/paint2D/src/main/config/component/paint2D.xml 2007-10-21 15:00:40 UTC (rev 3456) +++ trunk/ui/paint2D/src/main/config/component/paint2D.xml 2007-10-21 15:01:04 UTC (rev 3457) @@ -62,7 +62,7 @@ The method calls expression to paint Image on prepared Buffered image. It must have two parameters with a type of java.awt.Graphics2D (graphics to paint) and Object (restored from URI "data" property). For painting used 32-bit RGBA color model (for 8-bit images used Diffusion filtration before sending) ]]></description> - <methodargs>java.awt.Graphics2D.class,java.lang.Object.class</methodargs> + <methodargs>java.awt.Graphics2D,java.lang.Object</methodargs> </property> <property> <name>width</name>

16 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits October 2007