diff options
author | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2008-05-15 06:24:36 +0000 |
---|---|---|
committer | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2008-05-15 06:24:36 +0000 |
commit | c4da6308e31b92a30c998bb85587ec097076fe1f (patch) | |
tree | 52afbb68c9f3cd74bd146c31164e3bc14522ace3 /src | |
parent | 8f48f286b7d517c0c6254e7dc56d40ee7dba111e (diff) | |
download | vaadin-framework-c4da6308e31b92a30c998bb85587ec097076fe1f.tar.gz vaadin-framework-c4da6308e31b92a30c998bb85587ec097076fe1f.zip |
Removed Java 1.5 features, Removed unnecessary (potentially dangerous) code
svn changeset:4494/svn branch:trunk
Diffstat (limited to 'src')
-rw-r--r-- | src/com/itmill/toolkit/tests/tickets/Ticket846.java | 9 | ||||
-rw-r--r-- | src/com/itmill/toolkit/ui/AbstractField.java | 7 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket846.java b/src/com/itmill/toolkit/tests/tickets/Ticket846.java index 3328cc0a87..a8d06a0a86 100644 --- 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 86980d54ea..f067cd961e 100644 --- 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. */ |