209489 - rename package and folder refactoring participants

5 files changed, 63 insertions, 2 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/ClassRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/ClassRef.java
index 31a0e0fb48..f87cf90b6c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/ClassRef.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/ClassRef.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.context.persistence;
 
+import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jpt.core.JpaStructureNode;
 import org.eclipse.jpt.core.context.PersistentType;
@@ -118,6 +119,13 @@ public interface ClassRef
 	 */
 	Iterable<ReplaceEdit> createReplaceTypeEdits(IType originalType, String newName);
 
+	/**
+	 * Create ReplaceEdits for renaming the class's package to the newName.
+	 * The originalPackage has not yet been renamed.
+	 * If this class is not a part of the original package, then return an empty Iterable.
+	 */
+	Iterable<ReplaceEdit> createReplacePackageEdits(IPackageFragment originalPackage, String newName);
+
 
 	// *************************************************************************
 	
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/JarFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/JarFileRef.java
index 4bb8fce0b5..93648d5dd2 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/JarFileRef.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/JarFileRef.java
@@ -9,11 +9,13 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.context.persistence;
 
+import org.eclipse.core.resources.IFolder;
 import org.eclipse.jpt.core.JpaStructureNode;
 import org.eclipse.jpt.core.context.PersistentType;
 import org.eclipse.jpt.core.context.XmlContextNode;
 import org.eclipse.jpt.core.context.java.JarFile;
 import org.eclipse.jpt.core.resource.persistence.XmlJarFileRef;
+import org.eclipse.text.edits.ReplaceEdit;
 
 /**
  * Context model corresponding to the 
@@ -71,8 +73,17 @@ public interface JarFileRef
 	 * @see org.eclipse.jpt.core.JpaProject#update()
 	 */
 	void update(XmlJarFileRef xmlJarFileRef);
-	
-	
+
+
+	// **************** refactoring *********************************************
+
+	/**
+	 * Create ReplaceEdits for renaming any references to the originalFolder to the newName.
+	 * The originalFolder has not yet been renamed.
+	 */
+	Iterable<ReplaceEdit> createReplaceFolderEdits(IFolder originalFolder, String newName);
+
+
 	// **************** queries ************************************************
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java
index 8be104fb3e..465c5861e3 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java
@@ -10,6 +10,8 @@
 package org.eclipse.jpt.core.context.persistence;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jpt.core.JpaStructureNode;
 import org.eclipse.jpt.core.context.MappingFile;
@@ -142,6 +144,18 @@ public interface MappingFileRef
 	Iterable<ReplaceEdit> createReplaceTypeEdits(IType originalType, String newName);
 
 	/**
+	 * Create ReplaceEdits for renaming any references to the originalPackage to the newName.
+	 * The originalPackage has not yet been renamed.
+	 */
+	Iterable<ReplaceEdit> createReplacePackageEdits(IPackageFragment originalPackage, String newName);
+
+	/**
+	 * Create ReplaceEdits for renaming any references to the originalFolder to the newName.
+	 * The originalFolder has not yet been renamed.
+	 */
+	Iterable<ReplaceEdit> createReplaceFolderEdits(IFolder originalFolder, String newName);
+
+	/**
 	 * If this {@link MappingFileRef#isFor(IFile)} the given IFile, create a text 
 	 * ReplaceEdit for renaming the mapping file element to the new name.
 	 * Otherwise return an EmptyIterable.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java
index 3f17be91ce..b36d0cf04e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java
@@ -12,6 +12,8 @@ package org.eclipse.jpt.core.context.persistence;
 import java.util.Iterator;
 import java.util.ListIterator;
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jpt.core.JpaStructureNode;
 import org.eclipse.jpt.core.context.AccessType;
@@ -524,6 +526,13 @@ public interface PersistenceUnit
 		 * If this value does not match the original type, then return an empty Iterable.
 		 */
 		Iterable<ReplaceEdit> createReplaceTypeEdits(IType originalType, String newName);
+
+		/**
+		 * Create ReplaceEdits for renaming the property value package to the newName.
+		 * The originalPackage has not yet been renamed.
+		 * If this value is not in the originalPackage, then return an empty Iterable.
+		 */
+		Iterable<ReplaceEdit> createReplacePackageEdits(IPackageFragment originalPackage, String newName);
 	}
 
 	// ********** ORM persistence unit defaults **********
@@ -747,6 +756,18 @@ public interface PersistenceUnit
 	Iterable<ReplaceEdit> createReplaceTypeEdits(IType originalType, String newName);
 
 	/**
+	 * Create ReplaceEdits for renaming any references to the originalPackage to the newName.
+	 * The originalPackage has not yet been renamed.
+	 */
+	Iterable<ReplaceEdit> createReplacePackageEdits(IPackageFragment originalPackage, String newName);
+
+	/**
+	 * Create ReplaceEdits for renaming any references to the originalFolder to the newName.
+	 * The originalFolder has not yet been renamed.
+	 */
+	Iterable<ReplaceEdit> createReplaceFolderEdits(IFolder originalFolder, String newName);
+
+	/**
 	 * Create ReplaceEdits for renaming any references to the originalFile to the newName.
 	 * Return an EmptyIterable if there are not any references.	
 	 * The originalFile has not yet been renamed, the newName is the new short name.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnitProperties.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnitProperties.java
index c53c1918af..4461791cc4 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnitProperties.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnitProperties.java
@@ -9,6 +9,7 @@
 *******************************************************************************/
 package org.eclipse.jpt.core.context.persistence;
 
+import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jpt.core.JpaProject;
 import org.eclipse.jpt.utility.model.Model;
@@ -65,4 +66,10 @@ public interface PersistenceUnitProperties extends Model
 	 */
 	Iterable<ReplaceEdit> createReplaceTypeEdits(IType originalType, String newName);
 
+	/**
+	 * Create ReplaceEdits for renaming any reference to the originalPackage newName.
+	 * The originalPackage has not yet been renamed.
+	 */
+	Iterable<ReplaceEdit> createReplacePackageEdits(IPackageFragment originalPackage, String newName);
+
 }
\ No newline at end of file