diff options
Diffstat (limited to 'src/com/vaadin/ui/Button.java')
| -rw-r--r-- | src/com/vaadin/ui/Button.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java index 5c66d57939..68e75b2c69 100644 --- a/src/com/vaadin/ui/Button.java +++ b/src/com/vaadin/ui/Button.java @@ -18,6 +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.PaintException; +import com.vaadin.terminal.PaintTarget; +import com.vaadin.terminal.Vaadin6Component; import com.vaadin.terminal.gwt.client.MouseEventDetails; import com.vaadin.terminal.gwt.client.ui.ButtonConnector.ButtonServerRpc; import com.vaadin.terminal.gwt.client.ui.ButtonState; @@ -35,7 +38,7 @@ import com.vaadin.ui.Component.Focusable; @SuppressWarnings("serial") public class Button extends AbstractComponent implements FieldEvents.BlurNotifier, FieldEvents.FocusNotifier, Focusable, - Action.ShortcutNotifier { + Action.ShortcutNotifier, Vaadin6Component { private ButtonServerRpc rpc = new ButtonServerRpc() { public void click(MouseEventDetails mouseEventDetails) { @@ -87,10 +90,7 @@ public class Button extends AbstractComponent implements * @param source * @param variables */ - @Override public void changeVariables(Object source, Map<String, Object> variables) { - super.changeVariables(source, variables); - if (variables.containsKey(FocusEvent.EVENT_ID)) { fireEvent(new FocusEvent(this)); } @@ -99,6 +99,10 @@ public class Button extends AbstractComponent implements } } + public void paintContent(PaintTarget target) throws PaintException { + // TODO Remove once Vaadin6Component is no longer implemented + } + /** * Click event. This event is thrown, when the button is clicked. * @@ -499,4 +503,5 @@ public class Button extends AbstractComponent implements public ButtonState getState() { return (ButtonState) super.getState(); } + } |