Merge branch '6.8'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java
	src/com/vaadin/terminal/gwt/client/ui/form/VForm.java
	src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java
	tests/server-side/com/vaadin/tests/VaadinClasses.java

Removed Java5-incompatible @Override annotations

1 files changed, 2 insertions, 8 deletions

diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 9551cbaaab..8e504d828b 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -38,12 +38,11 @@ public class Button extends AbstractComponent implements
         Action.ShortcutNotifier {
 
     private ButtonServerRpc rpc = new ButtonServerRpc() {
-        @Override
+
         public void click(MouseEventDetails mouseEventDetails) {
             fireClick(mouseEventDetails);
         }
 
-        @Override
         public void disableOnClick() {
             // Could be optimized so the button is not repainted because of
             // this (client side has already disabled the button)
@@ -52,6 +51,7 @@ public class Button extends AbstractComponent implements
     };
 
     FocusAndBlurServerRpcImpl focusBlurRpc = new FocusAndBlurServerRpcImpl(this) {
+
         @Override
         protected void fireEvent(Event event) {
             Button.this.fireEvent(event);
@@ -332,24 +332,20 @@ public class Button extends AbstractComponent implements
         fireEvent(new Button.ClickEvent(this, details));
     }
 
-    @Override
     public void addListener(BlurListener listener) {
         addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
                 BlurListener.blurMethod);
     }
 
-    @Override
     public void removeListener(BlurListener listener) {
         removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
     }
 
-    @Override
     public void addListener(FocusListener listener) {
         addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
                 FocusListener.focusMethod);
     }
 
-    @Override
     public void removeListener(FocusListener listener) {
         removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
 
@@ -475,12 +471,10 @@ public class Button extends AbstractComponent implements
         requestRepaint();
     }
 
-    @Override
     public int getTabIndex() {
         return tabIndex;
     }
 
-    @Override
     public void setTabIndex(int tabIndex) {
         this.tabIndex = tabIndex;