[richfaces-svn-commits] JBoss Rich Faces SVN: r3035 - in trunk/test-applications/facelets/src/main: java/calendar and 6 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Fri Sep 21 05:04:24 EDT 2007
Author: ayanul
Date: 2007-09-21 05:04:24 -0400 (Fri, 21 Sep 2007)
New Revision: 3035
Added:
trunk/test-applications/facelets/src/main/java/rich/
trunk/test-applications/facelets/src/main/java/rich/RichBean.java
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichBean.xml
Removed:
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Div.xml
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml
Modified:
trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java
trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
trunk/test-applications/facelets/src/main/webapp/EmptyPage/EmptyPage.xhtml
trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml
trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml
trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml
trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml
Log:
Modified: trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-09-21 09:04:24 UTC (rev 3035)
@@ -21,7 +21,6 @@
package calendar;
-import java.lang.reflect.Array;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Calendar;
@@ -29,21 +28,17 @@
import java.util.Locale;
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",
+ 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 [] MOUNT_LABELS_SHORT = new String[] { "Jan +",
"Feb +", "Mar +", "Apr +", "May +", "Jun +", "Jul +", "Aug +",
@@ -76,6 +71,7 @@
private String scrollMode;
private String label;
private String timeZone;
+ private String mode;
private int zindex;
private int counter;
@@ -153,12 +149,14 @@
required = false;
weekDay = "none";
month = "none";
+ mode = "client";
timeZone = "Eastern European Time";
preloadDateRangeBegin = "10.09.2007";
preloadDateRangeEnd = "11.10.2007";
}
public Date getPrDateRangeBegin() {
+ if("ajax".equals(mode)) return null;
Calendar cal = Calendar.getInstance();
StringTokenizer st = new StringTokenizer(preloadDateRangeBegin,".");
ArrayList<Integer> date = new ArrayList<Integer>();
@@ -168,10 +166,10 @@
cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0);
System.out.println(cal.getTime());
return cal.getTime();
-
}
public Date getPrDateRangeEnd() {
+ if("ajax".equals(mode)) return null;
Calendar cal = Calendar.getInstance();
StringTokenizer st = new StringTokenizer(preloadDateRangeEnd, ".");
ArrayList<Integer> date = new ArrayList<Integer>();
@@ -442,4 +440,12 @@
public void setPreloadDateRangeEnd(String preloadDateRangeEnd) {
this.preloadDateRangeEnd = preloadDateRangeEnd;
}
+
+ public String getMode() {
+ return mode;
+ }
+
+ public void setMode(String mode) {
+ this.mode = mode;
+ }
}
Added: trunk/test-applications/facelets/src/main/java/rich/RichBean.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/rich/RichBean.java (rev 0)
+++ trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2007-09-21 09:04:24 UTC (rev 3035)
@@ -0,0 +1,17 @@
+package rich;
+
+public class RichBean {
+ private String src;
+
+ public RichBean() {
+ src = "/DataFilterSlider/DataFilterSlider.xhtml";
+ }
+
+ public String getSrc() {
+ return src;
+ }
+
+ public void setSrc(String src) {
+ this.src = src;
+ }
+}
Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -54,15 +54,21 @@
scrollMode="#{calendarBean.scrollMode}"
rendered="#{calendarBean.rendered}"
focus="popupModeID"
-
+ mode="#{calendarBean.mode}"
required="#{calendarBean.required}"
requiredMessage="Required Message">
+ <f:facet name="weekDay">
+ <f:verbatim><span style="padding: 2px;" >{weekDayLabel}</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">
@@ -120,7 +126,13 @@
<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="Mode:" />
+ <h:selectOneRadio value="#{calendarBean.mode}" onclick="submit();">
+ <f:selectItem itemLabel="client" itemValue="client"/>
+ <f:selectItem itemLabel="ajax" itemValue="ajax"/>
+ </h:selectOneRadio>
+
+ <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)" />
Modified: trunk/test-applications/facelets/src/main/webapp/EmptyPage/EmptyPage.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/EmptyPage/EmptyPage.xhtml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/EmptyPage/EmptyPage.xhtml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -1,19 +1,18 @@
-<!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: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>
- <rich:messages showDetail="true"></rich:messages>
-
- <h:outputText value="#{emptyPage.text}" />
+<!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>
+ <rich:messages showDetail="true"></rich:messages>
- </h:form>
- </f:view>
+ </h:form>
+</f:view>
</html>
\ No newline at end of file
Modified: trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -11,7 +11,7 @@
</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">
Deleted: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Div.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Div.xml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Div.xml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -1,10 +0,0 @@
-<?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>divBean</managed-bean-name>
- <managed-bean-class>div.DivBean</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
-</faces-config>
Deleted: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -1,10 +0,0 @@
-<?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>emptyPage</managed-bean-name>
- <managed-bean-class>emptyPage.EmptyPage</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
-</faces-config>
Copied: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichBean.xml (from rev 2811, trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Div.xml)
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichBean.xml (rev 0)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichBean.xml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -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: trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -33,7 +33,7 @@
</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,/WEB-INF/faces-config-EmptyPage.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>
<filter>
<display-name>Ajax4jsf Filter</display-name>
Modified: trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -26,7 +26,7 @@
<h:commandLink action="#{skinBean.change}" value="set skin" />
<h:outputText value="Select component:" />
- <h:selectOneMenu value="#{divBean.src}" onchange="submit();">
+ <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" />
Modified: trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -20,7 +20,7 @@
<h:commandLink action="#{skinBean.change}" value="set skin" />
<h:outputText value="Select component:" />
- <h:selectOneMenu value="#{divBean.src}" onchange="submit();">
+ <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" />
@@ -56,7 +56,7 @@
<div id="divID" style="position: absolute; top:15px; left: 10px; z-index: 1">
<ui:include src="/pages/SelectOneMenuPage.xhtml" />
</div>
- <ui:include src="${divBean.src}" />
+ <ui:include src="${richBean.src}" />
</body>
</f:view>
Modified: trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -20,7 +20,7 @@
<h:commandLink action="#{skinBean.change}" value="set skin" />
<h:outputText value="Select component:" />
- <h:selectOneMenu value="#{divBean.src}" onchange="submit();">
+ <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" />
@@ -53,7 +53,7 @@
</h:panelGrid>
</h:form>
</div>
- <ui:include src="${divBean.src}" />
+ <ui:include src="${richBean.src}" />
</body>
</f:view>
More information about the richfaces-svn-commits
mailing list