322544 - java type refactoring - refactor EclipseLink converters

4 files changed, 57 insertions, 57 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java
index 7a7f6fe2cc..8c29d504fb 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java
@@ -514,28 +514,28 @@ public class EclipseLinkPersistenceUnit
 
 	@SuppressWarnings("unchecked")
 	@Override
-	protected Iterable<ReplaceEdit> createPersistenceUnitPropertiesReplaceTypeEdits(IType originalType, String newName) {
+	protected Iterable<ReplaceEdit> createPersistenceUnitPropertiesRenameTypeEdits(IType originalType, String newName) {
 		return new CompositeIterable<ReplaceEdit>(
-			super.createPersistenceUnitPropertiesReplaceTypeEdits(originalType, newName),
-			this.customization.createReplaceTypeEdits(originalType, newName),
-			this.logging.createReplaceTypeEdits(originalType, newName));
+			super.createPersistenceUnitPropertiesRenameTypeEdits(originalType, newName),
+			this.customization.createRenameTypeEdits(originalType, newName),
+			this.logging.createRenameTypeEdits(originalType, newName));
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	protected Iterable<ReplaceEdit> createPersistenceUnitPropertiesMoveTypeReplaceEdits(IType originalType, IPackageFragment newPackage) {
+	protected Iterable<ReplaceEdit> createPersistenceUnitPropertiesMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
 		return new CompositeIterable<ReplaceEdit>(
-			super.createPersistenceUnitPropertiesMoveTypeReplaceEdits(originalType, newPackage),
-			this.customization.createMoveTypeReplaceEdits(originalType, newPackage),
-			this.logging.createMoveTypeReplaceEdits(originalType, newPackage));
+			super.createPersistenceUnitPropertiesMoveTypeEdits(originalType, newPackage),
+			this.customization.createMoveTypeEdits(originalType, newPackage),
+			this.logging.createMoveTypeEdits(originalType, newPackage));
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	protected Iterable<ReplaceEdit> createPersistenceUnitPropertiesReplacePackageEdits(IPackageFragment originalPackage, String newName) {
+	protected Iterable<ReplaceEdit> createPersistenceUnitPropertiesRenamePackageEdits(IPackageFragment originalPackage, String newName) {
 		return new CompositeIterable<ReplaceEdit>(
-			super.createPersistenceUnitPropertiesReplacePackageEdits(originalPackage, newName),
-			this.customization.createReplacePackageEdits(originalPackage, newName),
-			this.logging.createReplacePackageEdits(originalPackage, newName));
+			super.createPersistenceUnitPropertiesRenamePackageEdits(originalPackage, newName),
+			this.customization.createRenamePackageEdits(originalPackage, newName),
+			this.logging.createRenamePackageEdits(originalPackage, newName));
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/EclipseLinkCustomization.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/EclipseLinkCustomization.java
index f0a45f95f2..3cfbc54ce8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/EclipseLinkCustomization.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/customization/EclipseLinkCustomization.java
@@ -807,81 +807,81 @@ public class EclipseLinkCustomization extends EclipseLinkPersistenceUnitProperti
 
 	@Override
 	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createReplaceTypeEdits(IType originalType, String newName) {
+	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
 		return new CompositeIterable<ReplaceEdit>(
-					this.createSessionCustomizerReplaceTypeEdits(originalType, newName),
-					this.createExceptionHandlerReplaceTypeEdits(originalType, newName));
+					this.createSessionCustomizerRenameTypeEdits(originalType, newName),
+					this.createExceptionHandlerRenameTypeEdits(originalType, newName));
 	}
 
-	protected Iterable<ReplaceEdit> createSessionCustomizerReplaceTypeEdits(final IType originalType, final String newName) {
+	protected Iterable<ReplaceEdit> createSessionCustomizerRenameTypeEdits(final IType originalType, final String newName) {
 		return new CompositeIterable<ReplaceEdit>(
 			new TransformationIterable<PersistenceUnit.Property, Iterable<ReplaceEdit>>(getPersistenceUnit().getPropertiesNamed(ECLIPSELINK_SESSION_CUSTOMIZER)) {
 				@Override
 				protected Iterable<ReplaceEdit> transform(PersistenceUnit.Property property) {
-					return property.createReplaceTypeEdits(originalType, newName);
+					return property.createRenameTypeEdits(originalType, newName);
 				}
 			}
 		);
 	}
 
-	protected Iterable<ReplaceEdit> createExceptionHandlerReplaceTypeEdits(IType originalType, String newName) {
+	protected Iterable<ReplaceEdit> createExceptionHandlerRenameTypeEdits(IType originalType, String newName) {
 		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_EXCEPTION_HANDLER);
 		if (property != null) {
-			return property.createReplaceTypeEdits(originalType, newName);
+			return property.createRenameTypeEdits(originalType, newName);
 		}
 		return EmptyIterable.instance();
 	}
 
 	@Override
 	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createMoveTypeReplaceEdits(IType originalType, IPackageFragment newPackage) {
+	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
 		return new CompositeIterable<ReplaceEdit>(
-					this.createSessionCustomizerMoveTypeReplaceEdits(originalType, newPackage),
-					this.createExceptionHandlerMoveTypeReplaceEdits(originalType, newPackage));
+					this.createSessionCustomizerMoveTypeEdits(originalType, newPackage),
+					this.createExceptionHandlerMoveTypeEdits(originalType, newPackage));
 	}
 
-	protected Iterable<ReplaceEdit> createSessionCustomizerMoveTypeReplaceEdits(final IType originalType, final IPackageFragment newPackage) {
+	protected Iterable<ReplaceEdit> createSessionCustomizerMoveTypeEdits(final IType originalType, final IPackageFragment newPackage) {
 		return new CompositeIterable<ReplaceEdit>(
 			new TransformationIterable<PersistenceUnit.Property, Iterable<ReplaceEdit>>(getPersistenceUnit().getPropertiesNamed(ECLIPSELINK_SESSION_CUSTOMIZER)) {
 				@Override
 				protected Iterable<ReplaceEdit> transform(PersistenceUnit.Property property) {
-					return property.createMoveTypeReplaceEdits(originalType, newPackage);
+					return property.createMoveTypeEdits(originalType, newPackage);
 				}
 			}
 		);
 	}
 
-	protected Iterable<ReplaceEdit> createExceptionHandlerMoveTypeReplaceEdits(IType originalType, IPackageFragment newPackage) {
+	protected Iterable<ReplaceEdit> createExceptionHandlerMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
 		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_EXCEPTION_HANDLER);
 		if (property != null) {
-			return property.createMoveTypeReplaceEdits(originalType, newPackage);
+			return property.createMoveTypeEdits(originalType, newPackage);
 		}
 		return EmptyIterable.instance();
 	}
 
 	@Override
 	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createReplacePackageEdits(IPackageFragment originalPackage, String newName) {
+	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
 		return new CompositeIterable<ReplaceEdit>(
-					this.createSessionCustomizerReplacePackageEdits(originalPackage, newName),
-					this.createExceptionHandlerReplacePackageEdits(originalPackage, newName));
+					this.createSessionCustomizerRenamePackageEdits(originalPackage, newName),
+					this.createExceptionHandlerRenamePackageEdits(originalPackage, newName));
 	}
 
