Reviewers: pdr,
Description:
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.
Please review this at http://gwt-code-reviews.appspot.com/1114801/show
Affected files:
M user/src/com/google/gwt/view/client/SelectionModel.java
M user/src/com/google/gwt/view/client/SingleSelectionModel.java
M user/test/com/google/gwt/view/client/SingleSelectionModelTest.java
Index: user/src/com/google/gwt/view/client/SelectionModel.java
===================================================================
--- user/src/com/google/gwt/view/client/SelectionModel.java (revision 9235)
+++ user/src/com/google/gwt/view/client/SelectionModel.java (working copy)
@@ -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);
}
/**
Index: user/src/com/google/gwt/view/client/SingleSelectionModel.java
===================================================================
--- user/src/com/google/gwt/view/client/SingleSelectionModel.java (revision
9235)
+++ user/src/com/google/gwt/view/client/SingleSelectionModel.java (working
copy)
@@ -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;
Index: user/test/com/google/gwt/view/client/SingleSelectionModelTest.java
===================================================================
--- user/test/com/google/gwt/view/client/SingleSelectionModelTest.java
(revision 9235)
+++ user/test/com/google/gwt/view/client/SingleSelectionModelTest.java
(working copy)
@@ -19,6 +19,18 @@
* Tests for {...@link SingleSelectionModel}.
*/
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);
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
