fixes #1571

svn changeset:4299/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java
index 69b31c9600f3082ad28982e85d96e777cfaea20c..e41f3c427d8533fe4cf232fc6edf521f6a68e2e3 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java
@@ -5,7 +5,6 @@
 package com.itmill.toolkit.terminal.gwt.client.ui;\r
 \r
 import com.google.gwt.i18n.client.DateTimeFormat;\r
-import com.google.gwt.user.client.Timer;\r
 import com.google.gwt.user.client.ui.ChangeListener;\r
 import com.google.gwt.user.client.ui.Widget;\r
 import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;\r
@@ -36,6 +35,9 @@ public class ITextualDate extends IDateField implements Paintable,
     }\r
 \r
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {\r
+        // remove possibly added invalid value indication\r
+        text.removeStyleName(ITextField.CLASSNAME + "-error");\r
+\r
         int origRes = currentResolution;\r
         super.updateFromUIDL(uidl, client);\r
         if (origRes != currentResolution) {\r
@@ -118,22 +120,19 @@ public class ITextualDate extends IDateField implements Paintable,
                 try {\r
                     date = DateTimeFormat.getFormat(getFormatString()).parse(\r
                             text.getText());\r
+                    // remove possibly added invalid value indication\r
+                    text.removeStyleName(ITextField.CLASSNAME + "-error");\r
                 } catch (final Exception e) {\r
                     ApplicationConnection.getConsole().log(e.getMessage());\r
                     text.addStyleName(ITextField.CLASSNAME + "-error");\r
-                    final Timer t = new Timer() {\r
-                        public void run() {\r
-                            text.removeStyleName(ITextField.CLASSNAME\r
-                                    + "-error");\r
-                        }\r
-                    };\r
-                    t.schedule(2000);\r
-                    return;\r
+                    client.updateVariable(id, "lastInvalidDateString", text\r
+                            .getText(), false);\r
+                    date = null;\r
                 }\r
-\r
             } else {\r
-                ApplicationConnection.getConsole().log("jep jep");\r
                 date = null;\r
+                // remove possibly added invalid value indication\r
+                text.removeStyleName(ITextField.CLASSNAME + "-error");\r
             }\r
 \r
             // Update variables\r
@@ -177,7 +176,6 @@ public class ITextualDate extends IDateField implements Paintable,
                         date != null ? getMilliseconds() : -1, immediate);\r
             }\r
 \r
-            buildDate();\r
         }\r
     }\r
 \r