-	protected Iterable<ReplaceEdit> createSessionCustomizerReplacePackageEdits(final IPackageFragment originalPackage, final String newName) {
+	protected Iterable<ReplaceEdit> createSessionCustomizerRenamePackageEdits(final IPackageFragment originalPackage, final String newName) {
 		return new CompositeIterable<ReplaceEdit>(
 			new TransformationIterable<PersistenceUnit.Property, Iterable<ReplaceEdit>>(getPersistenceUnit().getPropertiesNamed(ECLIPSELINK_SESSION_CUSTOMIZER)) {
 				@Override
 				protected Iterable<ReplaceEdit> transform(PersistenceUnit.Property property) {
-					return property.createReplacePackageEdits(originalPackage, newName);
+					return property.createRenamePackageEdits(originalPackage, newName);
 				}
 			}
 		);
 	}
 
-	protected Iterable<ReplaceEdit> createExceptionHandlerReplacePackageEdits(IPackageFragment originalPackage, String newName) {
+	protected Iterable<ReplaceEdit> createExceptionHandlerRenamePackageEdits(IPackageFragment originalPackage, String newName) {
 		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_EXCEPTION_HANDLER);
 		if (property != null) {
-			return property.createReplacePackageEdits(originalPackage, newName);
+			return property.createRenamePackageEdits(originalPackage, newName);
 		}
 		return EmptyIterable.instance();
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/EclipseLinkLogging.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/EclipseLinkLogging.java
index 4ddc5bd340..159a47818e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/EclipseLinkLogging.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/logging/EclipseLinkLogging.java
@@ -366,43 +366,43 @@ public class EclipseLinkLogging extends EclipseLinkPersistenceUnitProperties
 	// ********** refactoring ************
 
 	@Override
-	public Iterable<ReplaceEdit> createReplaceTypeEdits(IType originalType, String newName) {
-		return this.createLoggerReplaceTypeEdits(originalType, newName);
+	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
+		return this.createLoggerRenameTypeEdits(originalType, newName);
 	}
 
-	protected Iterable<ReplaceEdit> createLoggerReplaceTypeEdits(IType originalType, String newName) {
+	protected Iterable<ReplaceEdit> createLoggerRenameTypeEdits(IType originalType, String newName) {
 		//TODO seems like we should have the Property stored in a SessionCustomizer object instead of having to go 
 		//find all of the Properties from the persistence unit.
 		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_LOGGER);
 		if (property != null) {
-			return property.createReplaceTypeEdits(originalType, newName);
+			return property.createRenameTypeEdits(originalType, newName);
 		}
 		return EmptyIterable.instance();
 	}
 
 	@Override
-	public Iterable<ReplaceEdit> createMoveTypeReplaceEdits(IType originalType, IPackageFragment newPackage) {
-		return this.createLoggerMoveTypeReplaceEdits(originalType, newPackage);
+	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
+		return this.createLoggerMoveTypeEdits(originalType, newPackage);
 	}
 
-	protected Iterable<ReplaceEdit> createLoggerMoveTypeReplaceEdits(IType originalType, IPackageFragment newPackage) {
+	protected Iterable<ReplaceEdit> createLoggerMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
 		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_LOGGER);
 		if (property != null) {
-			return property.createMoveTypeReplaceEdits(originalType, newPackage);
+			return property.createMoveTypeEdits(originalType, newPackage);
 		}
 		return EmptyIterable.instance();
 	}
 
 	@Override
-	public Iterable<ReplaceEdit> createReplacePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.createLoggerReplacePackageEdits(originalPackage, newName);
+	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
+		return this.createLoggerRenamePackageEdits(originalPackage, newName);
 	}
 
