Remove HasValue from Grid

Extracts grid single selection into separate class, which
is an extension like in V7. Using an extension makes it
possible to easily add multiselect and no-select modes back,
and support custom selection models.

Adds Grid:asSingleSelect() SingleSelect so that grid can be
used as a Select in a binder.

Removes all remaining references to SelectionModels in Listings.
Renames SingleSelectionChangeEvent to SingleSelectionEvent, because
then it is unified with selection listener and MultiSelectionEvent.

Fixes vaadin/framework8-issues#424
Fixes vaadin/framework8-issues#425

Change-Id: Ie22bef29cfd4336c3f65d4e63531c578b8dd76a3

6 files changed, 16 insertions, 25 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractSingleSelectTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractSingleSelectTestUI.java
index a3c43adc1f..2fa6abced8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractSingleSelectTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractSingleSelectTestUI.java
@@ -32,7 +32,7 @@ public abstract class AbstractSingleSelectTestUI<T extends AbstractSingleSelect<
 
     protected void createListenerMenu() {
         createListenerAction("Selection listener", "Listeners", c -> c
-                .addSelectionListener(e -> log("Selected: " + e.getValue())));
+                .addSelectionChangeListener(e -> log("Selected: " + e.getValue())));
     }
 
     protected void createSelectionMenu() {
@@ -46,12 +46,7 @@ public abstract class AbstractSingleSelectTestUI<T extends AbstractSingleSelect<
 
         createSelectAction("Select", "Selection", options, "None",
                 (component, selected, data) -> {
-                    if (selected != null) {
-                        component.select(selected);
-                    } else {
-                        component.getSelectedItem()
-                                .ifPresent(component::deselect);
-                    }
+                    component.setValue(selected);
                 });
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java
index cbd3c4ebcf..dc87ee59e5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java
@@ -31,7 +31,7 @@ public class ComboBoxSelectingWithNewItemsAllowed extends ComboBoxSelecting {
         comboBox.setNewItemHandler(text -> {
             items.add(text);
             comboBox.setItems(items);
-            comboBox.select(text);
+            comboBox.setValue(text);
             label.setValue(String.valueOf(items.size()));
         });
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
index 96a2f313b9..59368b198b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
@@ -30,6 +30,7 @@ import com.vaadin.ui.Notification;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.StyleGenerator;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.components.grid.SingleSelectionModel;
 import com.vaadin.ui.renderers.DateRenderer;
 import com.vaadin.ui.renderers.HtmlRenderer;
 import com.vaadin.ui.renderers.NumberRenderer;
@@ -150,7 +151,7 @@ public class GridBasics extends AbstractTestUIWithLog {
                 .put("\"Watching\"",
                         dataObj -> new Label("You are watching item id "
                                 + dataObj.getRowNumber() + " ("
-                                + (watchingCount++) + ")"));
+                                + watchingCount++ + ")"));
         persistingDetails = new PersistingDetailsGenerator();
         generators.put("Persisting", persistingDetails);
     }
@@ -185,7 +186,8 @@ public class GridBasics extends AbstractTestUIWithLog {
         grid.addColumn(data -> data.getSmallRandom() / 5d,
                 new ProgressBarRenderer()).setCaption(COLUMN_CAPTIONS[7]);
 
-        grid.addSelectionListener(e -> log("Selected: " + e.getValue()));
+        ((SingleSelectionModel<DataObject>) grid.getSelectionModel())
+                .addSelectionChangeListener(e -> log("Selected: " + e.getValue()));
 
         layout.addComponent(createMenu());
         layout.addComponent(grid);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectInit.java b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectInit.java
index 28c2e2035d..af5ecbf3a0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectInit.java
@@ -29,7 +29,7 @@ public class NativeSelectInit extends AbstractReindeerTestUI {
     protected void setup(VaadinRequest request) {
         NativeSelect<String> select = new NativeSelect<>();
         select.setItems("Foo", "Bar");
-        select.select("Bar");
+        select.setValue("Bar");
         addComponent(select);
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/radiobutton/RadioButtonGroupTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/radiobutton/RadioButtonGroupTestUI.java
index 7230eb9017..246441598b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/radiobutton/RadioButtonGroupTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/radiobutton/RadioButtonGroupTestUI.java
@@ -51,7 +51,7 @@ public class RadioButtonGroupTestUI
     protected void createSelectionMenu() {
         createClickAction("Clear selection", selectionCategory,
                 (component, item, data) -> component.getSelectedItem()
-                        .ifPresent(component::deselect),
+                        .ifPresent(value -> component.setValue(null)),
                 "");
 
         Command<RadioButtonGroup<Object>, String> toggleSelection = (component,
@@ -94,15 +94,15 @@ public class RadioButtonGroupTestUI
 
     private void toggleSelection(String item) {
         if (getComponent().isSelected(item)) {
-            getComponent().deselect(item);
+            getComponent().setValue(null);
         } else {
-            getComponent().select(item);
+            getComponent().setValue(item);
         }
     }
 
     protected void createListenerMenu() {
         createListenerAction("Selection listener", "Listeners",
-                c -> c.addSelectionListener(
+                c -> c.addSelectionChangeListener(
                         e -> log("Selected: " + e.getSelectedItem())));
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/data/DummyData.java b/uitest/src/main/java/com/vaadin/tests/data/DummyData.java
index 7157a205f4..cc1e60e7b0 100644
--- a/uitest/src/main/java/com/vaadin/tests/data/DummyData.java
+++ b/uitest/src/main/java/com/vaadin/tests/data/DummyData.java
@@ -33,7 +33,7 @@ public class DummyData extends AbstractTestUIWithLog {
 
         @Override
         public Stream<String> fetch(Query query) {
-            log("Backend request #" + (count++));
+            log("Backend request #" + count++);
             return super.fetch(query);
         }
     }
@@ -61,7 +61,7 @@ public class DummyData extends AbstractTestUIWithLog {
         }
 
         @Override
-        public void select(String item) {
+        public void setValue(String item) {
             if (selected != null) {
                 getDataCommunicator().refresh(selected);
             }
@@ -71,12 +71,6 @@ public class DummyData extends AbstractTestUIWithLog {
             }
         }
 
-        @Override
-        public void deselect(String item) {
-            if (item == selected) {
-                select(null);
-            }
-        }
     }
 
     @Override
@@ -87,12 +81,12 @@ public class DummyData extends AbstractTestUIWithLog {
             items.add("Foo " + i);
         }
         dummy.setDataSource(new LoggingDataSource(items));
-        dummy.select("Foo 200");
+        dummy.setValue("Foo 200");
 
         HorizontalLayout controls = new HorizontalLayout();
         addComponent(controls);
         controls.addComponent(new Button("Select Foo 20", e -> {
-            dummy.select("Foo " + 20);
+            dummy.setValue("Foo " + 20);
         }));
         controls.addComponent(new Button("Reset data source", e -> {
             dummy.setDataSource(new LoggingDataSource(items));