JBoss Rich Faces SVN: r2975 - trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-09-18 06:52:58 -0400 (Tue, 18 Sep 2007)
New Revision: 2975
Modified:
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
Log:
RF-931
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-09-18 10:48:04 UTC (rev 2974)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-09-18 10:52:58 UTC (rev 2975)
@@ -855,6 +855,8 @@
// dayStyleClass
// }
+ if (!$(this.id).component) return;
+
if (daysData) {
this.daysData = this.indexData(daysData, isAjaxMode);
} else {
18 years, 7 months
JBoss Rich Faces SVN: r2974 - trunk/ui/calendar/design/funcspec.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2007-09-18 06:48:04 -0400 (Tue, 18 Sep 2007)
New Revision: 2974
Modified:
trunk/ui/calendar/design/funcspec/FuncSpec - RF Calendar Component.doc
Log:
RF-955
Modified: trunk/ui/calendar/design/funcspec/FuncSpec - RF Calendar Component.doc
===================================================================
(Binary files differ)
18 years, 7 months
JBoss Rich Faces SVN: r2973 - trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: viktor_volkov
Date: 2007-09-18 06:36:06 -0400 (Tue, 18 Sep 2007)
New Revision: 2973
Added:
trunk/el-api-1.0.jar
Log:
Added: trunk/el-api-1.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/el-api-1.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 7 months
JBoss Rich Faces SVN: r2972 - trunk/test-applications/jsp/src/main/webapp/Calendar.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-18 04:23:35 -0400 (Tue, 18 Sep 2007)
New Revision: 2972
Modified:
trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-09-18 08:23:32 UTC (rev 2971)
+++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-09-18 08:23:35 UTC (rev 2972)
@@ -38,7 +38,7 @@
inputClass="ic" buttonClass="bc"
ajaxSingle="#{calendarBean.ajaxSingle}"
buttonIcon="#{calendarBean.icon}"
- buttonIconDisabled="/pics/file-manager-reject.png"
+ buttonIconDisabled="#{icon.iconFileManagerReject}"
disabled="#{calendarBean.disabled}"
bypassUpdates="#{calendarBean.bypassUpdates}"
height="#{calendarBean.height}"
18 years, 7 months
JBoss Rich Faces SVN: r2971 - trunk/test-applications/facelets/src/main/webapp/Calendar.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-18 04:23:32 -0400 (Tue, 18 Sep 2007)
New Revision: 2971
Modified:
trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
Log:
Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-17 22:59:08 UTC (rev 2970)
+++ trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-18 08:23:32 UTC (rev 2971)
@@ -42,7 +42,7 @@
inputClass="ic" buttonClass="bc"
ajaxSingle="#{calendarBean.ajaxSingle}"
buttonIcon="#{calendarBean.icon}"
- buttonIconDisabled="/pics/file-manager-reject.png"
+ buttonIconDisabled="#{icon.iconFileManagerReject}"
disabled="#{calendarBean.disabled}"
bypassUpdates="#{calendarBean.bypassUpdates}"
height="#{calendarBean.height}"
@@ -51,8 +51,8 @@
toolTipMode="#{calendarBean.toolTipMode}"
scrollMode="#{calendarBean.scrollMode}"
rendered="#{calendarBean.rendered}"
- focus="popupModeID"
- timeZone="#{calendarBean.tmZone}"
+ focus="popupModeID"
+
required="#{calendarBean.required}"
requiredMessage="Required Message">
<f:facet name="optionalHeader">
18 years, 7 months
JBoss Rich Faces SVN: r2970 - in trunk: samples/seamIntegration/src/main/webapp/WEB-INF and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-09-17 18:59:08 -0400 (Mon, 17 Sep 2007)
New Revision: 2970
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java
trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml
trunk/sandbox/samples/dialog-window-sample/src/main/webapp/dialog.xhtml
trunk/sandbox/ui/dialog-window/pom.xml
Log:
Create workaround for a http://jira.jboss.com/jira/browse/JBSEAM-460
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2007-09-17 18:57:02 UTC (rev 2969)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2007-09-17 22:59:08 UTC (rev 2970)
@@ -25,6 +25,7 @@
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -56,6 +57,8 @@
*/
public class AjaxStateManager extends StateManager {
+ private static final Class[] STATE_MANAGER_ARGUMENTS = new Class[] { StateManager.class };
+
protected static final int DEFAULT_NUMBER_OF_VIEWS = 16;
private static final String VIEW_STATES_MAP = AjaxStateManager.class
@@ -68,6 +71,8 @@
private final StateManager parent;
+ private StateManager seamStateManager;
+
private final ComponentsLoader componentLoader;
private int viewSequence = 0;
@@ -83,6 +88,73 @@
super();
this.parent = parent;
componentLoader = new ComponentsLoaderImpl();
+ // HACK - Seam perform significant operations before save tree state.
+ // Try to create it instance by reflection,
+ // to call in real state saving operations.
+ ClassLoader classLoader = Thread.currentThread()
+ .getContextClassLoader();
+ if (null == classLoader) {
+ classLoader = AjaxStateManager.class.getClassLoader();
+ }
+ try {
+ Class seamStateManagerClass = classLoader
+ .loadClass("org.jboss.seam.jsf.SeamStateManager");
+ Constructor constructor = seamStateManagerClass
+ .getConstructor(STATE_MANAGER_ARGUMENTS);
+ seamStateManager = (StateManager) constructor
+ .newInstance(new Object[] { new StateManager() {
+
+ protected Object getComponentStateToSave(
+ FacesContext arg0) {
+ // do nothing
+ return null;
+ }
+
+ protected Object getTreeStructureToSave(
+ FacesContext arg0) {
+ // do nothing
+ return null;
+ }
+
+ protected void restoreComponentState(FacesContext arg0,
+ UIViewRoot arg1, String arg2) {
+ // do nothing
+
+ }
+
+ protected UIViewRoot restoreTreeStructure(
+ FacesContext arg0, String arg1, String arg2) {
+ // do nothing
+ return null;
+ }
+
+ public UIViewRoot restoreView(FacesContext arg0,
+ String arg1, String arg2) {
+ // do nothing
+ return null;
+ }
+
+ public SerializedView saveSerializedView(
+ FacesContext arg0) {
+ // delegate to enclosed class method.
+ return buildSerializedView(arg0);
+ }
+
+ public void writeState(FacesContext arg0,
+ SerializedView arg1) throws IOException {
+ // do nothing
+ }
+
+ } });
+ if(_log.isDebugEnabled()){
+ _log.debug("Create instance of the SeamStateManager");
+ }
+ } catch (Exception e) {
+ seamStateManager = null;
+ if(_log.isDebugEnabled()){
+ _log.debug("SeamStateManager is not present");
+ }
+ }
}
/*
@@ -202,24 +274,31 @@
id);
if (null == restoredState) {
if (_log.isDebugEnabled()) {
- _log.debug("No saved view state found for a Id "+id+". Restore last saved state");
+ _log
+ .debug("No saved view state found for a Id "
+ + id
+ + ". Restore last saved state");
}
restoredState = (Object[]) logicalStates
.get(logicalStates.firstKey());
}
} else {
if (_log.isDebugEnabled()) {
- _log.debug("No version Id for a saved view state in request. Restore last saved state");
+ _log
+ .debug("No version Id for a saved view state in request. Restore last saved state");
}
restoredState = (Object[]) logicalStates
.get(logicalStates.firstKey());
}
- } else if (_log.isDebugEnabled()) {
- _log.debug("Can't restore view state : no saved states for a ViewId "+viewId);
+ } else if (_log.isDebugEnabled()) {
+ _log
+ .debug("Can't restore view state : no saved states for a ViewId "
+ + viewId);
}
} else if (_log.isDebugEnabled()) {
- _log.debug("Can't restore view state : no saved view states in session");
+ _log
+ .debug("Can't restore view state : no saved view states in session");
}
}
@@ -229,6 +308,19 @@
}
public SerializedView saveSerializedView(FacesContext context) {
+ if (null == seamStateManager) {
+ return buildSerializedView(context);
+ } else {
+ // Delegate save method to seam State Manager.
+ return seamStateManager.saveSerializedView(context);
+ }
+ }
+
+ /**
+ * @param context
+ * @return
+ */
+ protected SerializedView buildSerializedView(FacesContext context) {
SerializedView serializedView = null;
UIViewRoot viewRoot = context.getViewRoot();
if (!viewRoot.isTransient()) {
@@ -276,7 +368,7 @@
return id;
}
}
- synchronized (viewSequenceMutex ) {
+ synchronized (viewSequenceMutex) {
if (viewSequence++ == Character.MAX_VALUE) {
viewSequence = 0;
}
Modified: trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml 2007-09-17 18:57:02 UTC (rev 2969)
+++ trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml 2007-09-17 22:59:08 UTC (rev 2970)
@@ -80,15 +80,5 @@
<url-pattern>/faces/*</url-pattern>
</servlet-mapping>
- <security-constraint>
- <display-name>Restrict raw XHTML Documents</display-name>
- <web-resource-collection>
- <web-resource-name>XHTML</web-resource-name>
- <url-pattern>*.xhtml</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>NONE</role-name>
- </auth-constraint>
- </security-constraint>
</web-app>
Modified: trunk/sandbox/samples/dialog-window-sample/src/main/webapp/dialog.xhtml
===================================================================
--- trunk/sandbox/samples/dialog-window-sample/src/main/webapp/dialog.xhtml 2007-09-17 18:57:02 UTC (rev 2969)
+++ trunk/sandbox/samples/dialog-window-sample/src/main/webapp/dialog.xhtml 2007-09-17 22:59:08 UTC (rev 2970)
@@ -3,7 +3,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:dialog="http://labs.jboss.com/jbossrichfaces/ui/ui/dialog-window"
+ xmlns:dialog="http://richfaces.org/dialog"
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
>
<head>
Modified: trunk/sandbox/ui/dialog-window/pom.xml
===================================================================
--- trunk/sandbox/ui/dialog-window/pom.xml 2007-09-17 18:57:02 UTC (rev 2969)
+++ trunk/sandbox/ui/dialog-window/pom.xml 2007-09-17 22:59:08 UTC (rev 2970)
@@ -26,7 +26,9 @@
<library>
<prefix>org.richfaces.ui</prefix>
<taglib>
+ <uri>http://richfaces.org/dialog</uri>
<shortName>dialog</shortName>
+ <displayName>Core ajax components tags</displayName>
</taglib>
</library>
</configuration>
18 years, 7 months
JBoss Rich Faces SVN: r2969 - trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2007-09-17 14:57:02 -0400 (Mon, 17 Sep 2007)
New Revision: 2969
Modified:
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
Log:
RF-892
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-09-17 17:42:05 UTC (rev 2968)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-09-17 18:57:02 UTC (rev 2969)
@@ -62,6 +62,7 @@
this.setHeight(this.defaultHeight);
this.setWidth(this.defaultWidth);
this.controlCreated = true;
+ this.agjustSeparators();
},
parseTemplate: function(template) {
if(!template) {
@@ -232,8 +233,6 @@
this.defaultHeight -= this.getBorderWidth("tb") + this.getPadding("tb");
}
- this.agjustSeparators();
-
this.frozenSubstrate = new ClientUI.common.box.Box(this.gridId + ":hs", this.getElement());
this.frozenSubstrate.getElement().name = this.getElement().id + "HRFrm";
this.frozenSubstrate.setHeight(this.headerRow.getHeight());
@@ -250,18 +249,20 @@
return details;
},
agjustSeparators: function() {
- var offset = 0;
var i=0;
- var cells = this.headerFrozenRow.getElement().rows[0].cells;
- var length = cells.length;
+ var fcells = this.headerFrozenRow.getElement().rows[0].cells;
+ var ncells = this.headerRow.getElement().rows[0].cells;
+ var length = fcells.length;
+ var delta = 4;
+ if (ncells[0].offsetWidth == ncells[0].clientWidth) {
+ delta--;
+ }
for(var j=0; j<length; i++,j++) {
- this._columns[i].sep.moveToX(cells[j].offsetLeft + cells[j].offsetWidth - 4);
+ this._columns[i].sep.moveToX(fcells[j].offsetLeft + fcells[j].offsetWidth - delta);
}
- offset = 0;
- var cells = this.headerRow.getElement().rows[0].cells;
- var length = cells.length - 1;
+ var length = ncells.length - 1;
for(var j=0; j<length; i++,j++) {
- this._columns[i].sep.moveToX(cells[j].offsetLeft + cells[j].offsetWidth - 4);
+ this._columns[i].sep.moveToX(ncells[j].offsetLeft + ncells[j].offsetWidth - delta);
}
},
updateSize: function() {
18 years, 7 months
JBoss Rich Faces SVN: r2968 - in trunk/test-applications/jsp/src/main: webapp/Calendar and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-17 13:42:05 -0400 (Mon, 17 Sep 2007)
New Revision: 2968
Modified:
trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java
trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
Log:
update
Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-09-17 17:42:00 UTC (rev 2967)
+++ trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-09-17 17:42:05 UTC (rev 2968)
@@ -21,38 +21,50 @@
package calendar;
+import java.lang.reflect.Array;
import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
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_LABELS = new String [] { "Sun *",
+ 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 [] MOUNT_LABELS_SHORT = new String [] {"Jan +", "Feb +", "Mar +", "Apr +", "May +", "Jun +", "Jul +", "Aug +", "Sep +", "Oct +", "Nov +", "Dec +"};
-
+ 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 +",
+ "Sep +", "Oct +", "Nov +", "Dec +" };
+
private Locale locale;
private boolean popup;
private boolean readonly;
private boolean showInput;
- private boolean enableManualInput;
+ private boolean enableManualInput;
private boolean ajaxSingle;
private boolean disabled;
private boolean bypassUpdates;
private boolean rendered;
- private boolean useCustomDayLabels;
- private boolean useCustomDay;
- private boolean useCustomMountLabels;
- private boolean useCustomMountLabelsShort;
private boolean required;
private Date currentDate;
private Date selectedDate;
+ private String preloadDateRangeBegin;
+ private String preloadDateRangeEnd;
+ private String weekDay;
+ private String month;
private String height;
private String width;
private String pattern;
@@ -63,9 +75,19 @@
private String toolTipMode;
private String scrollMode;
private String label;
+ private String timeZone;
private int zindex;
private int counter;
+
+ public String getTimeZone() {
+ return timeZone;
+ }
+
+ public void setTimeZone(String timeZone) {
+ this.timeZone = timeZone;
+ }
+
public void changeIcons() {
if (icon != null) {
icon = null;
@@ -75,7 +97,7 @@
label = null;
}
}
-
+
public Locale getLocale() {
return locale;
}
@@ -97,7 +119,7 @@
}
public void setPattern(String pattern) {
-
+
this.pattern = pattern;
}
@@ -118,8 +140,8 @@
jointPoint = "bottom-left";
direction = "bottom-right";
readonly = true;
- enableManualInput=false;
- showInput=true;
+ enableManualInput = false;
+ showInput = true;
boundary = "inactive";
icon = null;
disabled = false;
@@ -129,13 +151,38 @@
toolTipMode = "none";
scrollMode = "client";
required = false;
- useCustomDay = false;
- useCustomDayLabels = false;
- useCustomMountLabels = false;
- useCustomMountLabelsShort = false;
+ weekDay = "none";
+ month = "none";
+ timeZone = "Eastern European Time";
+ preloadDateRangeBegin = "10.09.2007";
+ preloadDateRangeEnd = "11.10.2007";
}
-
+ public Date getPrDateRangeBegin() {
+ Calendar cal = Calendar.getInstance();
+ StringTokenizer st = new StringTokenizer(preloadDateRangeBegin,".");
+ ArrayList<Integer> date = new ArrayList<Integer>();
+ while(st.hasMoreTokens()) {
+ 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());
+ return cal.getTime();
+
+ }
+
+ public Date getPrDateRangeEnd() {
+ Calendar cal = Calendar.getInstance();
+ StringTokenizer st = new StringTokenizer(preloadDateRangeEnd, ".");
+ ArrayList<Integer> date = new ArrayList<Integer>();
+ while(st.hasMoreTokens()) {
+ 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());
+ return cal.getTime();
+ }
+
public boolean isShowInput() {
return showInput;
}
@@ -169,46 +216,40 @@
}
}
- public boolean isUseCustomDayLabels() {
- return useCustomDayLabels;
+ public Object getWeekDayLabels() {
+ if(weekDay.equals("long"))
+ return CalendarBean.WEEK_DAY;
+ else return null;
}
- public void setUseCustomDayLabels(boolean useCustomDayLabels) {
- this.useCustomDayLabels = useCustomDayLabels;
+ public Object getWeekDayLabelsShort() {
+ if(weekDay.equals("short"))
+ return CalendarBean.WEEK_DAY_SHORT;
+ else return null;
}
- public Object getUseCustomMountLabelsShort() {
- if (isUseCustomMountLabelsShort()) {
- return CalendarBean.MOUNT_LABELS_SHORT;
- } else {
- return null;
- }
- }
-
- public Object getUseCustomMountLabels() {
- if (isUseCustomMountLabels()) {
+ public Object getMonthLabels() {
+ if(month.equals("long"))
return CalendarBean.MOUNT_LABELS;
- } else {
- return null;
- }
+ else return null;
}
-
- public Object getWeekDayLabelsShort() {
- if (isUseCustomDayLabels()) {
- return CalendarBean.WEEK_DAY_LABELS;
- } else {
- return null;
- }
+
+ public void weekDay(ValueChangeEvent event) {
+ weekDay = (String) event.getNewValue();
}
- public Object getWeekDayLabels() {
- if (isUseCustomDay()) {
- return CalendarBean.WEEK_DAY;
- } else {
- return null;
- }
+ public Object getMonthLabelsShort() {
+ if(month.equals("short"))
+ return CalendarBean.MOUNT_LABELS_SHORT;
+ else return null;
+
}
+
+ public void month(ValueChangeEvent event) {
+ month = (String) event.getNewValue();
+ }
+
public String getCurrentDateAsText() {
Date currentDate = getCurrentDate();
if (currentDate != null) {
@@ -266,14 +307,16 @@
public void setBoundary(String boundary) {
this.boundary = boundary;
}
- public void dcl(CurrentDateChangeEvent event){
+
+ public void dcl(CurrentDateChangeEvent event) {
System.out.println(event.getCurrentDateString());
System.out.println("ajvhckndskncs");
}
- public void ddd(ValueChangeEvent event){
+
+ public void ddd(ValueChangeEvent event) {
System.out.println(event.getOldValue());
System.out.println(event.getNewValue());
-
+
}
public int getCounter() {
@@ -360,18 +403,6 @@
this.width = width;
}
-
-
- public boolean isUseCustomDay() {
- return useCustomDay;
- }
-
-
-
- public void setUseCustomDay(boolean useCustomDay) {
- this.useCustomDay = useCustomDay;
- }
-
public boolean isRequired() {
return required;
}
@@ -380,27 +411,35 @@
this.required = required;
}
- public boolean isUseCustomMountLabels() {
- return useCustomMountLabels;
+ public String getLabel() {
+ return label;
}
- public void setUseCustomMountLabels(boolean useCustomMountLabels) {
- this.useCustomMountLabels = useCustomMountLabels;
+ public void setLabel(String label) {
+ this.label = label;
}
- public boolean isUseCustomMountLabelsShort() {
- return useCustomMountLabelsShort;
+ public TimeZone getTmZone() {
+ TimeZone tZone = TimeZone.getDefault();
+ System.out.println("timeZone" + timeZone + " tZone " + tZone);
+ tZone.setID(timeZone);
+ System.out.println("timeZone" + timeZone + " tZone " + tZone);
+ return tZone;
}
- public void setUseCustomMountLabelsShort(boolean useCustomMountLabelsShort) {
- this.useCustomMountLabelsShort = useCustomMountLabelsShort;
+ public String getPreloadDateRangeBegin() {
+ return preloadDateRangeBegin;
}
- public String getLabel() {
- return label;
+ public void setPreloadDateRangeBegin(String preloadDateRangeBegin) {
+ this.preloadDateRangeBegin = preloadDateRangeBegin;
}
- public void setLabel(String label) {
- this.label = label;
+ public String getPreloadDateRangeEnd() {
+ return preloadDateRangeEnd;
}
+
+ public void setPreloadDateRangeEnd(String preloadDateRangeEnd) {
+ this.preloadDateRangeEnd = preloadDateRangeEnd;
+ }
}
Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-09-17 17:42:00 UTC (rev 2967)
+++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-09-17 17:42:05 UTC (rev 2968)
@@ -20,16 +20,18 @@
<rich:calendar id="calendarID" dataModel="#{calendarDataModel}"
locale="#{calendarBean.locale}" popup="#{calendarBean.popup}"
datePattern="#{calendarBean.pattern}"
- weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}"
- weekDayLabels="#{calendarBean.weekDayLabels}"
- monthLabels="#{calendarBean.useCustomMountLabels}"
- monthLabelsShort="#{calendarBean.useCustomMountLabelsShort}"
- value="#{calendarBean.selectedDate}" buttonLabel="#{calendarBean.label}"
+ 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}"
+ direction="#{calendarBean.direction}"
enableManualInput="#{calendarBean.enableManualInput}"
- showInput="#{calendarBean.showInput}"
+ showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}"
boundaryDatesMode="#{calendarBean.boundary}"
currentDateChangeListener="#{calendarBean.dcl}"
valueChangeListener="#{calendarBean.ddd}" reRender="counter"
@@ -46,6 +48,7 @@
scrollMode="#{calendarBean.scrollMode}"
rendered="#{calendarBean.rendered}"
focus="popupModeID"
+ timeZone="#{calendarBean.tmZone}"
required="#{calendarBean.required}"
requiredMessage="Required Message">
<f:facet name="optionalHeader">
@@ -82,23 +85,22 @@
<h:selectBooleanCheckbox id="popupModeID" value="#{calendarBean.popup}"
onclick="submit()" />
- <h:outputText value="Custom day labels short:" />
- <h:selectBooleanCheckbox value="#{calendarBean.useCustomDayLabels}"
- onclick="submit()" />
-
<h:outputText value="Custom day labels" />
- <h:selectBooleanCheckbox value="#{calendarBean.useCustomDay}"
- onclick="submit()" />
+ <h:selectOneRadio valueChangeListener="#{calendarBean.weekDay}"
+ onclick="submit()" >
+ <f:selectItem itemLabel="none" itemValue="none"/>
+ <f:selectItem itemLabel="day labels" itemValue="long"/>
+ <f:selectItem itemLabel="day labels short" itemValue="short"/>
+ </h:selectOneRadio>
+
+ <h:outputText value="Custom month labels" />
+ <h:selectOneRadio valueChangeListener="#{calendarBean.month}"
+ onclick="submit()" >
+ <f:selectItem itemLabel="none" itemValue="none"/>
+ <f:selectItem itemLabel="day labels" itemValue="long"/>
+ <f:selectItem itemLabel="day labels short" itemValue="short"/>
+ </h:selectOneRadio>
- <h:outputText value="Custom mount labels" />
- <h:selectBooleanCheckbox value="#{calendarBean.useCustomMountLabels}"
- onclick="submit()" />
-
- <h:outputText value="Custom mount labels short" />
- <h:selectBooleanCheckbox value="#{calendarBean.useCustomMountLabelsShort}"
- onclick="submit()" />
-
-
<h:outputText value="Select Date Pattern:" />
<h:selectOneMenu value="MMM d, yyyy" onchange="submit()"
valueChangeListener="#{calendarBean.selectPattern}">
@@ -111,7 +113,13 @@
<h:inputText id="selectdate" />
<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:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();"/>
+
+ <h:outputText value="Preload date range end(d.m.y)" />
+ <h:inputText value="#{calendarBean.preloadDateRangeEnd}" onchange="submit();"/>
+
<h:outputText value="z-index:" />
<h:inputText value="#{calendarBean.zindex}">
<a4j:support event="onchange" reRender="calendarID"></a4j:support>
@@ -153,6 +161,14 @@
<f:selectItem itemLabel="top-left" itemValue="top-left" />
<f:selectItem itemLabel="auto" itemValue="auto" />
</h:selectOneRadio>
+
+ <h:outputText value="Time Zone:" />
+ <h:selectOneRadio value="#{calendarBean.timeZone}" onchange="submit();">
+ <f:selectItem itemLabel="Eastern European Time" itemValue="Eastern European Time"/>
+ <f:selectItem itemLabel="Turkmenistan Time" itemValue="Turkmenistan Time"/>
+ <f:selectItem itemLabel="Korea Standard Time" itemValue="Korea Standard Time"/>
+ </h:selectOneRadio>
+
<h:outputText value="ToolTip Mode:" />
<h:selectOneRadio value="#{calendarBean.toolTipMode}" onchange="submit();">
@@ -201,12 +217,14 @@
<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:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:subview>
18 years, 7 months
JBoss Rich Faces SVN: r2967 - in trunk/test-applications/facelets/src/main: webapp/Calendar and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-17 13:42:00 -0400 (Mon, 17 Sep 2007)
New Revision: 2967
Modified:
trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java
trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
Log:
update
Modified: trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-09-17 16:29:20 UTC (rev 2966)
+++ trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-09-17 17:42:00 UTC (rev 2967)
@@ -21,14 +21,18 @@
package calendar;
+import java.lang.reflect.Array;
import java.text.DateFormat;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
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;
@@ -150,24 +154,18 @@
weekDay = "none";
month = "none";
timeZone = "Eastern European Time";
- preloadDateRangeBegin = "2007.7.3";
- preloadDateRangeEnd = "2008.7.3";
+ preloadDateRangeBegin = "10.09.2007";
+ preloadDateRangeEnd = "11.10.2007";
}
public Date getPrDateRangeBegin() {
Calendar cal = Calendar.getInstance();
StringTokenizer st = new StringTokenizer(preloadDateRangeBegin,".");
- String [] date = new String[3];
- try {
- if(st.hasMoreElements()) {
- cal.set(Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken()));
- }
- } catch (Exception e) {
- e.printStackTrace();
- cal.set(Calendar.DAY_OF_YEAR, Calendar.DAY_OF_MONTH, Calendar.DAY_OF_WEEK);
- System.out.println(cal.getTime());
- return cal.getTime();
+ ArrayList<Integer> date = new ArrayList<Integer>();
+ while(st.hasMoreTokens()) {
+ 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());
return cal.getTime();
@@ -176,17 +174,11 @@
public Date getPrDateRangeEnd() {
Calendar cal = Calendar.getInstance();
StringTokenizer st = new StringTokenizer(preloadDateRangeEnd, ".");
- String [] date = new String[3];
- try {
- if(st.hasMoreElements()) {
- cal.set(Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken()));
- }
- } catch (Exception e) {
- e.printStackTrace();
- cal.set(Calendar.DAY_OF_YEAR, Calendar.DAY_OF_MONTH, Calendar.DAY_OF_WEEK);
- System.out.println(cal.getTime());
- return cal.getTime();
+ ArrayList<Integer> date = new ArrayList<Integer>();
+ while(st.hasMoreTokens()) {
+ 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());
return cal.getTime();
}
Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-17 16:29:20 UTC (rev 2966)
+++ trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-17 17:42:00 UTC (rev 2967)
@@ -118,10 +118,10 @@
<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" />
+ <h:outputText value="Preload date range begin(d.m.y)" />
<h:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();"/>
- <h:outputText value="Preload date range end" />
+ <h:outputText value="Preload date range end(d.m.y)" />
<h:inputText value="#{calendarBean.preloadDateRangeEnd}" onchange="submit();"/>
<h:outputText value="z-index:" />
18 years, 7 months
JBoss Rich Faces SVN: r2966 - trunk/samples/dropdownmenu-sample/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-17 12:29:20 -0400 (Mon, 17 Sep 2007)
New Revision: 2966
Added:
trunk/samples/dropdownmenu-sample/src/main/webapp/pages/test.jsp
Log:
RF-921 test page
Added: trunk/samples/dropdownmenu-sample/src/main/webapp/pages/test.jsp
===================================================================
--- trunk/samples/dropdownmenu-sample/src/main/webapp/pages/test.jsp (rev 0)
+++ trunk/samples/dropdownmenu-sample/src/main/webapp/pages/test.jsp 2007-09-17 16:29:20 UTC (rev 2966)
@@ -0,0 +1,47 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/dropdown-menu" prefix="ddm" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/menu-components" prefix="mc" %>
+
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>RF-921 Test Page </title>
+ <style>
+ .layoutTable {
+ width: 800px;
+ margin-left: 100px;
+ margin-top: 10px;
+ }
+ </style>
+ </head>
+ <body>
+ <f:view>
+ <table class="layoutTable">
+ <tr>
+ <td>
+ <h:form>
+
+ <ddm:dropDownMenu value="File">
+
+ <mc:menuItem submitMode="ajax" value="New"/>
+ <mc:menuItem submitMode="ajax" value="Open"/>
+
+ <mc:menuGroup value="Save As...">
+ <mc:menuItem submitMode="ajax" value="Text File"/>
+ <mc:menuItem submitMode="ajax" value="PDF File"/>
+ </mc:menuGroup>
+
+ <mc:menuItem submitMode="ajax" value="Close"/>
+ <mc:menuSeparator id="menuSeparator11" />
+ <mc:menuItem submitMode="ajax" value="Exit"/>
+
+ </ddm:dropDownMenu>
+
+ </h:form>
+ </td>
+ </tr>
+ </table>
+ </f:view>
+ </body>
+</html>
\ No newline at end of file
18 years, 7 months