clean up Converters by changing some of the UI strings. reviewed this with Shaun and Neil

4 files changed, 32 insertions, 35 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/JptUiMappingsMessages.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/JptUiMappingsMessages.java
index 92d32c1fb8..9cadf74efd 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/JptUiMappingsMessages.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/JptUiMappingsMessages.java
@@ -31,11 +31,11 @@ public class JptUiMappingsMessages {
 	public static String BasicGeneralSection_optionalLabel;
 	public static String BasicGeneralSection_optionalLabelDefault;
 	public static String BasicGeneralSection_temporalLabel;
-	public static String BasicMappingComposite_conversion;
-	public static String BasicMappingComposite_noConverter;
-	public static String BasicMappingComposite_lobConverter;
-	public static String BasicMappingComposite_temporalConverter;
-	public static String BasicMappingComposite_enumeratedConverter;
+	public static String TypeSection_type;
+	public static String TypeSection_default;
+	public static String TypeSection_lob;
+	public static String TypeSection_temporal;
+	public static String TypeSection_enumerated;
 	public static String Boolean_False;
 	public static String Boolean_True;
 	public static String CascadeComposite_all;
@@ -103,9 +103,6 @@ public class JptUiMappingsMessages {
 	public static String IdMappingComposite_sequenceGeneratorSection;
 	public static String IdMappingComposite_tableGeneratorCheckBox;
 	public static String IdMappingComposite_tableGeneratorSection;
-	public static String IdMappingComposite_conversion;
-	public static String IdMappingComposite_noConverter;
-	public static String IdMappingComposite_temporalConverter;
 	public static String AbstractInheritanceComposite_char;
 	public static String InheritanceComposite_detailsGroupBox;
 	public static String InheritanceComposite_discriminatorColumnGroupBox;
@@ -311,9 +308,6 @@ public class JptUiMappingsMessages {
 	public static String TemporalTypeComposite_date;
 	public static String TemporalTypeComposite_time;
 	public static String TemporalTypeComposite_timestamp;
-	public static String VersionMappingComposite_conversion;
-	public static String VersionMappingComposite_noConverter;
-	public static String VersionMappingComposite_temporalConverter;
 
 	private static final String BUNDLE_NAME = "jpt_ui_mappings"; //$NON-NLS-1$
 	private static final Class<?> BUNDLE_CLASS = JptUiMappingsMessages.class;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BasicMappingComposite.java
index c317e86f43..17c89e621a 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BasicMappingComposite.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
 import org.eclipse.jpt.core.context.BasicMapping;
 import org.eclipse.jpt.core.context.Column;
 import org.eclipse.jpt.core.context.Converter;
+import org.eclipse.jpt.core.context.ConvertibleMapping;
 import org.eclipse.jpt.core.context.EnumeratedConverter;
 import org.eclipse.jpt.core.context.TemporalConverter;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -95,7 +96,7 @@ public class BasicMappingComposite extends FormPane<BasicMapping>
 	@Override
 	protected void initializeLayout(Composite container) {
 		initializeGeneralPane(container);
-		initializeConversionPane(container);
+		initializeTypePane(container);
 	}
 	
 	private void initializeGeneralPane(Composite container) {
@@ -110,18 +111,18 @@ public class BasicMappingComposite extends FormPane<BasicMapping>
 		new OptionalComposite(this, addSubPane(container, 4));
 
 	}
-	private void initializeConversionPane(Composite container) {
+	private void initializeTypePane(Composite container) {
 
 		container = addCollapsableSection(
 			container,
-			JptUiMappingsMessages.BasicMappingComposite_conversion
+			JptUiMappingsMessages.TypeSection_type
 		);
 		((GridLayout) container.getLayout()).numColumns = 2;
 
 		// No converter
 		Button noConverterButton = addRadioButton(
 			container, 
-			JptUiMappingsMessages.BasicMappingComposite_noConverter, 
+			JptUiMappingsMessages.TypeSection_default, 
 			buildNoConverterHolder(), 
 			null);
 		((GridData) noConverterButton.getLayoutData()).horizontalSpan = 2;
@@ -129,7 +130,7 @@ public class BasicMappingComposite extends FormPane<BasicMapping>
 		// Lob
 		Button lobButton = addRadioButton(
 			container, 
-			JptUiMappingsMessages.BasicMappingComposite_lobConverter, 
+			JptUiMappingsMessages.TypeSection_lob, 
 			buildLobConverterHolder(), 
 			null);
 		((GridData) lobButton.getLayoutData()).horizontalSpan = 2;
@@ -138,7 +139,7 @@ public class BasicMappingComposite extends FormPane<BasicMapping>
 		// Temporal
 		addRadioButton(
 			container, 
-			JptUiMappingsMessages.BasicMappingComposite_temporalConverter, 
+			JptUiMappingsMessages.TypeSection_temporal, 
 			buildTemporalBooleanHolder(), 
 			null);
 		registerSubPane(new TemporalTypeComposite(buildTemporalConverterHolder(specifiedConverterHolder), container, getWidgetFactory()));
@@ -147,7 +148,7 @@ public class BasicMappingComposite extends FormPane<BasicMapping>
 		// Enumerated
 		addRadioButton(
 			container, 
-			JptUiMappingsMessages.BasicMappingComposite_enumeratedConverter, 
+			JptUiMappingsMessages.TypeSection_enumerated, 
 			buildEnumeratedBooleanHolder(), 
 			null);
 		registerSubPane(new EnumTypeComposite(buildEnumeratedConverterHolder(specifiedConverterHolder), container, getWidgetFactory()));
@@ -163,7 +164,7 @@ public class BasicMappingComposite extends FormPane<BasicMapping>
 	}
 
 	private WritablePropertyValueModel<Boolean> buildNoConverterHolder() {
-		return new PropertyAspectAdapter<BasicMapping, Boolean>(getSubjectHolder(), BasicMapping.SPECIFIED_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<BasicMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.getSpecifiedConverter() == null);
@@ -179,7 +180,7 @@ public class BasicMappingComposite extends FormPane<BasicMapping>
 	}
 	
 	private WritablePropertyValueModel<Boolean> buildLobConverterHolder() {
-		return new PropertyAspectAdapter<BasicMapping, Boolean>(getSubjectHolder(), BasicMapping.SPECIFIED_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<BasicMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				Converter converter = this.subject.getSpecifiedConverter();
@@ -199,7 +200,7 @@ public class BasicMappingComposite extends FormPane<BasicMapping>
 	}
 	
 	private PropertyValueModel<Converter> buildSpecifiedConverterHolder() {
-		return new PropertyAspectAdapter<BasicMapping, Converter>(getSubjectHolder(), BasicMapping.SPECIFIED_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<BasicMapping, Converter>(getSubjectHolder(), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) {
 			@Override
 			protected Converter buildValue_() {
 				return this.subject.getSpecifiedConverter();
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdMappingComposite.java
index 77e7782477..01bbb8cf1b 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdMappingComposite.java
@@ -11,6 +11,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
 
 import org.eclipse.jpt.core.context.Column;
 import org.eclipse.jpt.core.context.Converter;
+import org.eclipse.jpt.core.context.ConvertibleMapping;
 import org.eclipse.jpt.core.context.IdMapping;
 import org.eclipse.jpt.core.context.TemporalConverter;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -88,25 +89,25 @@ public class IdMappingComposite extends FormPane<IdMapping>
 		// Column widgets
 		new ColumnComposite(this, buildColumnHolder(), container);
 
-		initializeConversionPane(container);
+		initializeTypePane(container);
 
 		// Generation pane
 		new GenerationComposite(this, addSubPane(container, 10));
 	}
 	
 	
-	private void initializeConversionPane(Composite container) {
+	private void initializeTypePane(Composite container) {
 
 		container = addCollapsableSection(
 			container,
-			JptUiMappingsMessages.IdMappingComposite_conversion
+			JptUiMappingsMessages.TypeSection_type
 		);
 		((GridLayout) container.getLayout()).numColumns = 2;
 
 		// No converter
 		Button noConverterButton = addRadioButton(
 			container, 
-			JptUiMappingsMessages.IdMappingComposite_noConverter, 
+			JptUiMappingsMessages.TypeSection_default, 
 			buildNoConverterHolder(), 
 			null);
 		((GridData) noConverterButton.getLayoutData()).horizontalSpan = 2;
@@ -115,7 +116,7 @@ public class IdMappingComposite extends FormPane<IdMapping>
 		// Temporal
 		addRadioButton(
 			container, 
-			JptUiMappingsMessages.IdMappingComposite_temporalConverter, 
+			JptUiMappingsMessages.TypeSection_temporal, 
 			buildTemporalBooleanHolder(), 
 			null);
 		registerSubPane(new TemporalTypeComposite(buildTemporalConverterHolder(specifiedConverterHolder), container, getWidgetFactory()));
@@ -123,7 +124,7 @@ public class IdMappingComposite extends FormPane<IdMapping>
 	
 
 	private WritablePropertyValueModel<Boolean> buildNoConverterHolder() {
-		return new PropertyAspectAdapter<IdMapping, Boolean>(getSubjectHolder(), IdMapping.SPECIFIED_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<IdMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.getSpecifiedConverter() == null);
@@ -140,7 +141,7 @@ public class IdMappingComposite extends FormPane<IdMapping>
 
 
 	private WritablePropertyValueModel<Boolean> buildTemporalBooleanHolder() {
-		return new PropertyAspectAdapter<IdMapping, Boolean>(getSubjectHolder(), IdMapping.SPECIFIED_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<IdMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				Converter converter = this.subject.getSpecifiedConverter();
@@ -160,7 +161,7 @@ public class IdMappingComposite extends FormPane<IdMapping>
 	}
 
 	private PropertyValueModel<Converter> buildSpecifiedConverterHolder() {
-		return new PropertyAspectAdapter<IdMapping, Converter>(getSubjectHolder(), IdMapping.SPECIFIED_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<IdMapping, Converter>(getSubjectHolder(), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) {
 			@Override
 			protected Converter buildValue_() {
 				return this.subject.getSpecifiedConverter();
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/VersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/VersionMappingComposite.java
index 5307d9c5d8..758f2740cd 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/VersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/VersionMappingComposite.java
@@ -11,6 +11,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
 
 import org.eclipse.jpt.core.context.Column;
 import org.eclipse.jpt.core.context.Converter;
+import org.eclipse.jpt.core.context.ConvertibleMapping;
 import org.eclipse.jpt.core.context.TemporalConverter;
 import org.eclipse.jpt.core.context.VersionMapping;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -89,14 +90,14 @@ public class VersionMappingComposite extends FormPane<VersionMapping>
 
 		container = addCollapsableSection(
 			container,
-			JptUiMappingsMessages.VersionMappingComposite_conversion
+			JptUiMappingsMessages.TypeSection_type
 		);
 		((GridLayout) container.getLayout()).numColumns = 2;
 
 		// No converter
 		Button noConverterButton = addRadioButton(
 			container, 
-			JptUiMappingsMessages.VersionMappingComposite_noConverter, 
+			JptUiMappingsMessages.TypeSection_default, 
 			buildNoConverterHolder(), 
 			null);
 		((GridData) noConverterButton.getLayoutData()).horizontalSpan = 2;
@@ -105,7 +106,7 @@ public class VersionMappingComposite extends FormPane<VersionMapping>
 		// Temporal
 		addRadioButton(
 			container, 
-			JptUiMappingsMessages.VersionMappingComposite_temporalConverter, 
+			JptUiMappingsMessages.TypeSection_temporal, 
 			buildTemporalBooleanHolder(), 
 			null);
 		registerSubPane(new TemporalTypeComposite(buildTemporalConverterHolder(specifiedConverterHolder), container, getWidgetFactory()));
@@ -113,7 +114,7 @@ public class VersionMappingComposite extends FormPane<VersionMapping>
 	
 
 	private WritablePropertyValueModel<Boolean> buildNoConverterHolder() {
-		return new PropertyAspectAdapter<VersionMapping, Boolean>(getSubjectHolder(), VersionMapping.SPECIFIED_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<VersionMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.getSpecifiedConverter() == null);
@@ -130,7 +131,7 @@ public class VersionMappingComposite extends FormPane<VersionMapping>
 
 
 	private WritablePropertyValueModel<Boolean> buildTemporalBooleanHolder() {
-		return new PropertyAspectAdapter<VersionMapping, Boolean>(getSubjectHolder(), VersionMapping.SPECIFIED_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<VersionMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				Converter converter = this.subject.getSpecifiedConverter();
@@ -150,7 +151,7 @@ public class VersionMappingComposite extends FormPane<VersionMapping>
 	}
 
 	private PropertyValueModel<Converter> buildSpecifiedConverterHolder() {
-		return new PropertyAspectAdapter<VersionMapping, Converter>(getSubjectHolder(), VersionMapping.SPECIFIED_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<VersionMapping, Converter>(getSubjectHolder(), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) {
 			@Override
 			protected Converter buildValue_() {
 				return this.subject.getSpecifiedConverter();