From: Artur Signell <artur.signell@itmill.com>
Date: Tue, 23 Feb 2010 08:10:21 +0000 (+0000)
Subject: Removed accidental Java6 annotations
X-Git-Tag: 6.7.0.beta1~2027
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ea74f719748411a2a096cefb3f39016cbf7f0710;p=vaadin-framework.git

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 7a9feae674..571622b0e4 100644
--- 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 00579380d1..f5e3d8e1b2 100644
--- 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");
         Button b = new Button("Remove field and add new", new ClickListener() {
 
-            @Override
             public void buttonClick(ClickEvent event) {
                 layout.removeComponent(tf);
                 addComponent(new TextField("new field"));
diff --git a/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java b/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java
index b894756603..81db64dea0 100644
--- 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);
         b.addListener(new Button.ClickListener() {
 
-            @Override
             public void buttonClick(ClickEvent event) {
                 FileResource res = new FileResource(new File(getContext()
                         .getBaseDirectory()
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 06d0b65fba..e95e78ddea 100644
--- 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);
     }
 
-    @Override
     public void nodeExpand(ExpandEvent event) {
         lastExpanded = event.getItemId();
         expandCalled++;
 
     }
 
-    @Override
     public void nodeCollapse(CollapseEvent event) {
         lastCollapsed = event.getItemId();
         collapseCalled++;