[gwt-contrib] [google-web-toolkit] r9259 committed - Cherry picking r9237 into release branch.

[codesite-noreply]

Revision: 9259
Author: jlaba...@google.com
Date: Fri Nov 19 10:15:28 2010
Log: Cherry picking r9237 into release branch.
http://code.google.com/p/google-web-toolkit/source/detail?r=9259

Modified:
 /releases/2.1/user/src/com/google/gwt/view/client/SelectionModel.java
 /releases/2.1/user/src/com/google/gwt/view/client/SingleSelectionModel.java
  
/releases/2.1/user/test/com/google/gwt/view/client/SingleSelectionModelTest.java

=======================================
--- /releases/2.1/user/src/com/google/gwt/view/client/SelectionModel.java	 
Thu Oct 14 08:07:55 2010
+++ /releases/2.1/user/src/com/google/gwt/view/client/SelectionModel.java	 
Fri Nov 19 10:15:28 2010
@@ -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);
     }

     /**
=======================================
---  
/releases/2.1/user/src/com/google/gwt/view/client/SingleSelectionModel.java	 
Thu Oct 14 08:07:55 2010
+++  
/releases/2.1/user/src/com/google/gwt/view/client/SingleSelectionModel.java	 
Fri Nov 19 10:15:28 2010
@@ -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;
@@ -81,14 +89,18 @@
     }
     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;
=======================================
---  
/releases/2.1/user/test/com/google/gwt/view/client/SingleSelectionModelTest.java	 
Tue Sep 28 06:28:02 2010
+++  
/releases/2.1/user/test/com/google/gwt/view/client/SingleSelectionModelTest.java	 
Fri Nov 19 10:15:28 2010
@@ -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