#7963 Button now extends AbstractComponent instead of AbstractField

Focus related methods previously used from AbstractField are now
implemented in Button directly.

Fixed tests related to this change.

1 files changed, 40 insertions, 186 deletions

diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 16314f94c3..d9a18e141b 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -9,7 +9,6 @@ import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import com.vaadin.data.Property;
 import com.vaadin.event.FieldEvents;
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
@@ -23,8 +22,9 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.VButton;
+import com.vaadin.tools.ReflectTools;
 import com.vaadin.ui.ClientWidget.LoadStyle;
-import com.vaadin.ui.themes.BaseTheme;
+import com.vaadin.ui.Component.Focusable;
 
 /**
  * A generic button component.
@@ -36,28 +36,21 @@ import com.vaadin.ui.themes.BaseTheme;
  */
 @SuppressWarnings("serial")
 @ClientWidget(value = VButton.class, loadStyle = LoadStyle.EAGER)
-public class Button extends AbstractField implements FieldEvents.BlurNotifier,
-        FieldEvents.FocusNotifier {
+public class Button extends AbstractComponent implements
+        FieldEvents.BlurNotifier, FieldEvents.FocusNotifier, Focusable {
 
     /* Private members */
 
-    boolean switchMode = false;
-
     boolean disableOnClick = false;
 
     /**
-     * Creates a new push button. The value of the push button is false and it
-     * is immediate by default.
-     * 
+     * Creates a new push button.
      */
     public Button() {
-        setValue(Boolean.FALSE);
     }
 
     /**
-     * Creates a new push button.
-     * 
-     * The value of the push button is false and it is immediate by default.
+     * Creates a new push button with the given caption.
      * 
      * @param caption
      *            the Button caption.
@@ -68,7 +61,7 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
     }
 
     /**
-     * Creates a new push button with click listener.
+     * Creates a new push button with a click listener.
      * 
      * @param caption
      *            the Button caption.
@@ -102,36 +95,6 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
     }
 
     /**
-     * Creates a new switch button with initial value.
-     * 
-     * @param state
-     *            the Initial state of the switch-button.
-     * @param initialState
-     * @deprecated use {@link CheckBox} instead of Button in "switchmode"
-     */
-    @Deprecated
-    public Button(String caption, boolean initialState) {
-        setCaption(caption);
-        setValue(Boolean.valueOf(initialState));
-        setSwitchMode(true);
-    }
-
-    /**
-     * Creates a new switch button that is connected to a boolean property.
-     * 
-     * @param state
-     *            the Initial state of the switch-button.
-     * @param dataSource
-     * @deprecated use {@link CheckBox} instead of Button in "switchmode"
-     */
-    @Deprecated
-    public Button(String caption, Property dataSource) {
-        setCaption(caption);
-        setSwitchMode(true);
-        setPropertyDataSource(dataSource);
-    }
-
-    /**
      * Paints the content of this component.
      * 
      * @param event
@@ -145,11 +108,6 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
     public void paintContent(PaintTarget target) throws PaintException {
         super.paintContent(target);
 
-        if (isSwitchMode()) {
-            target.addAttribute("type", "switch");
-        }
-        target.addVariable(this, "state", booleanValue());
-
         if (isDisableOnClick()) {
             target.addAttribute(VButton.ATTR_DISABLE_ON_CLICK, true);
         }
@@ -176,46 +134,14 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
         }
 
         if (!isReadOnly() && variables.containsKey("state")) {
-            // Gets the new and old button states
-            final Boolean newValue = (Boolean) variables.get("state");
-            final Boolean oldValue = (Boolean) getValue();
-
-            if (isSwitchMode()) {
-
-                // For switch button, the event is only sent if the
-                // switch state is changed
-                if (newValue != null && !newValue.equals(oldValue)
-                        && !isReadOnly()) {
-                    setValue(newValue);
-                    if (variables.containsKey("mousedetails")) {
-                        fireClick(MouseEventDetails
-                                .deSerialize((String) variables
-                                        .get("mousedetails")));
-                    } else {
-                        // for compatibility with custom implementations which
-                        // don't send mouse details
-                        fireClick();
-                    }
-                }
+            // Send click events when the button is pushed
+            if (variables.containsKey("mousedetails")) {
+                fireClick(MouseEventDetails.deSerialize((String) variables
+                        .get("mousedetails")));
             } else {
-
-                // Only send click event if the button is pushed
-                if (newValue.booleanValue()) {
-                    if (variables.containsKey("mousedetails")) {
-                        fireClick(MouseEventDetails
-                                .deSerialize((String) variables
-                                        .get("mousedetails")));
-                    } else {
-                        // for compatibility with custom implementations which
-                        // don't send mouse details
-                        fireClick();
-                    }
-                }
-
-                // If the button is true for some reason, release it
-                if (null == oldValue || oldValue.booleanValue()) {
-                    setValue(Boolean.FALSE);
-                }
+                // for compatibility with custom implementations which
+                // don't send mouse details
+                fireClick();
             }
         }
 
@@ -228,92 +154,6 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
     }
 
     /**
-     * Checks if it is switchMode.
-     * 
-     * @return <code>true</code> if it is in Switch Mode, otherwise
-     *         <code>false</code>.
-     * @deprecated the {@link CheckBox} component should be used instead of
-     *             Button in switch mode
-     */
-    @Deprecated
-    public boolean isSwitchMode() {
-        return switchMode;
-    }
-
-    /**
-     * Sets the switchMode.
-     * 
-     * @param switchMode
-     *            The switchMode to set.
-     * @deprecated the {@link CheckBox} component should be used instead of
-     *             Button in switch mode
-     */
-    @Deprecated
-    public void setSwitchMode(boolean switchMode) {
-        this.switchMode = switchMode;
-        if (!switchMode) {
-            setImmediate(true);
-            if (booleanValue()) {
-                setValue(Boolean.FALSE);
-            }
-        }
-    }
-
-    /**
-     * Get the boolean value of the button state.
-     * 
-     * @return True iff the button is pressed down or checked.
-     */
-    public boolean booleanValue() {
-        Boolean value = (Boolean) getValue();
-        return (null == value) ? false : value.booleanValue();
-    }
-
-    /**
-     * Sets immediate mode. Push buttons can not be set in non-immediate mode.
-     * 
-     * @see com.vaadin.ui.AbstractComponent#setImmediate(boolean)
-     */
-    @Override
-    public void setImmediate(boolean immediate) {
-        // Push buttons are always immediate
-        super.setImmediate(!isSwitchMode() || immediate);
-    }
-
-    /**
-     * The type of the button as a property.
-     * 
-     * @see com.vaadin.data.Property#getType()
-     */
-    @Override
-    public Class getType() {
-        return Boolean.class;
-    }
-
-    /* Click event */
-
-    private static final Method BUTTON_CLICK_METHOD;
-
-    /**
-     * Button style with no decorations. Looks like a link, acts like a button
-     * 
-     * @deprecated use {@link BaseTheme#BUTTON_LINK} instead.
-     */
-    @Deprecated
-    public static final String STYLE_LINK = "link";
-
-    static {
-        try {
-            BUTTON_CLICK_METHOD = ClickListener.class.getDeclaredMethod(
-                    "buttonClick", new Class[] { ClickEvent.class });
-        } catch (final java.lang.NoSuchMethodException e) {
-            // This should never happen
-            throw new java.lang.RuntimeException(
-                    "Internal error finding methods in Button");
-        }
-    }
-
-    /**
      * Click event. This event is thrown, when the button is clicked.
      * 
      * @author IT Mill Ltd.
@@ -484,6 +324,10 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
      */
     public interface ClickListener extends Serializable {
 
+        public static final Method BUTTON_CLICK_METHOD = ReflectTools
+                .findMethod(ClickListener.class, "buttonClick",
+                        ClickEvent.class);
+
         /**
          * Called when a {@link Button} has been clicked. A reference to the
          * button is given by {@link ClickEvent#getButton()}.
@@ -502,7 +346,8 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
      *            the Listener to be added.
      */
     public void addListener(ClickListener listener) {
-        addListener(ClickEvent.class, listener, BUTTON_CLICK_METHOD);
+        addListener(ClickEvent.class, listener,
+                ClickListener.BUTTON_CLICK_METHOD);
     }
 
     /**
@@ -512,7 +357,8 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
      *            the Listener to be removed.
      */
     public void removeListener(ClickListener listener) {
-        removeListener(ClickEvent.class, listener, BUTTON_CLICK_METHOD);
+        removeListener(ClickEvent.class, listener,
+                ClickListener.BUTTON_CLICK_METHOD);
     }
 
     /**
@@ -538,16 +384,6 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
         fireEvent(new Button.ClickEvent(this, details));
     }
 
-    @Override
-    protected void setInternalValue(Object newValue) {
-        // Make sure only booleans get through
-        if (null != newValue && !(newValue instanceof Boolean)) {
-            throw new IllegalArgumentException(getClass().getSimpleName()
-                    + " only accepts Boolean values");
-        }
-        super.setInternalValue(newValue);
-    }
-
     public void addListener(BlurListener listener) {
         addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
                 BlurListener.blurMethod);
@@ -573,6 +409,8 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
 
     protected ClickShortcut clickShortcut;
 
+    private int tabIndex = 0;
+
     /**
      * Makes it possible to invoke a click on this button by pressing the given
      * {@link KeyCode} and (optional) {@link ModifierKey}s.<br/>
@@ -685,4 +523,20 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
         requestRepaint();
     }
 
+    @Override
+    public int getTabIndex() {
+        return tabIndex;
+    }
+
+    @Override
+    public void setTabIndex(int tabIndex) {
+        this.tabIndex = tabIndex;
+
+    }
+
+    @Override
+    public void focus() {
+        // Overridden only to make public
+        super.focus();
+    }
 }