You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2003/05/12 00:35:41 UTC
cvs commit: jakarta-tapestry/framework/src/org/apache/tapestry TapestryStrings.properties
hlship 2003/05/11 15:35:41
Modified: framework/src/org/apache/tapestry/form DatePicker.java
DatePicker.script
framework/src/org/apache/tapestry TapestryStrings.properties
Log:
Fix minor bugs in DatePicker (not quite right JavaScript or HTML generated).
Revision Changes Path
1.5 +10 -8 jakarta-tapestry/framework/src/org/apache/tapestry/form/DatePicker.java
Index: DatePicker.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/DatePicker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DatePicker.java 25 Apr 2003 01:15:01 -0000 1.4
+++ DatePicker.java 11 May 2003 22:35:40 -0000 1.5
@@ -64,6 +64,7 @@
import java.util.Locale;
import java.util.Map;
+import org.apache.tapestry.ApplicationRuntimeException;
import org.apache.tapestry.IEngine;
import org.apache.tapestry.IForm;
import org.apache.tapestry.IMarkupWriter;
@@ -146,12 +147,18 @@
{
Body body = Body.get(cycle);
+ if (body == null)
+ if (body == null)
+ throw new ApplicationRuntimeException(
+ Tapestry.getString("must-be-contained-by-body", "DatePicker"),
+ this);
+
Locale locale = getPage().getLocale();
DateFormatSymbols dfs = new DateFormatSymbols(locale);
Calendar cal = Calendar.getInstance(locale);
- Date value = getValue();
-
+ Date value = getValue();
+
Map symbols = new HashMap();
symbols.put(SYM_NAME, name);
@@ -181,11 +188,6 @@
if (disabled)
writer.attribute("disabled", "disabled");
-
- if (value == null)
- writer.attribute("value", "");
- else
- writer.attribute("value", Long.toString(value.getTime()));
writer.beginEmpty("input");
writer.attribute("type", "button");
1.2 +2 -3 jakarta-tapestry/framework/src/org/apache/tapestry/form/DatePicker.script
Index: DatePicker.script
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/DatePicker.script,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DatePicker.script 25 Apr 2003 01:15:01 -0000 1.1
+++ DatePicker.script 11 May 2003 22:35:41 -0000 1.2
@@ -35,13 +35,12 @@
<initialization>
<if expression="value == null">
-${name} = new Calendar();
+${calendarObject} = new Calendar();
</if>
<if expression="value != null">
-${name} = new Calendar(${value.time});
+${calendarObject} = new Calendar(${value.time});
</if>
-${calendarObject} = new Calendar();
${calendarObject}.setMonthNames(new Array(${monthNames}));
${calendarObject}.setShortMonthNames(new Array(${shortMonthNames}));
${calendarObject}.setWeekDayNames(new Array(${weekDayNames}));
1.23 +2 -1 jakarta-tapestry/framework/src/org/apache/tapestry/TapestryStrings.properties
Index: TapestryStrings.properties
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/TapestryStrings.properties,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TapestryStrings.properties 6 May 2003 15:48:02 -0000 1.22
+++ TapestryStrings.properties 11 May 2003 22:35:41 -0000 1.23
@@ -26,6 +26,7 @@
required-parameter=Value for parameter ''{0}'' in component {1} is null, and a non-null value is required.
render-only-property=Property ''{0}'' of {1} may only be accessed while the component is rendering.
unsupported-property=Property ''{1}'' is not supported by {0}.
+must-be-contained-by-body={0} components must be contained by a Body component.
# org.apache.tapestry