Reverting fix for 345011 until the bug is determined as necessary for RC1 and has been tested/reviewed.

1 files changed, 1 insertions, 12 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 ea9513f387..39794a9cc7 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,7 +9,6 @@
  ******************************************************************************/
 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;
@@ -205,17 +204,7 @@ public class ComboModelAdapter<E> extends AbstractComboModelAdapter<E> {
 			else {
 				this.selectedItem = null;
 			}
-
-			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);
-			}
+			this.combo.setText(item);
 		}
 	}
 }