2005-10-11 David Gilbert <david.gilbert@object-refinery.com>

	* javax/swing/DefaultComboBoxModel.java
	(setSelectedItem): allow values not in list, and don't fire an event
	if the value is unchanged.

1 files changed, 11 insertions, 2 deletions

diff --git a/javax/swing/DefaultComboBoxModel.java b/javax/swing/DefaultComboBoxModel.java
index c564cf720..ea261a33b 100644
--- a/javax/swing/DefaultComboBoxModel.java
+++ b/javax/swing/DefaultComboBoxModel.java
@@ -222,9 +222,18 @@ public class DefaultComboBoxModel extends AbstractListModel
    */
   public void setSelectedItem(Object object)
   {
+    if (selectedItem == null)
+      {
+        if (object == null)
+          return;
+      }
+    else
+      {
+        if (selectedItem.equals(object))
+          return;
+      }
     selectedItem = object;
-    if(object == null || list.contains(object)) 
-      fireContentsChanged(this, -1, -1);	
+    fireContentsChanged(this, -1, -1);    
   }
 
   /**