diff options
| author | Artur Signell <artur@vaadin.com> | 2011-11-22 16:37:40 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2011-11-22 16:37:40 +0200 |
| commit | 7cdedcae9e92a9ae7dc97f2acdfc119f79e9eb32 (patch) | |
| tree | 75f8aaddc031ca8707b0b84c88775a1c25a5aa18 /src | |
| parent | de92385b022c075c10efb03014dc3cf5ee804094 (diff) | |
| download | vaadin-framework-7cdedcae9e92a9ae7dc97f2acdfc119f79e9eb32.tar.gz vaadin-framework-7cdedcae9e92a9ae7dc97f2acdfc119f79e9eb32.zip | |
#7963 Additional fixes
Removed special case from widget set that used to support VButton
changing into VCheckBox
Corrected tests
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/WidgetSet.java | 10 | ||||
| -rw-r--r-- | src/com/vaadin/ui/Button.java | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/WidgetSet.java b/src/com/vaadin/terminal/gwt/client/WidgetSet.java index 38984e75c3..1c09709bfd 100644 --- a/src/com/vaadin/terminal/gwt/client/WidgetSet.java +++ b/src/com/vaadin/terminal/gwt/client/WidgetSet.java @@ -6,8 +6,6 @@ package com.vaadin.terminal.gwt.client; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.ui.Widget; -import com.vaadin.terminal.gwt.client.ui.VButton; -import com.vaadin.terminal.gwt.client.ui.VCheckBox; import com.vaadin.terminal.gwt.client.ui.VFilterSelect; import com.vaadin.terminal.gwt.client.ui.VListSelect; import com.vaadin.terminal.gwt.client.ui.VPasswordField; @@ -79,9 +77,7 @@ public class WidgetSet { // add our historical quirks - if (widgetClass == VButton.class && uidl.hasAttribute("type")) { - return VCheckBox.class; - } else if (widgetClass == VView.class && uidl.hasAttribute("sub")) { + if (widgetClass == VView.class && uidl.hasAttribute("sub")) { return VWindow.class; } else if (widgetClass == VFilterSelect.class) { if (uidl.hasAttribute("type")) { @@ -143,9 +139,7 @@ public class WidgetSet { * is in multiselect mode, causing the clientside implementation to * *actually* be VListSelect, when the annotation says VFilterSelect */ - if (fullyqualifiedName.equals("com.vaadin.ui.Button")) { - loadImplementation(VCheckBox.class); - } else if (fullyqualifiedName.equals("com.vaadin.ui.Select")) { + if (fullyqualifiedName.equals("com.vaadin.ui.Select")) { loadImplementation(VListSelect.class); } else if (fullyqualifiedName.equals("com.vaadin.ui.TextField")) { loadImplementation(VTextArea.class); diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java index d9a18e141b..93bd6d8963 100644 --- a/src/com/vaadin/ui/Button.java +++ b/src/com/vaadin/ui/Button.java @@ -9,6 +9,7 @@ import java.io.Serializable; import java.lang.reflect.Method; import java.util.Map; +import com.vaadin.event.Action; import com.vaadin.event.FieldEvents; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; @@ -37,7 +38,8 @@ import com.vaadin.ui.Component.Focusable; @SuppressWarnings("serial") @ClientWidget(value = VButton.class, loadStyle = LoadStyle.EAGER) public class Button extends AbstractComponent implements - FieldEvents.BlurNotifier, FieldEvents.FocusNotifier, Focusable { + FieldEvents.BlurNotifier, FieldEvents.FocusNotifier, Focusable, + Action.ShortcutNotifier { /* Private members */ |