changed mapped-by combo to Combo instead of CCombo

2 files changed, 32 insertions, 5 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/MappedByPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/MappedByPane.java
index 04d49c616b..22a532d56d 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/MappedByPane.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/MappedByPane.java
@@ -38,7 +38,6 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.0
  * @since 1.0
  */
-@SuppressWarnings("nls")
 public class MappedByPane 
 	extends FormPane<MappedByJoiningStrategy>
 {
@@ -57,12 +56,9 @@ public class MappedByPane
 	}
 	
 	
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected void initializeLayout(Composite container) {
-		addLabeledEditableCCombo(
+		addLabeledEditableCombo(
 			container,
 			JptUiDetailsMessages.Joining_mappedByAttributeLabel,
 			buildCandidateAttributesListValueModel(),
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/Pane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/Pane.java
index 20a2012552..5500a8d050 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/Pane.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/Pane.java
@@ -1792,6 +1792,37 @@ public abstract class Pane<T extends Model>
 			helpId
 		);
 	}
+	
+	/**
+	 * Creates a new container that will have an editable combo labeled with the
+	 * given text.
+	 *
+	 * @param container The parent container
+	 * @param labelText The text of the label
+	 * @param listHolder The <code>ListValueHolder</code>
+	 * @param selectedItemHolder The holder of the selected item
+	 * @param helpId The topic help ID to be registered for the given center
+	 * composite
+	 * @return The newly created <code>CCombo</code>
+	 *
+	 * @category Layout
+	 */
+	protected final <V> Combo addLabeledEditableCombo(Composite container,
+	                                                      String labelText,
+	                                                      ListValueModel<V> listHolder,
+	                                                      WritablePropertyValueModel<V> selectedItemHolder,
+	                                                      String helpId) {
+
+		return this.addLabeledEditableCombo(
+			container,
+			labelText,
+			listHolder,
+			selectedItemHolder,
+			StringConverter.Default.<V>instance(),
+			null,
+			helpId
+		);
+	}
 
 	/**
 	 * Creates a new container that will have the given center control labeled