Update of
/var/cvs/applications/editwizard/src/org/mmbase/applications/editwizard
In directory james.mmbase.org:/tmp/cvs-serv27242
Modified Files:
Wizard.java
Log Message:
MMB-1774
See also:
http://cvs.mmbase.org/viewcvs/applications/editwizard/src/org/mmbase/applications/editwizard
See also: http://www.mmbase.org/jira/browse/MMB-1774
Index: Wizard.java
===================================================================
RCS file:
/var/cvs/applications/editwizard/src/org/mmbase/applications/editwizard/Wizard.java,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -b -r1.177 -r1.178
--- Wizard.java 7 Jan 2009 20:39:58 -0000 1.177
+++ Wizard.java 13 Jan 2009 14:24:11 -0000 1.178
@@ -46,7 +46,7 @@
* @author Pierre van Rooden
* @author Hillebrand Gelderblom
* @since MMBase-1.6
- * @version $Id: Wizard.java,v 1.177 2009/01/07 20:39:58 nklasens Exp $
+ * @version $Id: Wizard.java,v 1.178 2009/01/13 14:24:11 michiel Exp $
*
*/
public class Wizard implements org.mmbase.util.SizeMeasurable,
java.io.Serializable {
@@ -617,6 +617,7 @@
} else { // the request encoding was known, so, I think we
can suppose that the Parameter value was interpreted correctly.
result = req.getParameter(name);
}
+ log.debug("parameter value " + result);
if (result.equals("date")) {
result = buildDate(req, name);
@@ -692,9 +693,11 @@
int year = Integer.parseInt(req.getParameter("internal_" + name +
"_year"));
int hours = Integer.parseInt(req.getParameter("internal_" + name +
"_hours"));
int minutes = Integer.parseInt(req.getParameter("internal_" + name
+ "_minutes"));
+ String secParameter = req.getParameter("internal_" + name +
"_seconds");
+ int seconds = secParameter == null ? 0 :
Integer.parseInt(secParameter);
Calendar cal = getCalendar();
- cal.set(year, month - 1, day, hours, minutes, 0);
+ cal.set(year, month - 1, day, hours, minutes, seconds);
return "" + cal.getTimeInMillis() / 1000;
} catch (RuntimeException e) { //NumberFormat NullPointer
log.debug("Failed to parse datetime for " + name + " "
@@ -709,7 +712,7 @@
int minutes = Integer.parseInt(req.getParameter("internal_" + name
+ "_minutes"));
int seconds = Integer.parseInt(req.getParameter("internal_" + name
+ "_seconds"));
- Calendar cal = getCalendar();
+ Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
cal.set(1970, 0, 1, hours, minutes, seconds);
return "" + cal.getTimeInMillis() / 1000;
} catch (RuntimeException e) { //NumberFormat NullPointer
@@ -2775,7 +2778,7 @@
// 'ftype' values of new date guitypes (such as new datatypes) need to
be converted to
// datetime
if (!"data".equals(ftype)) {
- if ("date".equals(dttype) || "time".equals(dttype)) {
+ if ("date".equals(dttype) || "time".equals(dttype) ||
"duration".equals(dttype)) {
ftype = dttype;
dttype = "datetime";
} else if ("datetime".equals(dttype) &&
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
