322544 - java type refactoring - refactor EclipseLink converters - added to id, version and element-collection mappings

3 files changed, 133 insertions, 3 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmIdMapping.java
index 6dc07edd24..04451b213b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmIdMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmIdMapping.java
@@ -11,6 +11,8 @@ package org.eclipse.jpt.core.internal.context.orm;
 
 import java.util.Iterator;
 import java.util.List;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IType;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.AttributeMapping;
 import org.eclipse.jpt.core.context.BaseColumn;
@@ -40,9 +42,11 @@ import org.eclipse.jpt.core.utility.TextRange;
 import org.eclipse.jpt.db.Table;
 import org.eclipse.jpt.utility.internal.ArrayTools;
 import org.eclipse.jpt.utility.internal.iterables.CompositeIterable;
+import org.eclipse.jpt.utility.internal.iterables.EmptyIterable;
 import org.eclipse.jpt.utility.internal.iterables.FilteringIterable;
 import org.eclipse.jpt.utility.internal.iterables.SubIterableWrapper;
 import org.eclipse.osgi.util.NLS;
+import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 
@@ -329,6 +333,54 @@ public abstract class AbstractOrmIdMapping<T extends XmlId>
 		}
 		return Converter.NO_CONVERTER;
 	}
+
+
+	//************ refactoring ************
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
+		return new CompositeIterable<ReplaceEdit>(
+			super.createRenameTypeEdits(originalType, newName),
+			this.createConverterRenameTypeEdits(originalType, newName));
+	}
+
+	protected Iterable<ReplaceEdit> createConverterRenameTypeEdits(IType originalType, String newName) {
+		if (getConverter() != null) {
+			return getConverter().createRenameTypeEdits(originalType, newName);
+		}
+		return EmptyIterable.instance();
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
+		return new CompositeIterable<ReplaceEdit>(
+			super.createMoveTypeEdits(originalType, newPackage),
+			this.createConverterMoveTypeEdits(originalType, newPackage));
+	}
+	
+	protected Iterable<ReplaceEdit> createConverterMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
+		if (getConverter() != null) {
+			return getConverter().createMoveTypeEdits(originalType, newPackage);
+		}
+		return EmptyIterable.instance();
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
+		return new CompositeIterable<ReplaceEdit>(
+			super.createRenamePackageEdits(originalPackage, newName),
+			this.createConverterRenamePackageEdits(originalPackage, newName));
+	}
+
+	protected Iterable<ReplaceEdit> createConverterRenamePackageEdits(IPackageFragment originalPackage, String newName) {
+		if (getConverter() != null) {
+			return getConverter().createRenamePackageEdits(originalPackage, newName);
+		}
+		return EmptyIterable.instance();
+	}
 	
 	
 	// ****************** validation ****************
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmVersionMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmVersionMapping.java
index 609fb02d07..3bb0379b24 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmVersionMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmVersionMapping.java
@@ -12,6 +12,8 @@ package org.eclipse.jpt.core.internal.context.orm;
 import java.util.Iterator;
 import java.util.List;
 
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IType;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.BaseColumn;
 import org.eclipse.jpt.core.context.Converter;
@@ -31,6 +33,9 @@ import org.eclipse.jpt.core.resource.orm.XmlColumn;
 import org.eclipse.jpt.core.resource.orm.XmlVersion;
 import org.eclipse.jpt.core.utility.TextRange;
 import org.eclipse.jpt.db.Table;
+import org.eclipse.jpt.utility.internal.iterables.CompositeIterable;
+import org.eclipse.jpt.utility.internal.iterables.EmptyIterable;
+import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 
@@ -180,7 +185,56 @@ public abstract class AbstractOrmVersionMapping<T extends XmlVersion>
 	public void removeResourceColumn() {
 		this.resourceAttributeMapping.setColumn(null);
 	}
+
+
+	//************ refactoring ************
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
+		return new CompositeIterable<ReplaceEdit>(
+			super.createRenameTypeEdits(originalType, newName),
+			this.createConverterRenameTypeEdits(originalType, newName));
+	}
+
+	protected Iterable<ReplaceEdit> createConverterRenameTypeEdits(IType originalType, String newName) {
+		if (getConverter() != null) {
+			return getConverter().createRenameTypeEdits(originalType, newName);
+		}
+		return EmptyIterable.instance();
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
+		return new CompositeIterable<ReplaceEdit>(
+			super.createMoveTypeEdits(originalType, newPackage),
+			this.createConverterMoveTypeEdits(originalType, newPackage));
+	}
 	
