[dcm4che-commits] SF.net SVN: dcm4che:[13572] dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common /src/main/java/org/dcm4chee/web/common/markup

[<jav...@us...>]

Revision: 13572
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=13572&view=rev
Author:   javawilli
Date:     2010-06-18 13:30:15 +0000 (Fri, 18 Jun 2010)

Log Message:
-----------
[#WEB-76] Consistent date time input/display (localized)

Modified Paths:
--------------
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common/src/main/java/org/dcm4chee/web/common/markup/SimpleDateTimeField.java
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common/src/main/java/org/dcm4chee/web/common/markup/TimeField.java

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common/src/main/java/org/dcm4chee/web/common/markup/SimpleDateTimeField.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common/src/main/java/org/dcm4chee/web/common/markup/SimpleDateTimeField.java	2010-06-18 13:19:33 UTC (rev 13571)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common/src/main/java/org/dcm4chee/web/common/markup/SimpleDateTimeField.java	2010-06-18 13:30:15 UTC (rev 13572)
@@ -113,10 +113,9 @@
         Date t = timeField.getConvertedInput();
         if (d == null) {
             if (t != null) {
-                d = t;
-                dateField.setConvertedInput(d);
+                timeField.setConvertedInput(null);
             }
-            setConvertedInput(d);
+            setConvertedInput(null);
         } else {
             GregorianCalendar cal = new GregorianCalendar();
             cal.setTime(d);

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common/src/main/java/org/dcm4chee/web/common/markup/TimeField.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common/src/main/java/org/dcm4chee/web/common/markup/TimeField.java	2010-06-18 13:19:33 UTC (rev 13571)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-common/src/main/java/org/dcm4chee/web/common/markup/TimeField.java	2010-06-18 13:30:15 UTC (rev 13572)
@@ -70,7 +70,6 @@
     @Override
     public void onComponentTag(ComponentTag tag) {
         super.onComponentTag(tag);
-        log.info("#### TimeField is Valid?:"+isValid()+" input:"+getInput()+ " converted:"+getConvertedInput());
         if ( tag.getAttribute("class") == null ) {
             tag.put("class", "timeField");
         }
@@ -89,9 +88,7 @@
             private Calendar cal = Calendar.getInstance();
 
             public Object convertToObject(String value, Locale locale) {
-                Date oldValue = TimeField.this.getModelObject();
-                Date d = convert(value);
-                return d == null ? oldValue : d;
+                return convert(value);
             }
 
             public String convertToString(Object value, Locale locale) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.