Fixing a bug in SingleSelectionModel where deselecting a random value causes the selected value to be deselected, even if the deselected value wasn't selected to begin with.
Review at http://gwt-code-reviews.appspot.com/1114801
Review by: pdr@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@9237 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/view/client/SelectionModel.java b/user/src/com/google/gwt/view/client/SelectionModel.java
index 7019e8c..e00d3f7 100644
--- a/user/src/com/google/gwt/view/client/SelectionModel.java
+++ b/user/src/com/google/gwt/view/client/SelectionModel.java
@@ -71,7 +71,8 @@
}
public Object getKey(T item) {
- return keyProvider == null ? item : keyProvider.getKey(item);
+ return (keyProvider == null || item == null) ? item
+ : keyProvider.getKey(item);
}
/**
diff --git a/user/src/com/google/gwt/view/client/SingleSelectionModel.java b/user/src/com/google/gwt/view/client/SingleSelectionModel.java
index c5a6982..0f88f87 100644
--- a/user/src/com/google/gwt/view/client/SingleSelectionModel.java
+++ b/user/src/com/google/gwt/view/client/SingleSelectionModel.java
@@ -68,6 +68,14 @@
}
public void setSelected(T object, boolean selected) {
+ // If we are deselecting a value that isn't actually selected, ignore it.
+ if (!selected) {
+ Object oldKey = newSelectedPending ? getKey(newSelectedObject) : curKey;
+ Object newKey = getKey(object);
+ if (!equalsOrBothNull(oldKey, newKey)) {
+ return;
+ }
+ }
newSelectedObject = object;
newSelected = selected;
newSelectedPending = true;
@@ -82,13 +90,17 @@
resolveChanges();
}
+ private boolean equalsOrBothNull(Object a, Object b) {
+ return (a == null) ? (b == null) : a.equals(b);
+ }
+
private void resolveChanges() {
if (!newSelectedPending) {
return;
}
- Object key = (newSelectedObject == null) ? null : getKey(newSelectedObject);
- boolean sameKey = curKey == null ? key == null : curKey.equals(key);
+ Object key = getKey(newSelectedObject);
+ boolean sameKey = equalsOrBothNull(curKey, key);
boolean changed = false;
if (newSelected) {
changed = !sameKey;
diff --git a/user/test/com/google/gwt/view/client/SingleSelectionModelTest.java b/user/test/com/google/gwt/view/client/SingleSelectionModelTest.java
index 77825e9..fda80ff 100644
--- a/user/test/com/google/gwt/view/client/SingleSelectionModelTest.java
+++ b/user/test/com/google/gwt/view/client/SingleSelectionModelTest.java
@@ -20,6 +20,18 @@
*/
public class SingleSelectionModelTest extends AbstractSelectionModelTest {
+ /**
+ * Test that deselecting a value other than the pending selection does not
+ * cause the pending selection to be lost.
+ */
+ public void testDeselectWhileSelectionPending() {
+ SingleSelectionModel<String> model = createSelectionModel(null);
+ model.setSelected("test", true);
+ model.setSelected("other", false);
+ assertTrue(model.isSelected("test"));
+ assertEquals("test", model.getSelectedObject());
+ }
+
public void testGetSelectedObject() {
SingleSelectionModel<String> model = createSelectionModel(null);
assertNull(model.getSelectedObject());
