2006-06-16 David Gilbert <david.gilbert@object-refinery.com>

	* javax/swing/DefaultComboBoxModel.java
	(removeElementAt): Set new selected item by calling setSelectedItem().

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 200f9c408..dc5dde2f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-06-16  David Gilbert  <david.gilbert@object-refinery.com>
 
+	* javax/swing/DefaultComboBoxModel.java
+	(removeElementAt): Set new selected item by calling setSelectedItem().
+
+2006-06-16  David Gilbert  <david.gilbert@object-refinery.com>
+
 	* javax/swing/DefaultButtonModel.java
 	(setSelected): Use 'this', not null, for the item in the ItemEvent.
 
diff --git a/javax/swing/DefaultComboBoxModel.java b/javax/swing/DefaultComboBoxModel.java
index ab80b61f1..ef785f34d 100644
--- a/javax/swing/DefaultComboBoxModel.java
+++ b/javax/swing/DefaultComboBoxModel.java
@@ -146,9 +146,9 @@ public class DefaultComboBoxModel extends AbstractListModel
     if (selected == index) // choose a new selected item
       {
         if (selected > 0)
-          selectedItem = getElementAt(selected - 1);
+          setSelectedItem(getElementAt(selected - 1));
         else 
-          selectedItem = getElementAt(selected + 1);
+          setSelectedItem(getElementAt(selected + 1));
       }
     list.removeElementAt(index);
     fireIntervalRemoved(this, index, index);