[richfaces-svn-commits] JBoss Rich Faces SVN: r2057 - in trunk: samples/calendar-sample/src/main/webapp/pages and 4 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Fri Aug 3 12:39:30 EDT 2007
Author: akushunin
Date: 2007-08-03 12:39:29 -0400 (Fri, 03 Aug 2007)
New Revision: 2057
Modified:
trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java
trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
trunk/ui/calendar/src/main/config/component/calendar.xml
trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
trunk/ui/calendar/src/test/java/org/richfaces/component/CurrentDateEventTest.java
Log:
Implementing new functionality...
Modified: trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java
===================================================================
--- trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java 2007-08-03 15:59:04 UTC (rev 2056)
+++ trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java 2007-08-03 16:39:29 UTC (rev 2057)
@@ -39,11 +39,13 @@
private Locale locale;
private boolean popup;
+ private boolean readonly;
private String pattern;
private Date currentDate;
private Date selectedDate;
private String jointPoint;
private String direction;
+ private String inputType;
private boolean useCustomDayLabels;
@@ -80,8 +82,27 @@
pattern = "MMM d, yyyy";
jointPoint = "bottom-left";
direction = "bottom-right";
+ readonly=true;
+ inputType="readonly";
}
+
+ public String getInputType() {
+ return inputType;
+ }
+
+ public void setInputType(String inputType) {
+ this.inputType = inputType;
+ }
+
+ public boolean isReadonly() {
+ return readonly;
+ }
+
+ public void setReadonly(boolean readonly) {
+ this.readonly = readonly;
+ }
+
public void selectLocale(ValueChangeEvent event){
String tLocale = (String) event.getNewValue();
Modified: trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
===================================================================
--- trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-08-03 15:59:04 UTC (rev 2056)
+++ trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-08-03 16:39:29 UTC (rev 2057)
@@ -39,7 +39,8 @@
currentDate="#{calendarBean.currentDate}"
jointPoint="#{calendarBean.jointPoint}"
direction="#{calendarBean.direction}"
- buttonLabel="PopUp">
+ buttonLabel="PopUp"
+ inputType="#{calendarBean.inputType}">
<f:validator validatorId="org.richfaces.CalendarValidator" />
@@ -87,7 +88,15 @@
<f:selectItem itemLabel="top-right" itemValue="top-right"/>
<f:selectItem itemLabel="top-left" itemValue="top-left"/>
<f:selectItem itemLabel="auto" itemValue="auto"/>
- </h:selectOneRadio>
+ </h:selectOneRadio>
+ <h:outputText value="InputType:" />
+ <h:selectOneRadio onchange="submit()" value="#{calendarBean.inputType}">
+ <f:selectItem itemLabel="readonly" itemValue="readonly"/>
+ <f:selectItem itemLabel="hidden" itemValue="hidden"/>
+ <f:selectItem itemLabel="editable" itemValue="editable"/>
+ </h:selectOneRadio>
+
+
<%-- <h:commandButton id="calendarPopup" type="button" value="popup" onclick="$(this.form.id+':calendar').component.doSwitch();"/>
--%> </h:panelGrid>
@@ -101,6 +110,8 @@
<h:commandButton value="Submit"/>
+
+
</h:form>
</f:view>
</body>
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2007-08-03 15:59:04 UTC (rev 2056)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2007-08-03 16:39:29 UTC (rev 2057)
@@ -151,6 +151,13 @@
<classname>java.lang.String</classname>
<description></description>
<defaultvalue>"batch"</defaultvalue>
+ </property>
+ <property>
+ <name>inputType</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ <defaultvalue>"readonly"</defaultvalue>
</property>
+
</component>
</components>
Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-08-03 15:59:04 UTC (rev 2056)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-08-03 16:39:29 UTC (rev 2057)
@@ -128,7 +128,13 @@
public abstract String getToolTipMode();
public abstract void setToolTipMode(String toolTipMode);
+
+ public abstract String getInputType();
+ public abstract void setInputType(String inputType);
+
+
+
// currentDate processing -------------------------------------------------
public Calendar getCalendar() {
@@ -254,12 +260,14 @@
calendar.clear();
calendar.set(Calendar.DATE, 1);
int idx = currentDateString.indexOf('/');
+ if (idx != -1){
calendar.set(Calendar.MONTH, Integer.parseInt(currentDateString
.substring(0, idx)) - 1);
calendar.set(Calendar.YEAR, Integer.parseInt(currentDateString
.substring(idx + 1)));
return calendar.getTime();
+ }else {return null;}
}
Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-08-03 15:59:04 UTC (rev 2056)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-08-03 16:39:29 UTC (rev 2057)
@@ -60,7 +60,22 @@
<![CDATA[
boolean popup = getUtils().isBooleanAttribute(component, "popup");
if (popup) {
- addPopupToAjaxRendered(context, component);]]>
+ addPopupToAjaxRendered(context, component);
+ Boolean readonly = Boolean.FALSE;
+ String hidden = "text";
+ String inputType = component.getAttributes().get("inputType").toString();
+ if(inputType.equals("readonly")){
+ readonly=Boolean.TRUE;
+ }
+ else{
+ if (inputType.equals("hidden")){
+ hidden = inputType;
+ }
+ }
+ variables.setVariable("readonly",readonly);
+ variables.setVariable("hidden",hidden);
+ ]]>
+
</jsp:scriptlet>
<span
@@ -70,8 +85,8 @@
id="#{clientId}InputDate"
name="#{clientId}InputDate"
value="#{this:getInputValue(context,component)}"
- type="text"
- readonly="#{component.attributes['readonly']}"
+ type="#{hidden}"
+ readonly="#{readonly}"
disabled="#{component.attributes['disabled']}"
accesskey="#{component.attributes['accesskey']}"
maxlength="#{component.attributes['maxlength']}"
Modified: trunk/ui/calendar/src/test/java/org/richfaces/component/CurrentDateEventTest.java
===================================================================
--- trunk/ui/calendar/src/test/java/org/richfaces/component/CurrentDateEventTest.java 2007-08-03 15:59:04 UTC (rev 2056)
+++ trunk/ui/calendar/src/test/java/org/richfaces/component/CurrentDateEventTest.java 2007-08-03 16:39:29 UTC (rev 2057)
@@ -35,7 +35,7 @@
private CurrentDateChangeEvent event2;
private CurrentDateChangeEvent event4;
private AjaxEvent event3;
- private UICalendar calendar;
+ private UICalendar calendar;
private Calendar cal;
/**
@@ -56,7 +56,7 @@
calendar = (UICalendar) application.createComponent(UICalendar.COMPONENT_TYPE);;
event1 = new CurrentDateChangeEvent (calendar, "11/2001");
cal = Calendar.getInstance();
- cal.set(2001, 10, 9);
+ cal.set(2001, 0, 9);
event2 = new CurrentDateChangeEvent (calendar, cal.getTime());
event4 = new CurrentDateChangeEvent (calendar, "");
event3 = new AjaxEvent(calendar);
@@ -78,9 +78,11 @@
}
public void testBrodcastEvent() throws Exception{
+ calendar.broadcast(event4);
calendar.broadcast(event1);
calendar.broadcast(event3);
- calendar.broadcast(event4);
+ System.out.println(calendar.getCurrentDate().toString());
+
// calendar.broadcast(event2);
}
More information about the richfaces-svn-commits
mailing list