+	protected Iterable<ReplaceEdit> createConverterMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
+		if (getConverter() != null) {
+			return getConverter().createMoveTypeEdits(originalType, newPackage);
+		}
+		return EmptyIterable.instance();
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
+		return new CompositeIterable<ReplaceEdit>(
+			super.createRenamePackageEdits(originalPackage, newName),
+			this.createConverterRenamePackageEdits(originalPackage, newName));
+	}
+
+	protected Iterable<ReplaceEdit> createConverterRenamePackageEdits(IPackageFragment originalPackage, String newName) {
+		if (getConverter() != null) {
+			return getConverter().createRenamePackageEdits(originalPackage, newName);
+		}
+		return EmptyIterable.instance();
+	}
+
+
 	// ****************** validation ****************
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java
index 673c9b23ba..a384580742 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java
@@ -1043,7 +1043,8 @@ public abstract class AbstractOrmElementCollectionMapping2_0<T extends XmlElemen
 		return new CompositeIterable<ReplaceEdit>(
 			super.createRenameTypeEdits(originalType, newName),
 			this.createMapKeyClassRenameTypeEdits(originalType, newName),
-			this.createTargetClassRenameTypeEdits(originalType, newName));
+			this.createTargetClassRenameTypeEdits(originalType, newName),
+			this.createConverterRenameTypeEdits(originalType, newName));
 	}
 
 	protected Iterable<ReplaceEdit> createMapKeyClassRenameTypeEdits(IType originalType, String newName) {
@@ -1070,13 +1071,21 @@ public abstract class AbstractOrmElementCollectionMapping2_0<T extends XmlElemen
 		return EmptyIterable.instance();
 	}
 
+	protected Iterable<ReplaceEdit> createConverterRenameTypeEdits(IType originalType, String newName) {
+		if (getConverter() != null) {
+			return getConverter().createRenameTypeEdits(originalType, newName);
+		}
+		return EmptyIterable.instance();
+	}
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
 		return new CompositeIterable<ReplaceEdit>(
 			super.createMoveTypeEdits(originalType, newPackage),
 			this.createMapKeyClassMoveTypeEdits(originalType, newPackage),
-			this.createTargetClassMoveTypeEdits(originalType, newPackage));
+			this.createTargetClassMoveTypeEdits(originalType, newPackage),
+			this.createConverterMoveTypeEdits(originalType, newPackage));
 	}
 
 	protected Iterable<ReplaceEdit> createMapKeyClassMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
@@ -1098,6 +1107,13 @@ public abstract class AbstractOrmElementCollectionMapping2_0<T extends XmlElemen
 		}
 		return EmptyIterable.instance();
 	}
+	
+	protected Iterable<ReplaceEdit> createConverterMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
+		if (getConverter() != null) {
+			return getConverter().createMoveTypeEdits(originalType, newPackage);
+		}
+		return EmptyIterable.instance();
+	}
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -1105,7 +1121,8 @@ public abstract class AbstractOrmElementCollectionMapping2_0<T extends XmlElemen
 		return new CompositeIterable<ReplaceEdit>(
 			super.createRenamePackageEdits(originalPackage, newName),
 			this.createMapKeyClassRenamePackageEdits(originalPackage, newName),
-			this.createTargetClassRenamePackageEdits(originalPackage, newName));
+			this.createTargetClassRenamePackageEdits(originalPackage, newName),
+			this.createConverterRenamePackageEdits(originalPackage, newName));
 	}
 
 	protected Iterable<ReplaceEdit> createMapKeyClassRenamePackageEdits(IPackageFragment originalPackage, String newName) {
@@ -1130,6 +1147,13 @@ public abstract class AbstractOrmElementCollectionMapping2_0<T extends XmlElemen
 		return EmptyIterable.instance();
 	}
 
+	protected Iterable<ReplaceEdit> createConverterRenamePackageEdits(IPackageFragment originalPackage, String newName) {
+		if (getConverter() != null) {
+			return getConverter().createRenamePackageEdits(originalPackage, newName);
+		}
+		return EmptyIterable.instance();
+	}
+
 	// ********** validation **********
 	
 	@Override