-	protected Iterable<ReplaceEdit> createLoggerReplacePackageEdits(IPackageFragment originalPackage, String newName) {
+	protected Iterable<ReplaceEdit> createLoggerRenamePackageEdits(IPackageFragment originalPackage, String newName) {
 		//find all of the Properties from the persistence unit.
 		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_LOGGER);
 		if (property != null) {
-			return property.createReplacePackageEdits(originalPackage, newName);
+			return property.createRenamePackageEdits(originalPackage, newName);
 		}
 		return EmptyIterable.instance();
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/EclipseLinkOptions.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/EclipseLinkOptions.java
index 465a7d10d7..0cc9e46387 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/EclipseLinkOptions.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/EclipseLinkOptions.java
@@ -404,40 +404,40 @@ public class EclipseLinkOptions extends EclipseLinkPersistenceUnitProperties
 	// ********** refactoring ************
 
 	@Override
-	public Iterable<ReplaceEdit> createReplaceTypeEdits(IType originalType, String newName) {
-		return this.createEventListenerReplaceTypeEdits(originalType, newName);
+	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
+		return this.createEventListenerRenameTypeEdits(originalType, newName);
 	}
 
-	protected Iterable<ReplaceEdit> createEventListenerReplaceTypeEdits(IType originalType, String newName) {
+	protected Iterable<ReplaceEdit> createEventListenerRenameTypeEdits(IType originalType, String newName) {
 		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_SESSION_EVENT_LISTENER);
 		if (property != null) {
-			return property.createReplaceTypeEdits(originalType, newName);
+			return property.createRenameTypeEdits(originalType, newName);
 		}
 		return EmptyIterable.instance();
 	}
 
 	@Override
-	public Iterable<ReplaceEdit> createMoveTypeReplaceEdits(IType originalType, IPackageFragment newPackage) {
-		return this.createEventListenerMoveTypeReplaceEdits(originalType, newPackage);
+	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
+		return this.createEventListenerMoveTypeEdits(originalType, newPackage);
 	}
 
-	protected Iterable<ReplaceEdit> createEventListenerMoveTypeReplaceEdits(IType originalType, IPackageFragment newPackage) {
+	protected Iterable<ReplaceEdit> createEventListenerMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
 		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_SESSION_EVENT_LISTENER);
 		if (property != null) {
-			return property.createMoveTypeReplaceEdits(originalType, newPackage);
+			return property.createMoveTypeEdits(originalType, newPackage);
 		}
 		return EmptyIterable.instance();
 	}
 
 	@Override
-	public Iterable<ReplaceEdit> createReplacePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.createEventListenerReplacePackageEdits(originalPackage, newName);
+	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
+		return this.createEventListenerRenamePackageEdits(originalPackage, newName);
 	}
 
-	protected Iterable<ReplaceEdit> createEventListenerReplacePackageEdits(IPackageFragment originalPackage, String newName) {
+	protected Iterable<ReplaceEdit> createEventListenerRenamePackageEdits(IPackageFragment originalPackage, String newName) {
 		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_SESSION_EVENT_LISTENER);
 		if (property != null) {
-			return property.createReplacePackageEdits(originalPackage, newName);
+			return property.createRenamePackageEdits(originalPackage, newName);
 		}
 		return EmptyIterable.instance();
 	}