Merge pull request #1 from Antea/master

solves tsuoanttila#30 issue - sorting by first column doesn't provoke selection/deselection of all rows
alexandru78 · Aug 8, 2019 · fe04838 · fe04838
2 parents cc401c6 + afcbb92
commit fe04838
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/GridExtensionPack-demo/pom.xml b/GridExtensionPack-demo/pom.xml
@@ -5,12 +5,12 @@
 	<groupId>org.vaadin.teemusa</groupId>
 	<artifactId>gridextensionpack-demo</artifactId>
 	<packaging>war</packaging>
-	<version>2.0-SNAPSHOT</version>
+	<version>2.0.2</version>
 	<name>GridExtensionPack Add-on Demo</name>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<vaadin.version>8.0.0</vaadin.version>
+		<vaadin.version>8.8.5</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
 	</properties>
 

diff --git a/GridExtensionPack/pom.xml b/GridExtensionPack/pom.xml
@@ -5,12 +5,12 @@
 	<groupId>org.vaadin.teemusa</groupId>
 	<artifactId>gridextensionpack</artifactId>
 	<packaging>jar</packaging>
-	<version>2.0-SNAPSHOT</version>
+	<version>2.0.2</version>
 	<name>GridExtensionPack Add-on</name>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<vaadin.version>8.0.0</vaadin.version>
+		<vaadin.version>8.8.5</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
 
 		<!-- ZIP Manifest fields -->

diff --git a/...org/vaadin/teemusa/gridextensions/client/tableselection/TableSelectionModelConnector.java b/...org/vaadin/teemusa/gridextensions/client/tableselection/TableSelectionModelConnector.java
@@ -1,18 +1,15 @@
 package org.vaadin.teemusa.gridextensions.client.tableselection;
 
-import org.vaadin.teemusa.gridextensions.tableselection.TableSelectionModel;
-
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.vaadin.client.ServerConnector;
 import com.vaadin.client.annotations.OnStateChange;
 import com.vaadin.client.connectors.grid.MultiSelectionModelConnector;
 import com.vaadin.client.renderers.Renderer;
 import com.vaadin.client.widget.grid.events.BodyClickHandler;
 import com.vaadin.client.widgets.Grid;
-import com.vaadin.shared.Range;
 import com.vaadin.shared.ui.Connect;
-
 import elemental.json.JsonObject;
+import org.vaadin.teemusa.gridextensions.tableselection.TableSelectionModel;
 
 @Connect(TableSelectionModel.class)
 public class TableSelectionModelConnector extends MultiSelectionModelConnector {
@@ -29,10 +26,8 @@ public Renderer<Boolean> getRenderer() {
 	private HandlerRegistration clickHandler;
 
 	@Override
-	protected void initSelectionModel() {
-		super.initSelectionModel();
-
-		getGrid().setSelectionModel(new CustomSelectionModel());
+	protected MultiSelectionModel createSelectionModel() {
+		return new CustomSelectionModel();
 	}
 
 	@Override

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.vaadin.teemusa</groupId>
 	<artifactId>gridextensionpack-root</artifactId>
 	<packaging>pom</packaging>
-	<version>2.0-SNAPSHOT</version>
+	<version>2.0.2</version>
 	<name>GridExtensionPack Add-on Root Project</name>
 
 	<modules>