summaryrefslogtreecommitdiffstats
path: root/client/src
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-08-30 16:25:57 +0300
committerArtur Signell <artur@vaadin.com>2012-08-30 16:25:57 +0300
commit51eb105ee6af55bc8972ab3e860c38a11194b5bd (patch)
tree89f35e0b71c2dc0117490e44aef0d1f15a304387 /client/src
parent876182aaa34682503338a4dcdd119b3ebc256f97 (diff)
downloadvaadin-framework-51eb105ee6af55bc8972ab3e860c38a11194b5bd.tar.gz
vaadin-framework-51eb105ee6af55bc8972ab3e860c38a11194b5bd.zip
Merged Select with ComboBox (#2869)
Select now extends ComboBox instead of vice versa Select is now deprecated in favor of ComboBox
Diffstat (limited to 'client/src')
-rw-r--r--client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
index e942f803e9..fc060f3deb 100644
--- a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
+++ b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
@@ -27,9 +27,9 @@ import com.vaadin.client.ui.combobox.VFilterSelect.FilterSelectSuggestion;
import com.vaadin.client.ui.menubar.MenuItem;
import com.vaadin.shared.ui.Connect;
import com.vaadin.shared.ui.combobox.ComboBoxConstants;
-import com.vaadin.ui.Select;
+import com.vaadin.ui.ComboBox;
-@Connect(Select.class)
+@Connect(ComboBox.class)
public class ComboBoxConnector extends AbstractFieldConnector implements
Paintable, SimpleManagedLayout {