diff options
| author | Marko Grönroos <magi@iki.fi> | 2008-05-14 18:04:06 +0000 |
|---|---|---|
| committer | Marko Grönroos <magi@iki.fi> | 2008-05-14 18:04:06 +0000 |
| commit | d1bc48b0ab3bfaa6fe64b3b56e2cb4417a9cf175 (patch) | |
| tree | 0b2b888a61a49f1281bd6446e46ae52aa92aee2b | |
| parent | 03df532b3fc70f2480ad349cd2cd629b22aeee95 (diff) | |
| download | vaadin-framework-d1bc48b0ab3bfaa6fe64b3b56e2cb4417a9cf175.tar.gz vaadin-framework-d1bc48b0ab3bfaa6fe64b3b56e2cb4417a9cf175.zip | |
Quick fix for Java 1.4 incompatibilities introduced in [4488] for #846. Please fix better.
svn changeset:4490/svn branch:trunk
| -rw-r--r-- | src/com/itmill/toolkit/tests/tickets/Ticket846.java | 6 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/ui/AbstractField.java | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket846.java b/src/com/itmill/toolkit/tests/tickets/Ticket846.java index c9e2598c07..3328cc0a87 100644 --- 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 a04402e6e7..86980d54ea 100644 --- 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; |