rename Converter.getType() to getConverterType() and declare explicit

return types

41 files changed, 92 insertions, 91 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/BaseEnumeratedConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/BaseEnumeratedConverter.java
index 2094fe9588..3c3c539618 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/BaseEnumeratedConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/BaseEnumeratedConverter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2013 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -24,6 +24,8 @@ package org.eclipse.jpt.jpa.core.context;
 public interface BaseEnumeratedConverter
 	extends Converter
 {
+	Class<BaseEnumeratedConverter> getConverterType();
+
 	EnumType getEnumType();
 
 	EnumType getSpecifiedEnumType();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/BaseTemporalConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/BaseTemporalConverter.java
index 90cae64c92..20ba23f8b2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/BaseTemporalConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/BaseTemporalConverter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2013 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -24,6 +24,8 @@ package org.eclipse.jpt.jpa.core.context;
 public interface BaseTemporalConverter
 	extends Converter
 {
+	Class<BaseTemporalConverter> getConverterType();
+
 	String[] TEMPORAL_MAPPING_SUPPORTED_TYPES = {
 		java.util.Date.class.getName(),
 		java.util.Calendar.class.getName(),
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Converter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Converter.java
index a77e0a9d84..b9c974c105 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Converter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Converter.java
@@ -31,7 +31,7 @@ public interface Converter
 	/**
 	 * Return the converter's type.
 	 */
-	Class<? extends Converter> getType();
+	Class<? extends Converter> getConverterType();
 
 
 	// ********** parent adapter **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/LobConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/LobConverter.java
index 61066cf693..a47e70d146 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/LobConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/LobConverter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2013 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -24,5 +24,5 @@ package org.eclipse.jpt.jpa.core.context;
 public interface LobConverter
 	extends Converter
 {
-	// nothing yet
+	Class<LobConverter> getConverterType();
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseEnumeratedConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseEnumeratedConverter.java
index 5614b7c472..8e8d29fb18 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseEnumeratedConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseEnumeratedConverter.java
@@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.core.context.java;
 import org.eclipse.jpt.common.core.resource.java.Annotation;
 import org.eclipse.jpt.jpa.core.JpaFactory;
 import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
-import org.eclipse.jpt.jpa.core.context.Converter;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyEnumeratedAnnotation2_0;
 import org.eclipse.jpt.jpa.core.resource.java.EnumeratedAnnotation;
 
@@ -44,7 +43,7 @@ public interface JavaBaseEnumeratedConverter
 			super();
 		}
 
-		public Class<? extends Converter> getConverterType() {
+		public Class<BaseEnumeratedConverter> getConverterType() {
 			return BaseEnumeratedConverter.class;
 		}
 
@@ -72,7 +71,7 @@ public interface JavaBaseEnumeratedConverter
 			super();
 		}
 
-		public Class<? extends Converter> getConverterType() {
+		public Class<BaseEnumeratedConverter> getConverterType() {
 			return BaseEnumeratedConverter.class;
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseTemporalConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseTemporalConverter.java
index 619c24d781..75f8e19883 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseTemporalConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseTemporalConverter.java
@@ -40,12 +40,11 @@ public interface JavaBaseTemporalConverter
 	abstract static class AbstractAdapter
 		extends JavaConverter.AbstractAdapter
 	{
-	
 		AbstractAdapter() {
 			super();
 		}
 
-		public Class<? extends Converter> getConverterType() {
+		public Class<BaseTemporalConverter> getConverterType() {
 			return BaseTemporalConverter.class;
 		}
 
@@ -134,7 +133,7 @@ public interface JavaBaseTemporalConverter
 			super();
 		}
 
-		public Class<? extends Converter> getConverterType() {
+		public Class<BaseTemporalConverter> getConverterType() {
 			return BaseTemporalConverter.class;
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java
index b62dc9897a..860ba5358a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java
@@ -63,8 +63,7 @@ public interface JavaConverter
 	 * This interface allows a convertible mapping to interact with various
 	 * Java converters via the same protocol.
 	 */
-	public interface Adapter
-	{
+	public interface Adapter {
 		/**
 		 * Return the type of converter handled by the adapter.
 		 */
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaLobConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaLobConverter.java
index 2672d36f46..19c948c6a7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaLobConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaLobConverter.java
@@ -41,7 +41,7 @@ public interface JavaLobConverter
 			super();
 		}
 
-		public Class<? extends Converter> getConverterType() {
+		public Class<LobConverter> getConverterType() {
 			return LobConverter.class;
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseEnumeratedConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseEnumeratedConverter.java
index 3bd5194801..ebb66a7835 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseEnumeratedConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseEnumeratedConverter.java
@@ -58,7 +58,7 @@ public interface OrmBaseEnumeratedConverter
 			super();
 		}
 
-		public Class<? extends Converter> getConverterType() {
+		public Class<BaseEnumeratedConverter> getConverterType() {
 			return BaseEnumeratedConverter.class;
 		}
 
@@ -125,7 +125,7 @@ public interface OrmBaseEnumeratedConverter
 			super();
 		}
 
-		public Class<? extends Converter> getConverterType() {
+		public Class<BaseEnumeratedConverter> getConverterType() {
 			return BaseEnumeratedConverter.class;
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseTemporalConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseTemporalConverter.java
index 5fb0c20f7a..13492ed53a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseTemporalConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseTemporalConverter.java
@@ -55,7 +55,7 @@ public interface OrmBaseTemporalConverter
 			super();
 		}
 
-		public Class<? extends Converter> getConverterType() {
+		public Class<BaseTemporalConverter> getConverterType() {
 			return BaseTemporalConverter.class;
 		}
 
@@ -177,7 +177,7 @@ public interface OrmBaseTemporalConverter
 			super();
 		}
 
-		public Class<? extends Converter> getConverterType() {
+		public Class<BaseTemporalConverter> getConverterType() {
 			return BaseTemporalConverter.class;
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmConverter.java
index 8416c76214..65704bb188 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmConverter.java
@@ -57,8 +57,7 @@ public interface OrmConverter
 	 * This interface allows a convertible mapping to interact with various
 	 * <code>orm.xml</code> converters via the same protocol.
 	 */
-	public interface Adapter
-	{
+	public interface Adapter {
 		/**
 		 * Return the type of converter handled by the adapter.
 		 */
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmLobConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmLobConverter.java
index 3e03447926..0262783016 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmLobConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmLobConverter.java
@@ -42,7 +42,7 @@ public interface OrmLobConverter
 			super();
 		}
 
-		public Class<? extends Converter> getConverterType() {
+		public Class<LobConverter> getConverterType() {
 			return LobConverter.class;
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java
index 87f6cdcc63..8536c15eb7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java
@@ -199,7 +199,7 @@ public abstract class AbstractJavaBasicMapping
 	}
 
 	public void setConverter(Class<? extends Converter> converterType) {
-		if (this.converter.getType() != converterType) {
+		if (this.converter.getConverterType() != converterType) {
 			this.converter.dispose();
 			JavaConverter.Adapter converterAdapter = this.getConverterAdapter(converterType);
 			this.retainConverterAnnotation(converterAdapter);
@@ -247,13 +247,13 @@ public abstract class AbstractJavaBasicMapping
 	protected void syncConverter() {
 		Association<JavaConverter.Adapter, Annotation> assoc = this.getConverterAnnotation();
 		if (assoc == null) {
-			if (this.converter.getType() != null) {
+			if (this.converter.getConverterType() != null) {
 				this.setConverter_(this.buildNullConverter());
 			}
 		} else {
 			JavaConverter.Adapter adapter = assoc.getKey();
 			Annotation annotation = assoc.getValue();
-			if ((this.converter.getType() == adapter.getConverterType()) &&
+			if ((this.converter.getConverterType() == adapter.getConverterType()) &&
 					(this.converter.getConverterAnnotation() == annotation)) {
 				this.converter.synchronizeWithResourceModel();
 			} else {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java
index 1aef9162d8..d62ac13050 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java
@@ -212,7 +212,7 @@ public abstract class AbstractJavaIdMapping
 	}
 
 	public void setConverter(Class<? extends Converter> converterType) {
-		if (this.converter.getType() != converterType) {
+		if (this.converter.getConverterType() != converterType) {
 			this.converter.dispose();
 			JavaConverter.Adapter converterAdapter = this.getConverterAdapter(converterType);
 			this.retainConverterAnnotation(converterAdapter);
@@ -260,13 +260,13 @@ public abstract class AbstractJavaIdMapping
 	protected void syncConverter() {
 		Association<JavaConverter.Adapter, Annotation> assoc = this.getConverterAnnotation();
 		if (assoc == null) {
-			if (this.converter.getType() != null) {
+			if (this.converter.getConverterType() != null) {
 				this.setConverter_(this.buildNullConverter());
 			}
 		} else {
 			JavaConverter.Adapter adapter = assoc.getKey();
 			Annotation annotation = assoc.getValue();
-			if ((this.converter.getType() == adapter.getConverterType()) &&
+			if ((this.converter.getConverterType() == adapter.getConverterType()) &&
 					(this.converter.getConverterAnnotation() == annotation)) {
 				this.converter.synchronizeWithResourceModel();
 			} else {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java
index a5f26402d2..1bf401acf9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java
@@ -581,7 +581,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi
 	}
 
 	public void setMapKeyConverter(Class<? extends Converter> converterType) {
-		if (this.mapKeyConverter.getType() != converterType) {
+		if (this.mapKeyConverter.getConverterType() != converterType) {
 			this.mapKeyConverter.dispose();
 			JavaConverter.Adapter converterAdapter = this.getKeyConverterAdapter(converterType);
 			this.retainMapKeyConverterAnnotation(converterAdapter);
@@ -631,13 +631,13 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi
 	protected void syncMapKeyConverter() {
 		Association<JavaConverter.Adapter, Annotation> assoc = this.getMapKeyConverterAnnotation();
 		if (assoc == null) {
-			if (this.mapKeyConverter.getType() != null) {
+			if (this.mapKeyConverter.getConverterType() != null) {
 				this.setMapKeyConverter_(this.buildNullMapKeyConverter());
 			}
 		} else {
 			JavaConverter.Adapter adapter = assoc.getKey();
 			Annotation annotation = assoc.getValue();
-			if ((this.mapKeyConverter.getType() == adapter.getConverterType()) &&
+			if ((this.mapKeyConverter.getConverterType() == adapter.getConverterType()) &&
 					(this.mapKeyConverter.getConverterAnnotation() == annotation)) {
 				this.mapKeyConverter.synchronizeWithResourceModel();
 			} else {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java
index 9abcbd26b0..f686ac8d43 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java
@@ -99,7 +99,7 @@ public abstract class AbstractJavaVersionMapping
 	}
 
 	public void setConverter(Class<? extends Converter> converterType) {
-		if (this.converter.getType() != converterType) {
+		if (this.converter.getConverterType() != converterType) {
 			this.converter.dispose();
 			JavaConverter.Adapter converterAdapter = this.getConverterAdapter(converterType);
 			this.retainConverterAnnotation(converterAdapter);
@@ -147,13 +147,13 @@ public abstract class AbstractJavaVersionMapping
 	protected void syncConverter() {
 		Association<JavaConverter.Adapter, Annotation> assoc = this.getConverterAnnotation();
 		if (assoc == null) {
-			if (this.converter.getType() != null) {
+			if (this.converter.getConverterType() != null) {
 				this.setConverter_(this.buildNullConverter());
 			}
 		} else {
 			JavaConverter.Adapter adapter = assoc.getKey();
 			Annotation annotation = assoc.getValue();
-			if ((this.converter.getType() == adapter.getConverterType()) &&
+			if ((this.converter.getConverterType() == adapter.getConverterType()) &&
 					(this.converter.getConverterAnnotation() == annotation)) {
 				this.converter.synchronizeWithResourceModel();
 			} else {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java
index a4186231e5..77abbbad8e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java
@@ -194,7 +194,7 @@ public abstract class AbstractOrmBasicMapping<X extends XmlBasic>
 	}
 
 	public void setConverter(Class<? extends Converter> converterType) {
-		if (this.converter.getType() != converterType) {
+		if (this.converter.getConverterType() != converterType) {
 			// Make the old value is the real old one when firing property changed event below
 			OrmConverter old = this.converter;
 			// Set the new value of the converter to a NullOrmConverter to prevent the following
@@ -243,11 +243,11 @@ public abstract class AbstractOrmBasicMapping<X extends XmlBasic>
 	protected void syncConverter() {
 		OrmConverter.Adapter adapter = this.getXmlConverterAdapter();
 		if (adapter == null) {
-			if (this.converter.getType() != null) {
+			if (this.converter.getConverterType() != null) {
 				this.setConverter_(this.nullConverter);
 			}
 		} else {
-			if (this.converter.getType() == adapter.getConverterType()) {
+			if (this.converter.getConverterType() == adapter.getConverterType()) {
 				this.converter.synchronizeWithResourceModel();
 			} else {
 				this.setConverter_(adapter.buildNewConverter(this, this.getContextModelFactory()));
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java
index ff0cea5d82..0e16b16dd9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java
@@ -197,7 +197,7 @@ public abstract class AbstractOrmIdMapping<X extends XmlId>
 	}
 
 	public void setConverter(Class<? extends Converter> converterType) {
-		if (this.converter.getType() != converterType) {
+		if (this.converter.getConverterType() != converterType) {
 			// Make the old value is the real old one when firing property changed event below
 			OrmConverter old = this.converter;
 			// Set the new value of the converter to a NullOrmConverter to prevent the following 
@@ -246,11 +246,11 @@ public abstract class AbstractOrmIdMapping<X extends XmlId>
 	protected void syncConverter() {
 		OrmConverter.Adapter adapter = this.getXmlConverterAdapter();
 		if (adapter == null) {
-			if (this.converter.getType() != null) {
+			if (this.converter.getConverterType() != null) {
 				this.setConverter_(this.nullConverter);
 			}
 		} else {
-			if (this.converter.getType() == adapter.getConverterType()) {
+			if (this.converter.getConverterType() == adapter.getConverterType()) {
 				this.converter.synchronizeWithResourceModel();
 			} else {
 				this.setConverter_(adapter.buildNewConverter(this, this.getContextModelFactory()));
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java
index 45b7dc168c..4a40f3cf07 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java
@@ -580,7 +580,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM
 	}
 
 	public void setMapKeyConverter(Class<? extends Converter> converterType) {
-		if (this.mapKeyConverter.getType() != converterType) {
+		if (this.mapKeyConverter.getConverterType() != converterType) {
 			// Make the old value is the real old one when firing property changed event below
 			OrmConverter old = this.mapKeyConverter;
 			// Set the new value of the map key converter to a NullOrmConverter to prevent the following 
@@ -629,11 +629,11 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM
 	protected void syncMapKeyConverter() {
 		OrmConverter.Adapter adapter = this.getXmlMapKeyConverterAdapter();
 		if (adapter == null) {
-			if (this.mapKeyConverter.getType() != null) {
+			if (this.mapKeyConverter.getConverterType() != null) {
 				this.setMapKeyConverter_(this.nullConverter);
 			}
 		} else {
-			if (this.mapKeyConverter.getType() == adapter.getConverterType()) {
+			if (this.mapKeyConverter.getConverterType() == adapter.getConverterType()) {
 				this.mapKeyConverter.synchronizeWithResourceModel();
 			} else {
 				this.setMapKeyConverter_(adapter.buildNewConverter(this, this.getContextModelFactory()));
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java
index 9ea59c4d29..297f5fc9c0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java
@@ -101,7 +101,7 @@ public abstract class AbstractOrmVersionMapping<X extends XmlVersion>
 	}
 
 	public void setConverter(Class<? extends Converter> converterType) {
-		if (this.converter.getType() != converterType) {
+		if (this.converter.getConverterType() != converterType) {
 			// Make the old value is the real old one when firing property changed event below
 			OrmConverter old = this.converter;
 			// Set the new value of the converter to a NullOrmConverter to prevent the following 
@@ -150,11 +150,11 @@ public abstract class AbstractOrmVersionMapping<X extends XmlVersion>
 	protected void syncConverter() {
 		OrmConverter.Adapter adapter = this.getXmlConverterAdapter();
 		if (adapter == null) {
-			if (this.converter.getType() != null) {
+			if (this.converter.getConverterType() != null) {
 				this.setConverter_(this.nullConverter);
 			}
 		} else {
-			if (this.converter.getType() == adapter.getConverterType()) {
+			if (this.converter.getConverterType() == adapter.getConverterType()) {
 				this.converter.synchronizeWithResourceModel();
 			} else {
 				this.setConverter_(adapter.buildNewConverter(this, this.getContextModelFactory()));
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseEnumeratedConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseEnumeratedConverter.java
index 9eacd1af3e..25bd861666 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseEnumeratedConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseEnumeratedConverter.java
@@ -90,7 +90,7 @@ public class GenericJavaBaseEnumeratedConverter
 
 	// ********** misc **********
 
-	public Class<? extends Converter> getType() {
+	public Class<BaseEnumeratedConverter> getConverterType() {
 		return BaseEnumeratedConverter.class;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseTemporalConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseTemporalConverter.java
index 8910e4c486..a6e5b8c7cf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseTemporalConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseTemporalConverter.java
@@ -69,7 +69,7 @@ public class GenericJavaBaseTemporalConverter
 
 	// ********** misc **********
 
-	public Class<? extends Converter> getType() {
+	public Class<BaseTemporalConverter> getConverterType() {
 		return BaseTemporalConverter.class;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaLobConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaLobConverter.java
index f1116e1008..c7ac3032a6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaLobConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaLobConverter.java
@@ -29,7 +29,7 @@ public class GenericJavaLobConverter
 
 	// ********** misc **********
 
-	public Class<? extends Converter> getType() {
+	public Class<LobConverter> getConverterType() {
 		return LobConverter.class;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaConverter.java
index aac322384e..1e3007d017 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaConverter.java
@@ -24,7 +24,7 @@ public class NullJavaConverter
 		super(parent);
 	}
 
-	public Class<? extends Converter> getType() {
+	public Class<? extends Converter> getConverterType() {
 		return null;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseEnumeratedConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseEnumeratedConverter.java
index a449d537a0..8ff36690eb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseEnumeratedConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseEnumeratedConverter.java
@@ -79,7 +79,7 @@ public class GenericOrmBaseEnumeratedConverter
 
 	// ********** misc **********
 
-	public Class<? extends Converter> getType() {
+	public Class<BaseEnumeratedConverter> getConverterType() {
 		return BaseEnumeratedConverter.class;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseTemporalConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseTemporalConverter.java
index e4496024fd..3c37dc76c1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseTemporalConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseTemporalConverter.java
@@ -64,7 +64,7 @@ public class GenericOrmBaseTemporalConverter
 
 	// ********** misc **********
 
-	public Class<? extends Converter> getType() {
+	public Class<BaseTemporalConverter> getConverterType() {
 		return BaseTemporalConverter.class;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmLobConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmLobConverter.java
index 40184df659..e3a43dc875 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmLobConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmLobConverter.java
@@ -32,7 +32,7 @@ public class GenericOrmLobConverter
 
 	// ********** misc **********
 
-	public Class<? extends Converter> getType() {
+	public Class<LobConverter> getConverterType() {
 		return LobConverter.class;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/NullOrmConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/NullOrmConverter.java
index 150cb26ec7..00f931b6d9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/NullOrmConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/NullOrmConverter.java
@@ -27,7 +27,7 @@ public class NullOrmConverter
 		// NOP
 	}
 
-	public Class<? extends Converter> getType() {
+	public Class<? extends Converter> getConverterType() {
 		return null;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java
index 3739db18dc..a5f4b7488f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java
@@ -487,7 +487,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0
 	}
 
 	public void setConverter(Class<? extends Converter> converterType) {
-		if (this.converter.getType() != converterType) {
+		if (this.converter.getConverterType() != converterType) {
 			this.converter.dispose();
 			JavaConverter.Adapter converterAdapter = this.getConverterAdapter(converterType);
 			this.retainConverterAnnotation(converterAdapter);
@@ -535,13 +535,13 @@ public abstract class AbstractJavaElementCollectionMapping2_0
 	protected void syncConverter() {
 		Association<JavaConverter.Adapter, Annotation> assoc = this.getConverterAnnotation();
 		if (assoc == null) {
-			if (this.converter.getType() != null) {
+			if (this.converter.getConverterType() != null) {
 				this.setConverter_(this.buildNullConverter());
 			}
 		} else {
 			JavaConverter.Adapter adapter = assoc.getKey();
 			Annotation annotation = assoc.getValue();
-			if ((this.converter.getType() == adapter.getConverterType()) &&
+			if ((this.converter.getConverterType() == adapter.getConverterType()) &&
 					(this.converter.getConverterAnnotation() == annotation)) {
 				this.converter.synchronizeWithResourceModel();
 			} else {
@@ -941,7 +941,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0
 	}
 
 	public void setMapKeyConverter(Class<? extends Converter> converterType) {
-		if (this.mapKeyConverter.getType() != converterType) {
+		if (this.mapKeyConverter.getConverterType() != converterType) {
 			this.mapKeyConverter.dispose();
 			JavaConverter.Adapter converterAdapter = this.getMapKeyConverterAdapter(converterType);
 			this.retainMapKeyConverterAnnotation(converterAdapter);
@@ -989,13 +989,13 @@ public abstract class AbstractJavaElementCollectionMapping2_0
 	protected void syncMapKeyConverter() {
 		Association<JavaConverter.Adapter, Annotation> assoc = this.getMapKeyConverterAnnotation();
 		if (assoc == null) {
-			if (this.mapKeyConverter.getType() != null) {
+			if (this.mapKeyConverter.getConverterType() != null) {
 				this.setMapKeyConverter_(this.buildNullConverter());
 			}
 		} else {
 			JavaConverter.Adapter adapter = assoc.getKey();
 			Annotation annotation = assoc.getValue();
-			if ((this.mapKeyConverter.getType() == adapter.getConverterType()) &&
+			if ((this.mapKeyConverter.getConverterType() == adapter.getConverterType()) &&
 					(this.mapKeyConverter.getConverterAnnotation() == annotation)) {
 				this.mapKeyConverter.synchronizeWithResourceModel();
 			} else {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java
index 6f72588c65..5f5af98b10 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java
@@ -489,7 +489,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen
 	}
 
 	public void setConverter(Class<? extends Converter> converterType) {
-		if (this.converter.getType() != converterType) {
+		if (this.converter.getConverterType() != converterType) {
 			// Make the old value is the real old one when firing property changed event below
 			OrmConverter old = this.converter;
 			// Set the new value of the converter to a NullOrmConverter to prevent the following
@@ -538,11 +538,11 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen
 	protected void syncConverter() {
 		OrmConverter.Adapter adapter = this.getXmlConverterAdapter();
 		if (adapter == null) {
-			if (this.converter.getType() != null) {
+			if (this.converter.getConverterType() != null) {
 				this.setConverter_(this.nullConverter);
 			}
 		} else {
-			if (this.converter.getType() == adapter.getConverterType()) {
+			if (this.converter.getConverterType() == adapter.getConverterType()) {
 				this.converter.synchronizeWithResourceModel();
 			} else {
 				this.setConverter_(adapter.buildNewConverter(this, this.getContextModelFactory()));
@@ -930,7 +930,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen
 	}
 
 	public void setMapKeyConverter(Class<? extends Converter> converterType) {
-		if (this.mapKeyConverter.getType() != converterType) {
+		if (this.mapKeyConverter.getConverterType() != converterType) {
 			// Make the old value is the real old one when firing property changed event below
 			OrmConverter old = this.mapKeyConverter;
 			// Set the new value of the map key converter to a NullOrmConverter to prevent the following 
@@ -979,11 +979,11 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen
 	protected void syncMapKeyConverter() {
 		OrmConverter.Adapter adapter = this.getXmlMapKeyConverterAdapter();
 		if (adapter == null) {
-			if (this.mapKeyConverter.getType() != null) {
+			if (this.mapKeyConverter.getConverterType() != null) {
 				this.setMapKeyConverter_(this.nullConverter);
 			}
 		} else {
-			if (this.mapKeyConverter.getType() == adapter.getConverterType()) {
+			if (this.mapKeyConverter.getConverterType() == adapter.getConverterType()) {
 				this.mapKeyConverter.synchronizeWithResourceModel();
 			} else {
 				this.setMapKeyConverter_(adapter.buildNewConverter(this, this.getContextModelFactory()));
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConvert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConvert.java
index 7d59179943..366c68b455 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConvert.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConvert.java
@@ -29,6 +29,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersi
 public interface EclipseLinkConvert
 	extends Converter
 {
+	Class<EclipseLinkConvert> getConverterType();
 
 	EclipseLinkPersistenceUnit getPersistenceUnit();
 
@@ -80,7 +81,7 @@ public interface EclipseLinkConvert
 	{
 		@Override
 		public EclipseLinkConvert transform(Converter converter) {
-			return (converter.getType() == EclipseLinkConvert.class) ? (EclipseLinkConvert) converter : null;
+			return (converter.getConverterType() == EclipseLinkConvert.class) ? (EclipseLinkConvert) converter : null;
 		}
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMapping2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMapping2_3.java
index 55c848a09e..6196bdf02f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMapping2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMapping2_3.java
@@ -110,7 +110,7 @@ public class EclipseLinkJavaArrayMapping2_3
 	}
 
 	public void setConverter(Class<? extends Converter> converterType) {
-		if (this.converter.getType() != converterType) {
+		if (this.converter.getConverterType() != converterType) {
 			this.converter.dispose();
 			JavaConverter.Adapter converterAdapter = this.getConverterAdapter(converterType);
 			this.retainConverterAnnotation(converterAdapter);
@@ -158,13 +158,13 @@ public class EclipseLinkJavaArrayMapping2_3
 	protected void syncConverter() {
 		Association<JavaConverter.Adapter, Annotation> assoc = this.getConverterAnnotation();
 		if (assoc == null) {
-			if (this.converter.getType() != null) {
+			if (this.converter.getConverterType() != null) {
 				this.setConverter_(this.buildNullConverter());
 			}
 		} else {
 			JavaConverter.Adapter adapter = assoc.getKey();
 			Annotation annotation = assoc.getValue();
-			if ((this.converter.getType() == adapter.getConverterType()) &&
+			if ((this.converter.getConverterType() == adapter.getConverterType()) &&
 					(this.converter.getConverterAnnotation() == annotation)) {
 				this.converter.synchronizeWithResourceModel();
 			} else {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConvert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConvert.java
index 5aa99aa5f8..99b23c2601 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConvert.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConvert.java
@@ -98,7 +98,7 @@ public class EclipseLinkJavaConvert
 
 	// ********** misc **********
 
-	public Class<? extends Converter> getType() {
+	public Class<EclipseLinkConvert> getConverterType() {
 		return EclipseLinkConvert.class;
 	}
 
@@ -160,7 +160,7 @@ public class EclipseLinkJavaConvert
 			super();
 		}
 
-		public Class<? extends Converter> getConverterType() {
+		public Class<EclipseLinkConvert> getConverterType() {
 			return EclipseLinkConvert.class;
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmArrayMapping2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmArrayMapping2_3.java
index d8a479f5c9..cd32f108cb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmArrayMapping2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmArrayMapping2_3.java
@@ -128,7 +128,7 @@ public class EclipseLinkOrmArrayMapping2_3
 	}
 
 	public void setConverter(Class<? extends Converter> converterType) {
-		if (this.converter.getType() != converterType) {
+		if (this.converter.getConverterType() != converterType) {
 			// Make the old value is the real old one when firing property changed event below
 			OrmConverter old = this.converter;
 			// Set the new value of the converter to a NullOrmConverter to prevent the following
@@ -177,11 +177,11 @@ public class EclipseLinkOrmArrayMapping2_3
 	protected void syncConverter() {
 		OrmConverter.Adapter adapter = this.getXmlConverterAdapter();
 		if (adapter == null) {
-			if (this.converter.getType() != null) {
+			if (this.converter.getConverterType() != null) {
 				this.setConverter_(this.nullConverter);
 			}
 		} else {
-			if (this.converter.getType() == adapter.getConverterType()) {
+			if (this.converter.getConverterType() == adapter.getConverterType()) {
 				this.converter.synchronizeWithResourceModel();
 			} else {
 				this.setConverter_(adapter.buildNewConverter(this, this.getContextModelFactory()));
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java
index 8fe67e74ae..7d6b36f5d5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java
@@ -93,7 +93,7 @@ public class EclipseLinkOrmConvert
 		return ((XmlConvert) this.getXmlConvertibleMapping().getConvert());
 	}
 	
-	public Class<? extends Converter> getType() {
+	public Class<EclipseLinkConvert> getConverterType() {
 		return EclipseLinkConvert.class;
 	}
 
@@ -159,7 +159,7 @@ public class EclipseLinkOrmConvert
 			super();
 		}
 
-		public Class<? extends Converter> getConverterType() {
+		public Class<EclipseLinkConvert> getConverterType() {
 			return EclipseLinkConvert.class;
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMappingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMappingComposite2_0.java
index 0159c5e63f..ff1814558a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMappingComposite2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMappingComposite2_0.java
@@ -119,7 +119,7 @@ public abstract class EclipseLinkElementCollectionMappingComposite2_0<T extends
 			@Override
 			protected Boolean buildValue_() {
 				Converter converter = this.subject.getConverter();
-				return Boolean.valueOf(converter.getType() == converterType);
+				return Boolean.valueOf(converter.getConverterType() == converterType);
 			}
 
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java
index 87f0f411dd..f200e3488e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java
@@ -137,7 +137,7 @@ public abstract class EclipseLinkVersionMappingComposite<T extends EclipseLinkVe
 		return new TransformationPropertyValueModel<Converter, BaseTemporalConverter>(converterHolder) {
 			@Override
 			protected BaseTemporalConverter transform_(Converter converter) {
-				return converter.getType() == BaseTemporalConverter.class ? (BaseTemporalConverter) converter : null;
+				return converter.getConverterType() == BaseTemporalConverter.class ? (BaseTemporalConverter) converter : null;
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java
index 1de58058e3..00626b354d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java
@@ -194,7 +194,7 @@ public abstract class AbstractBasicMappingComposite<T extends BasicMapping>
 		return new TransformationPropertyValueModel<Converter, BaseTemporalConverter>(converterHolder) {
 			@Override
 			protected BaseTemporalConverter transform_(Converter converter) {
-				return converter.getType() == BaseTemporalConverter.class ? (BaseTemporalConverter) converter : null;
+				return converter.getConverterType() == BaseTemporalConverter.class ? (BaseTemporalConverter) converter : null;
 			}
 		};
 	}
@@ -203,7 +203,7 @@ public abstract class AbstractBasicMappingComposite<T extends BasicMapping>
 		return new TransformationPropertyValueModel<Converter, BaseEnumeratedConverter>(converterHolder) {
 			@Override
 			protected BaseEnumeratedConverter transform_(Converter converter) {
-				return converter.getType() == BaseEnumeratedConverter.class ? (BaseEnumeratedConverter) converter : null;
+				return converter.getConverterType() == BaseEnumeratedConverter.class ? (BaseEnumeratedConverter) converter : null;
 			}
 		};
 	}
@@ -213,7 +213,7 @@ public abstract class AbstractBasicMappingComposite<T extends BasicMapping>
 			@Override
 			protected Boolean buildValue_() {
 				Converter converter = this.subject.getConverter();
-				return Boolean.valueOf(converter.getType() == converterType);
+				return Boolean.valueOf(converter.getConverterType() == converterType);
 			}
 
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java
index 2a5dbedf7a..a5a529d388 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java
@@ -121,7 +121,7 @@ public abstract class AbstractIdMappingComposite<T extends IdMapping>
 			@Override
 			protected Boolean buildValue_() {
 				Converter converter = this.subject.getConverter();
-				return Boolean.valueOf(converter.getType() == converterType);
+				return Boolean.valueOf(converter.getConverterType() == converterType);
 			}
 			
 			@Override
@@ -146,7 +146,7 @@ public abstract class AbstractIdMappingComposite<T extends IdMapping>
 		return new TransformationPropertyValueModel<Converter, BaseTemporalConverter>(converterHolder) {
 			@Override
 			protected BaseTemporalConverter transform_(Converter converter) {
-				return converter.getType() == BaseTemporalConverter.class ? (BaseTemporalConverter) converter : null;
+				return converter.getConverterType() == BaseTemporalConverter.class ? (BaseTemporalConverter) converter : null;
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java
index bcef3133bb..ab78b89cb4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java
@@ -131,7 +131,7 @@ public abstract class AbstractVersionMappingComposite<T extends VersionMapping>
 			@Override
 			protected Boolean buildValue_() {
 				Converter converter = this.subject.getConverter();
-				return Boolean.valueOf(converter.getType() == converterType);
+				return Boolean.valueOf(converter.getConverterType() == converterType);
 			}
 
 			@Override
@@ -156,7 +156,7 @@ public abstract class AbstractVersionMappingComposite<T extends VersionMapping>
 		return new TransformationPropertyValueModel<Converter, BaseTemporalConverter>(converterHolder) {
 			@Override
 			protected BaseTemporalConverter transform_(Converter converter) {
-				return converter.getType() == BaseTemporalConverter.class ? (BaseTemporalConverter) converter : null;
+				return converter.getConverterType() == BaseTemporalConverter.class ? (BaseTemporalConverter) converter : null;
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMappingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMappingComposite2_0.java
index b575db73a8..82af7a276e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMappingComposite2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMappingComposite2_0.java
@@ -305,7 +305,7 @@ public abstract class AbstractElementCollectionMappingComposite2_0<T extends Ele
 		return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
-				return Boolean.valueOf(this.subject.getConverter().getType() == null);
+				return Boolean.valueOf(this.subject.getConverter().getConverterType() == null);
 			}
 
 			@Override
@@ -322,7 +322,7 @@ public abstract class AbstractElementCollectionMappingComposite2_0<T extends Ele
 			@Override
 			protected Boolean buildValue_() {
 				Converter converter = this.subject.getConverter();
-				return Boolean.valueOf(converter.getType() == LobConverter.class);
+				return Boolean.valueOf(converter.getConverterType() == LobConverter.class);
 			}
 
 			@Override
@@ -347,7 +347,7 @@ public abstract class AbstractElementCollectionMappingComposite2_0<T extends Ele
 		return new TransformationPropertyValueModel<Converter, BaseTemporalConverter>(converterHolder) {
 			@Override
 			protected BaseTemporalConverter transform_(Converter converter) {
-				return converter.getType() == BaseTemporalConverter.class ? (BaseTemporalConverter) converter : null;
+				return converter.getConverterType() == BaseTemporalConverter.class ? (BaseTemporalConverter) converter : null;
 			}
 		};
 	}
@@ -356,7 +356,7 @@ public abstract class AbstractElementCollectionMappingComposite2_0<T extends Ele
 		return new TransformationPropertyValueModel<Converter, BaseEnumeratedConverter>(converterHolder) {
 			@Override
 			protected BaseEnumeratedConverter transform_(Converter converter) {
-				return converter.getType() == BaseEnumeratedConverter.class ? (BaseEnumeratedConverter) converter : null;
+				return converter.getConverterType() == BaseEnumeratedConverter.class ? (BaseEnumeratedConverter) converter : null;
 			}
 		};
 	}
@@ -366,7 +366,7 @@ public abstract class AbstractElementCollectionMappingComposite2_0<T extends Ele
 			@Override
 			protected Boolean buildValue_() {
 				Converter converter = this.subject.getConverter();
-				return Boolean.valueOf(converter.getType() == BaseTemporalConverter.class);
+				return Boolean.valueOf(converter.getConverterType() == BaseTemporalConverter.class);
 			}
 
 			@Override
@@ -383,7 +383,7 @@ public abstract class AbstractElementCollectionMappingComposite2_0<T extends Ele
 			@Override
 			protected Boolean buildValue_() {
 				Converter converter = this.subject.getConverter();
-				return Boolean.valueOf(converter.getType() == BaseEnumeratedConverter.class);
+				return Boolean.valueOf(converter.getConverterType() == BaseEnumeratedConverter.class);
 			}
 
 			@Override