[335343] fix combo box behavior - patch from Nan

1 files changed, 8 insertions, 3 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertComposite.java
index e861f6579f..c0d90d99be 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertComposite.java
@@ -103,6 +103,7 @@ public class EclipseLinkConvertComposite
 			buildNoConverterHolder(), 
 			null);
 		PropertyValueModel<EclipseLinkConverter> converterHolder = buildConverterHolder();
+		
 		// CustomConverter
 		addRadioButton(
 			subSection, 
@@ -159,14 +160,15 @@ public class EclipseLinkConvertComposite
 
 			@Override
 			protected void setValue_(String value) {
-				// Convert the default value to an empty string
+				// Convert the default value to the default converter
 				if ((value != null) && (value.startsWith(DEFAULT_KEY))) {
-					value = "";
+					value = EclipseLinkConvert.DEFAULT_CONVERTER_NAME;
 				}
 				this.subject.setSpecifiedConverterName(value);
 			}
 		};
 	}
+	
 	private ListValueModel<String> buildConvertNameListHolder() {
 		java.util.List<ListValueModel<String>> list = new ArrayList<ListValueModel<String>>();
 		list.add(buildDefaultNameListHolder());
@@ -228,7 +230,10 @@ public class EclipseLinkConvertComposite
 						);
 					}
 					else {
-						value = JptCommonUiMessages.DefaultEmpty;
+						value = NLS.bind(
+							JptCommonUiMessages.DefaultWithOneParam,
+							EclipseLinkConvert.NO_CONVERTER
+						);
 					}
 				}