From 8b1e80f5585c524c2570107ebfe42890174cfb0f Mon Sep 17 00:00:00 2001
From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Thu, 3 Jul 2008 12:15:59 +0000
Subject: [PATCH] Removed JDK 1.5 dependencies from a fix (is Form.java) that
 is targeted to 5.2.x

svn changeset:5024/svn branch:trunk
---
 src/com/itmill/toolkit/ui/Form.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/com/itmill/toolkit/ui/Form.java b/src/com/itmill/toolkit/ui/Form.java
index 0140f0dffb..5f0863ff51 100644
--- a/src/com/itmill/toolkit/ui/Form.java
+++ b/src/com/itmill/toolkit/ui/Form.java
@@ -181,20 +181,21 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
      * the calculation of the error message is separate from validation, because
      * validation fails also on empty errors.
      */
-    @SuppressWarnings("unchecked")
-    @Override
     public ErrorMessage getErrorMessage() {
         for (final Iterator i = propertyIds.iterator(); i.hasNext();) {
             try {
-                AbstractComponent field = (AbstractComponent)fields.get(i.next());
+                AbstractComponent field = (AbstractComponent) fields.get(i
+                        .next());
                 ErrorMessage e = field.getErrorMessage();
                 if (e != null) {
                     // Skip empty errors
-                    if (e.toString().isEmpty())
+                    if ("".equals(e.toString())) {
                         continue;
+                    }
                     return e;
                 }
-            } catch (ClassCastException ignored) {}
+            } catch (ClassCastException ignored) {
+            }
         }
         return null;
     }
-- 
2.39.5