From 9ee15a481db55b48771b6f2beeb8c8e36bbe478d Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 30 Apr 2008 10:56:24 +0000
Subject: [PATCH] fixes #1571

svn changeset:4299/svn branch:trunk
---
 .../terminal/gwt/client/ui/ITextualDate.java  | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

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