Fix for bug 345011. It seems Combo.setText() does not update the selected item, so instead of doing setText(), setSelecionIndex() sets the selected index and the text.

1 files changed, 12 insertions, 1 deletions

diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/ComboModelAdapter.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/ComboModelAdapter.java
index 39794a9cc7..ea9513f387 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/ComboModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/ComboModelAdapter.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.swt;
 
+import org.eclipse.jpt.common.utility.internal.ArrayTools;
 import org.eclipse.jpt.common.utility.internal.StringConverter;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
 import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
@@ -204,7 +205,17 @@ public class ComboModelAdapter<E> extends AbstractComboModelAdapter<E> {
 			else {
 				this.selectedItem = null;
 			}
-			this.combo.setText(item);
+
+			int selectedIndex = ArrayTools.indexOf(this.combo.getItems(), item);
+
+			// Select the item so combo.getSelectionIndex() does not return -1
+			if (selectedIndex > -1) {
+				this.combo.select(selectedIndex);
+			}
+			// In case some text is set even if there are no items
+			else {
+				this.combo.setText(item);
+			}
 		}
 	}
 }