merge master

1 files changed, 11 insertions, 3 deletions

diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 0abc50f26f..0cb667d527 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -18,9 +18,9 @@ import com.vaadin.event.ShortcutAction;
 import com.vaadin.event.ShortcutAction.KeyCode;
 import com.vaadin.event.ShortcutAction.ModifierKey;
 import com.vaadin.event.ShortcutListener;
-import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.ui.button.ButtonServerRpc;
-import com.vaadin.terminal.gwt.client.ui.button.ButtonState;
+import com.vaadin.shared.MouseEventDetails;
+import com.vaadin.shared.ui.button.ButtonServerRpc;
+import com.vaadin.shared.ui.button.ButtonState;
 import com.vaadin.tools.ReflectTools;
 import com.vaadin.ui.Component.Focusable;
 
@@ -39,10 +39,12 @@ public class Button extends AbstractComponent implements
 
     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)
@@ -332,20 +334,24 @@ 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);
 
@@ -474,6 +480,7 @@ public class Button extends AbstractComponent implements
      * 
      * @see com.vaadin.ui.Component.Focusable#getTabIndex()
      */
+    @Override
     public int getTabIndex() {
         return getState().getTabIndex();
     }
@@ -483,6 +490,7 @@ public class Button extends AbstractComponent implements
      * 
      * @see com.vaadin.ui.Component.Focusable#setTabIndex(int)
      */
+    @Override
     public void setTabIndex(int tabIndex) {
         getState().setTabIndex(tabIndex);
         requestRepaint();