Bug 374898 - some attribute mapping level refactorings are not happening in an eclipselink-orm.xml

1 files changed, 15 insertions, 3 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java
index 7e95f9eac9..184167e1c2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java
@@ -122,18 +122,30 @@ public class EclipseLinkOrmElementCollectionMapping2_0
 	//************ refactoring ************
 
 	@Override
+	@SuppressWarnings("unchecked")
 	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.converterContainer.createMoveTypeEdits(originalType, newPackage);
+		return new CompositeIterable<ReplaceEdit>(
+			super.createMoveTypeEdits(originalType, newPackage),
+			this.converterContainer.createMoveTypeEdits(originalType, newPackage)
+		);
 	}
 
 	@Override
+	@SuppressWarnings("unchecked")
 	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.converterContainer.createRenamePackageEdits(originalPackage, newName);
+		return new CompositeIterable<ReplaceEdit>(
+			super.createRenamePackageEdits(originalPackage, newName),
+			this.converterContainer.createRenamePackageEdits(originalPackage, newName)
+		);
 	}
 
 	@Override
+	@SuppressWarnings("unchecked")
 	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
-		return this.converterContainer.createRenameTypeEdits(originalType, newName);
+		return new CompositeIterable<ReplaceEdit>(
+			super.createRenameTypeEdits(originalType, newName),
+			this.converterContainer.createRenameTypeEdits(originalType, newName)
+		);
 	}