Removed accidental Java6 annotations

svn changeset:11476/svn branch:6.3

diff --git a/src/com/vaadin/terminal/FileResource.java b/src/com/vaadin/terminal/FileResource.java
index 7a9feae6745f3f6ecac0fcb3a225475a4ae52ce4..571622b0e4a627632bc12d1d2b6ffa2ca12ad8a5 100644 (file)
--- a/src/com/vaadin/terminal/FileResource.java
+++ b/src/com/vaadin/terminal/FileResource.java
@@ -71,7 +71,6 @@ public class FileResource implements ApplicationResource {
             // Log the exception using the application error handler
             getApplication().getErrorHandler().terminalError(new ErrorEvent() {
 
-                @Override
                 public Throwable getThrowable() {
                     return e;
                 }

diff --git a/tests/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java b/tests/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
index 00579380d1e11fef6bdca486289dac0b581e414c..f5e3d8e1b2c4857e1f2c0936bdb43f461319c614 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
+++ b/tests/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
@@ -15,7 +15,6 @@ public class CssLayoutRemoveComponentWithCaption extends TestBase {
         final TextField tf = new TextField("Caption");\r
         Button b = new Button("Remove field and add new", new ClickListener() {\r
 \r
-            @Override\r
             public void buttonClick(ClickEvent event) {\r
                 layout.removeComponent(tf);\r
                 addComponent(new TextField("new field"));\r

diff --git a/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java b/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java
index b8947566034db38f14a2e9f1ba7d9bb3d2476be7..81db64dea0b469b26cdcc7d1be59b7dbbb467aa8 100644 (file)
--- a/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java
+++ b/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java
@@ -21,7 +21,6 @@ public class NonExistingFileResource extends TestBase {
         Button b = new Button("Download " + filename);\r
         b.addListener(new Button.ClickListener() {\r
 \r
-            @Override\r
             public void buttonClick(ClickEvent event) {\r
                 FileResource res = new FileResource(new File(getContext()\r
                         .getBaseDirectory()\r

diff --git a/tests/src/com/vaadin/tests/server/component/tree/TestListeners.java b/tests/src/com/vaadin/tests/server/component/tree/TestListeners.java
index 06d0b65fbaab683f653f04596615b9638d8fa241..e95e78ddeaa5e4cee181cda65acb3458092e5f55 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/tree/TestListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/tree/TestListeners.java
@@ -121,14 +121,12 @@ public class TestListeners extends TestCase implements ExpandListener,
         assertEquals(0, collapseCalled);\r
     }\r
 \r
-    @Override\r
     public void nodeExpand(ExpandEvent event) {\r
         lastExpanded = event.getItemId();\r
         expandCalled++;\r
 \r
     }\r
 \r
-    @Override\r
     public void nodeCollapse(CollapseEvent event) {\r
         lastCollapsed = event.getItemId();\r
         collapseCalled++;\r