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

return types

5 files changed, 12 insertions, 11 deletions

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;
 		}