Quick fix for Java 1.4 incompatibilities introduced in [4488] for #846. Please fix...

svn changeset:4490/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket846.java b/src/com/itmill/toolkit/tests/tickets/Ticket846.java
index c9e2598c07ba69a153e11433201e2a3978bfb013..3328cc0a873e4a6c6cf601a69061d5660884a51d 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket846.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket846.java
@@ -3,6 +3,7 @@ package com.itmill.toolkit.tests.tickets;
 import java.util.Collections;
 import java.util.LinkedList;
 
+// FIXME: WARNING sun.net.www.http.Hurryable is Sun proprietary API and may be removed in a future release
 import sun.net.www.http.Hurryable;
 
 import com.itmill.toolkit.Application;
@@ -14,7 +15,7 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket846 extends Application {
 
-       @Override
+       // FIXME: Not allowed in Java 1.4: @Override
        public void init() {
 
                final Window mainWin = new Window("Test app for #846");
@@ -40,6 +41,8 @@ public class Ticket846 extends Application {
                        }
                });
                
+               // FIXME: "For each" expression not allowed in Java 1.4
+               /*
                for (String props : new String[] {"required","invalidAllowed","readOnly","readThrough","invalidCommitted"}) {
                        Button b = new Button(props,new MethodProperty(tx,props));
                        b.setImmediate(true);
@@ -53,6 +56,7 @@ public class Ticket846 extends Application {
                                                mainWin.showNotification("The field is " + (tx.isValid()?"":"not ") + "valid");
                                        };
                                }));
+                               */
        }
 
 }

diff --git a/src/com/itmill/toolkit/ui/AbstractField.java b/src/com/itmill/toolkit/ui/AbstractField.java
index a04402e6e7fb80b43f56fb029b2f83513b31b7c7..86980d54eafe86a039d30f137468cae347ce9ae6 100644 (file)
--- a/src/com/itmill/toolkit/ui/AbstractField.java
+++ b/src/com/itmill/toolkit/ui/AbstractField.java
@@ -853,13 +853,13 @@ public abstract class AbstractField extends AbstractComponent implements Field,
                }
        }
 
-       @Override
+       // FIXME: Annotations are not supported in Java 1.4: @Override
        public void changeVariables(Object source, Map variables) {
                super.changeVariables(source, variables);
                if (validators != null && !validators.isEmpty()) requestRepaint();
        }
 
-       @Override
+    // FIXME: Annotations are not supported in Java 1.4: @Override
        public String getTag() {
                // TODO Auto-generated method stub
                return null;