Removed Java 1.5 features, Removed unnecessary (potentially dangerous) code

svn changeset:4494/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket846.java b/src/com/itmill/toolkit/tests/tickets/Ticket846.java
index 3328cc0a873e4a6c6cf601a69061d5660884a51d..a8d06a0a868422d3776d9542a13ab7cce1d00486 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket846.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket846.java
@@ -15,7 +15,6 @@ import com.itmill.toolkit.ui.Window;
 
 public class Ticket846 extends Application {
 
-       // FIXME: Not allowed in Java 1.4: @Override
        public void init() {
 
                final Window mainWin = new Window("Test app for #846");
@@ -41,10 +40,9 @@ 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));
+               final String[] visibleProps = {"required","invalidAllowed","readOnly","readThrough","invalidCommitted"}; 
+               for (int i=0;i<visibleProps.length; i++ ) {
+                       Button b = new Button(visibleProps[i],new MethodProperty(tx,visibleProps[i]));
                        b.setImmediate(true);
                        mainWin.addComponent(b);
                }
@@ -56,7 +54,6 @@ 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 86980d54eafe86a039d30f137468cae347ce9ae6..f067cd961e57df661fb0a86d3ba412d54182de53 100644 (file)
--- a/src/com/itmill/toolkit/ui/AbstractField.java
+++ b/src/com/itmill/toolkit/ui/AbstractField.java
@@ -853,18 +853,11 @@ public abstract class AbstractField extends AbstractComponent implements Field,
                }
        }
 
-       // 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();
        }
 
-    // FIXME: Annotations are not supported in Java 1.4: @Override
-       public String getTag() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
        /**
         * Asks the terminal to place the cursor to this field.
         */