push JpaNamedContextModel.getType() down to

Generator.getGeneratorType(), Query.getQueryType(), and
EclipseLinkConverter.getConverterType(); declare explicit return types

21 files changed, 155 insertions, 165 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaDbGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaDbGenerator.java
index e602149afa..073a741733 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaDbGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaDbGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -130,15 +130,14 @@ public abstract class AbstractJavaDbGenerator<A extends DbGeneratorAnnotation>
 	// ********** validation **********
 
 	@Override
-	public boolean isEquivalentTo(Generator generator) {
-		return super.isEquivalentTo(generator) &&
-				this.isEquivalentTo((DbGenerator) generator);
+	protected boolean isEquivalentTo_(Generator other) {
+		return super.isEquivalentTo_(other) &&
+				this.isEquivalentTo_((DbGenerator) other);
 	}
 
-	protected boolean isEquivalentTo(DbGenerator generator) {
-		return super.isEquivalentTo(generator) &&
-				ObjectTools.equals(this.specifiedAllocationSize, generator.getSpecifiedAllocationSize()) &&
-				ObjectTools.equals(this.specifiedInitialValue, generator.getSpecifiedInitialValue());
+	protected boolean isEquivalentTo_(DbGenerator other) {
+		return ObjectTools.equals(this.specifiedAllocationSize, other.getSpecifiedAllocationSize()) &&
+				ObjectTools.equals(this.specifiedInitialValue, other.getSpecifiedInitialValue());
 	}
 
 	// ********** database stuff **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java
index 31b7e42aed..f17de4e803 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java
@@ -14,7 +14,6 @@ import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.jpa.core.context.Generator;
-import org.eclipse.jpt.jpa.core.context.JpaNamedContextModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaGenerator;
 import org.eclipse.jpt.jpa.core.context.java.JavaGeneratorContainer;
 import org.eclipse.jpt.jpa.core.internal.context.MappingTools;
@@ -99,14 +98,14 @@ public abstract class AbstractJavaGenerator<P extends JavaGeneratorContainer, A
 	}
 
 	
-	public boolean isEquivalentTo(JpaNamedContextModel node) {
-		return (this != node) &&
-				(this.getType() == node.getType()) &&
-				this.isEquivalentTo((Generator) node);
+	public boolean isEquivalentTo(Generator other) {
+		return (this != other) &&
+				(this.getGeneratorType() == other.getGeneratorType()) &&
+				this.isEquivalentTo_(other);
 	}
 	
-	protected boolean isEquivalentTo(Generator generator) {
-		return ObjectTools.equals(this.name, generator.getName());
+	protected boolean isEquivalentTo_(Generator other) {
+		return ObjectTools.equals(this.name, other.getName());
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java
index 64838b5591..8563422280 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java
@@ -16,7 +16,6 @@ import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.common.utility.internal.collection.ListTools;
 import org.eclipse.jpt.common.utility.iterable.ListIterable;
-import org.eclipse.jpt.jpa.core.context.JpaNamedContextModel;
 import org.eclipse.jpt.jpa.core.context.Query;
 import org.eclipse.jpt.jpa.core.context.QueryHint;
 import org.eclipse.jpt.jpa.core.context.java.JavaQuery;
@@ -187,13 +186,13 @@ public abstract class AbstractJavaQuery<P extends JavaQueryContainer, A extends
 		return this.getValidationTextRange(this.queryAnnotation.getNameTextRange());
 	}
 
-	public boolean isEquivalentTo(JpaNamedContextModel node) {
-		return (this != node) &&
-				(this.getType() == node.getType()) &&
-				this.isEquivalentTo((Query) node);
+	public boolean isEquivalentTo(Query other) {
+		return (this != other) &&
+				(this.getQueryType() == other.getQueryType()) &&
+				this.isEquivalentTo_(other);
 	}
 
-	protected boolean isEquivalentTo(Query other) {
+	protected boolean isEquivalentTo_(Query other) {
 		return ObjectTools.equals(this.name, other.getName()) &&
 				this.hintsAreEquivalentTo(other);
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java
index 1f6e674a54..cd4b9fcfbe 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -131,20 +131,20 @@ public abstract class AbstractJavaSequenceGenerator<A extends SequenceGeneratorA
 
 	// ********** misc **********
 	
-	public Class<SequenceGenerator> getType() {
+	public Class<SequenceGenerator> getGeneratorType() {
 		return SequenceGenerator.class;
 	}
 
 	// ********** validation **********
 	
 	@Override
-	protected boolean isEquivalentTo(DbGenerator generator) {
-		return super.isEquivalentTo(generator)
-				&& this.isEquivalentTo((SequenceGenerator) generator);
+	protected boolean isEquivalentTo_(DbGenerator other) {
+		return super.isEquivalentTo_(other)
+				&& this.isEquivalentTo_((SequenceGenerator) other);
 	}
 	
-	protected boolean isEquivalentTo(SequenceGenerator generator) {
-		return ObjectTools.equals(this.specifiedSequenceName, generator.getSpecifiedSequenceName());
+	protected boolean isEquivalentTo_(SequenceGenerator other) {
+		return ObjectTools.equals(this.specifiedSequenceName, other.getSpecifiedSequenceName());
 	}
 	
 	// ********** metadata conversion **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java
index cf221c29b5..256d0f0126 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -131,14 +131,14 @@ public abstract class AbstractOrmDbGenerator<X extends XmlGenerator>
 
 
 	@Override
-	protected boolean isEquivalentTo(Generator generator) {
-		return super.isEquivalentTo(generator) &&
-				this.isEquivalentTo((DbGenerator) generator);
+	protected boolean isEquivalentTo_(Generator other) {
+		return super.isEquivalentTo_(other) &&
+				this.isEquivalentTo_((DbGenerator) other);
 	}
 
-	protected boolean isEquivalentTo(DbGenerator generator) {
-		return ObjectTools.equals(this.specifiedAllocationSize, generator.getSpecifiedAllocationSize()) &&
-				ObjectTools.equals(this.specifiedInitialValue, generator.getSpecifiedInitialValue());
+	protected boolean isEquivalentTo_(DbGenerator other) {
+		return ObjectTools.equals(this.specifiedAllocationSize, other.getSpecifiedAllocationSize()) &&
+				ObjectTools.equals(this.specifiedInitialValue, other.getSpecifiedInitialValue());
 	}
 
 	// ************* completion proposals *************
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmGenerator.java
index 5f2b599b2b..ae8a6d112e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmGenerator.java
@@ -15,7 +15,6 @@ import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.jpa.core.context.Generator;
 import org.eclipse.jpt.jpa.core.context.JpaContextModel;
-import org.eclipse.jpt.jpa.core.context.JpaNamedContextModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaGenerator;
 import org.eclipse.jpt.jpa.core.context.orm.OrmGenerator;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlGenerator;
@@ -99,14 +98,14 @@ public abstract class AbstractOrmGenerator<X extends XmlGenerator>
 		return this.getValidationTextRange(this.xmlGenerator.getNameTextRange());
 	}
 
-	public boolean isEquivalentTo(JpaNamedContextModel node) {
-		return (this != node) &&
-				(this.getType() == node.getType()) &&
-				this.isEquivalentTo((Generator) node);
+	public boolean isEquivalentTo(Generator other) {
+		return (this != other) &&
+				(this.getGeneratorType() == other.getGeneratorType()) &&
+				this.isEquivalentTo_(other);
 	}
 	
-	protected boolean isEquivalentTo(Generator generator) {
-		return ObjectTools.equals(this.name, generator.getName());
+	protected boolean isEquivalentTo_(Generator other) {
+		return ObjectTools.equals(this.name, other.getName());
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java
index 4968d38217..6c0cbb7e2b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java
@@ -206,13 +206,13 @@ public abstract class AbstractOrmQuery<X extends XmlQuery>
 		return this.getValidationTextRange(this.xmlQuery.getNameTextRange());
 	}
 
-	public boolean isEquivalentTo(JpaNamedContextModel node) {
-		return (this != node) &&
-				(this.getType() == node.getType()) &&
-				this.isEquivalentTo((Query) node);
+	public boolean isEquivalentTo(Query other) {
+		return (this != other) &&
+				(this.getQueryType() == other.getQueryType()) &&
+				this.isEquivalentTo_(other);
 	}
 
-	protected boolean isEquivalentTo(Query other) {
+	protected boolean isEquivalentTo_(Query other) {
 		return ObjectTools.equals(this.name, other.getName()) &&
 				this.hintsAreEquivalentTo(other);
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java
index 234400afdc..d9da83a14f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -96,20 +96,20 @@ public abstract class AbstractOrmSequenceGenerator
 	
 	// ********** misc **********
 	
-	public Class<SequenceGenerator> getType() {
+	public Class<SequenceGenerator> getGeneratorType() {
 		return SequenceGenerator.class;
 	}
 	
 	// ********** validation **********
 	
 	@Override
-	protected boolean isEquivalentTo(DbGenerator generator) {
-		return super.isEquivalentTo(generator)
-				&& this.isEquivalentTo((SequenceGenerator) generator);
+	protected boolean isEquivalentTo_(DbGenerator other) {
+		return super.isEquivalentTo_(other)
+				&& this.isEquivalentTo_((SequenceGenerator) other);
 	}
 	
-	protected boolean isEquivalentTo(SequenceGenerator generator) {
-		return ObjectTools.equals(this.specifiedSequenceName, generator.getSpecifiedSequenceName());
+	protected boolean isEquivalentTo_(SequenceGenerator other) {
+		return ObjectTools.equals(this.specifiedSequenceName, other.getSpecifiedSequenceName());
 	}
 	
 	// ********** metadata conversion **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java
index 1a275bff68..219c0663d7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java
@@ -75,11 +75,9 @@ import org.eclipse.jpt.jpa.core.context.TypeMapping;
 import org.eclipse.jpt.jpa.core.context.TypeRefactoringParticipant;
 import org.eclipse.jpt.jpa.core.context.java.JavaGenerator;
 import org.eclipse.jpt.jpa.core.context.java.JavaManagedType;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
 import org.eclipse.jpt.jpa.core.context.java.JavaQuery;
 import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
 import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.jpa.core.context.orm.OrmQueryContainer;
 import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
 import org.eclipse.jpt.jpa.core.context.persistence.JarFileRef;
@@ -1588,8 +1586,8 @@ public abstract class AbstractPersistenceUnit
 		ArrayList<Generator> result = ListTools.list(this.getMappingFileGenerators());
 
 		HashSet<String> mappingFileGeneratorNames = this.convertToNames(result);
-		HashMap<String, ArrayList<JavaGenerator>> allJavaGenerators = this.mapByName(this.getAllJavaGenerators());
-		for (Map.Entry<String, ArrayList<JavaGenerator>> entry : allJavaGenerators.entrySet()) {
+		HashMap<String, ArrayList<Generator>> allJavaGenerators = this.mapByName(this.getAllJavaGenerators());
+		for (Map.Entry<String, ArrayList<Generator>> entry : allJavaGenerators.entrySet()) {
 			if ( ! mappingFileGeneratorNames.contains(entry.getKey())) {
 				result.addAll(entry.getValue());
 			}
@@ -1605,22 +1603,20 @@ public abstract class AbstractPersistenceUnit
 	/**
 	 * Include "overridden" Java generators.
 	 */
-	protected Iterable<JavaGenerator> getAllJavaGenerators() {
-		return IterableTools.children(this.getAllJavaTypeMappingsUnique(), TYPE_MAPPING_JAVA_GENERATORS_TRANSFORMER);
+	protected Iterable<Generator> getAllJavaGenerators() {
+		return IterableTools.children(this.getAllJavaTypeMappingsUnique(), TypeMapping.GENERATORS_TRANSFORMER);
 	}
 
-	protected static final Transformer<TypeMapping, Iterable<JavaGenerator>> TYPE_MAPPING_JAVA_GENERATORS_TRANSFORMER = TransformerTools.cast(TypeMapping.GENERATORS_TRANSFORMER);
-
 	// ***** metadata conversion
 	public boolean hasConvertibleJavaGenerators() {
 		return ! this.getConvertibleJavaGenerators().isEmpty();
 	}
 
 	public void convertJavaGenerators(EntityMappings entityMappings, IProgressMonitor monitor) {
-		ArrayList<JavaGenerator> convertibleJavaGenerators = this.getConvertibleJavaGenerators();
+		ArrayList<Generator> convertibleJavaGenerators = this.getConvertibleJavaGenerators();
 		SubMonitor subMonitor = SubMonitor.convert(monitor, JptJpaCoreMessages.JAVA_METADATA_CONVERSION_IN_PROGRESS, convertibleJavaGenerators.size());
-		for (JavaGenerator generator : convertibleJavaGenerators) {
-			this.convertJavaGenerator(entityMappings, generator, subMonitor.newChild(1));
+		for (Generator generator : convertibleJavaGenerators) {
+			this.convertJavaGenerator(entityMappings, (JavaGenerator) generator, subMonitor.newChild(1));
 		}
 		subMonitor.setTaskName(JptJpaCoreMessages.JAVA_METADATA_CONVERSION_COMPLETE);
 	}
@@ -1634,7 +1630,7 @@ public abstract class AbstractPersistenceUnit
 		generator.delete();  // delete any converted generators
 	}
 
-	protected ArrayList<JavaGenerator> getConvertibleJavaGenerators() {
+	protected ArrayList<Generator> getConvertibleJavaGenerators() {
 		return this.extractConvertibleJavaModels(this.getAllJavaGenerators(), this.getMappingFileGenerators());
 	}
 
@@ -1670,8 +1666,8 @@ public abstract class AbstractPersistenceUnit
 		ArrayList<Query> result = ListTools.list(this.getMappingFileQueries());
 
 		HashSet<String> mappingFileQueryNames = this.convertToNames(result);
-		HashMap<String, ArrayList<JavaQuery>> allJavaQueries = this.mapByName(this.getAllJavaQueries());
-		for (Map.Entry<String, ArrayList<JavaQuery>> entry : allJavaQueries.entrySet()) {
+		HashMap<String, ArrayList<Query>> allJavaQueries = this.mapByName(this.getAllJavaQueries());
+		for (Map.Entry<String, ArrayList<Query>> entry : allJavaQueries.entrySet()) {
 			if ( ! mappingFileQueryNames.contains(entry.getKey())) {
 				result.addAll(entry.getValue());
 			}
@@ -1687,12 +1683,10 @@ public abstract class AbstractPersistenceUnit
 	/**
 	 * Include "overridden" Java queries.
 	 */
-	protected Iterable<JavaQuery> getAllJavaQueries() {
-		return IterableTools.children(this.getAllJavaTypeMappingsUnique(), TYPE_MAPPING_JAVA_QUERIES_TRANSFORMER);
+	protected Iterable<Query> getAllJavaQueries() {
+		return IterableTools.children(this.getAllJavaTypeMappingsUnique(), TypeMapping.QUERIES_TRANSFORMER);
 	}
 
-	protected static final Transformer<TypeMapping, Iterable<JavaQuery>> TYPE_MAPPING_JAVA_QUERIES_TRANSFORMER = TransformerTools.cast(TypeMapping.QUERIES_TRANSFORMER);
-
 	protected Iterable<TypeMapping> getAllJavaTypeMappingsUnique() {
 		return IterableTools.transform(this.getAllJavaPersistentTypesUnique(), PersistentType.MAPPING_TRANSFORMER);
 	}
@@ -1704,10 +1698,10 @@ public abstract class AbstractPersistenceUnit
 
 	public void convertJavaQueries(EntityMappings entityMappings, IProgressMonitor monitor) {
 		OrmQueryContainer queryContainer = entityMappings.getQueryContainer();
-		ArrayList<JavaQuery> convertibleJavaQueries = this.getConvertibleJavaQueries();
+		ArrayList<Query> convertibleJavaQueries = this.getConvertibleJavaQueries();
 		SubMonitor subMonitor = SubMonitor.convert(monitor, JptJpaCoreMessages.JAVA_METADATA_CONVERSION_IN_PROGRESS, convertibleJavaQueries.size());
-		for (JavaQuery query : convertibleJavaQueries) {
-			this.convertJavaQuery(queryContainer, query, subMonitor.newChild(1));
+		for (Query query : convertibleJavaQueries) {
+			this.convertJavaQuery(queryContainer, (JavaQuery) query, subMonitor.newChild(1));
 		}
 		subMonitor.setTaskName(JptJpaCoreMessages.JAVA_METADATA_CONVERSION_COMPLETE);
 	}
@@ -1721,7 +1715,7 @@ public abstract class AbstractPersistenceUnit
 		query.delete();  // delete any converted queries
 	}
 
-	protected ArrayList<JavaQuery> getConvertibleJavaQueries() {
+	protected ArrayList<Query> getConvertibleJavaQueries() {
 		return this.extractConvertibleJavaModels(this.getAllJavaQueries(), this.getMappingFileQueries());
 	}
 
@@ -2211,20 +2205,20 @@ public abstract class AbstractPersistenceUnit
 	}
 
 	/**
-	 * Return the Java nodes that are neither overridden nor duplicated
-	 * (by default any Java nodes with the same name are "duplicates").
+	 * Return the Java models that are neither overridden nor duplicated
+	 * (by default any Java models with the same name are "duplicates").
 	 */
-	protected <N extends JpaNamedContextModel> ArrayList<N> extractConvertibleJavaModels(Iterable<N> allJavaModels, Iterable<? extends JpaNamedContextModel> mappingFileModels) {
-		ArrayList<N> convertibleModels = new ArrayList<N>();
+	protected <M extends JpaNamedContextModel> ArrayList<M> extractConvertibleJavaModels(Iterable<M> allJavaModels, Iterable<M> mappingFileModels) {
+		ArrayList<M> convertibleModels = new ArrayList<M>();
 
 		HashSet<String> mappingFileModelNames = this.convertToNames(ListTools.list(mappingFileModels));
-		HashMap<String, ArrayList<N>> allJavaModelsByName = this.mapByName(allJavaModels);
-		for (Map.Entry<String, ArrayList<N>> entry : allJavaModelsByName.entrySet()) {
+		HashMap<String, ArrayList<M>> allJavaModelsByName = this.mapByName(allJavaModels);
+		for (Map.Entry<String, ArrayList<M>> entry : allJavaModelsByName.entrySet()) {
 			String javaModelName = entry.getKey();
 			if (StringTools.isBlank(javaModelName)) {
 				continue;  // ignore any nodes with an empty name(?)
 			}
-			ArrayList<N> javaModelsWithSameName = entry.getValue();
+			ArrayList<M> javaModelsWithSameName = entry.getValue();
 			if ((javaModelsWithSameName.size() == 1) && ! mappingFileModelNames.contains(javaModelName)) {
 				convertibleModels.add(javaModelsWithSameName.get(0));
 			}
@@ -2938,14 +2932,14 @@ public abstract class AbstractPersistenceUnit
 
 
 	// ***** Metamodel source for non-persistent types
-	protected static class NonPersistentMetamodelSourceType
+	public static class NonPersistentMetamodelSourceType
 		implements MetamodelSourceType2_0
 	{
 		protected final String name;
 		protected final JpaProject jpaProject;
 		protected final MetamodelSourceType2_0.Synchronizer metamodelSynchronizer;
 
-		protected NonPersistentMetamodelSourceType(String name, JpaProject jpaProject) {
+		public NonPersistentMetamodelSourceType(String name, JpaProject jpaProject) {
 			super();
 			this.name = name;
 			this.jpaProject = jpaProject;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedNativeQuery.java
index f4bba19d01..0904b4da04 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedNativeQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedNativeQuery.java
@@ -165,12 +165,12 @@ public class GenericJavaNamedNativeQuery
 	}
 
 	@Override
-	protected boolean isEquivalentTo(Query other) {
-		return super.isEquivalentTo(other)
-				&& this.isEquivalentTo((NamedNativeQuery) other);
+	protected boolean isEquivalentTo_(Query other) {
+		return super.isEquivalentTo_(other)
+				&& this.isEquivalentTo_((NamedNativeQuery) other);
 	}
 	
-	protected boolean isEquivalentTo(NamedNativeQuery other) {
+	protected boolean isEquivalentTo_(NamedNativeQuery other) {
 		return 	ObjectTools.equals(this.query, other.getQuery()) &&
 				ObjectTools.equals(this.resultClass, other.getResultClass()) &&
 				ObjectTools.equals(this.resultSetMapping, other.getResultSetMapping());
@@ -178,7 +178,7 @@ public class GenericJavaNamedNativeQuery
 
 	// ********** misc **********
 
-	public Class<NamedNativeQuery> getType() {
+	public Class<NamedNativeQuery> getQueryType() {
 		return NamedNativeQuery.class;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedQuery.java
index 9bbd08178e..62cd784bc7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedQuery.java
@@ -176,26 +176,26 @@ public class GenericJavaNamedQuery
 	}
 
 	@Override
-	protected boolean isEquivalentTo(Query other) {
-		return super.isEquivalentTo(other)
-				&& this.isEquivalentTo((NamedQuery) other);
+	protected boolean isEquivalentTo_(Query other) {
+		return super.isEquivalentTo_(other)
+				&& this.isEquivalentTo_((NamedQuery) other);
 	}
 
-	protected boolean isEquivalentTo(NamedQuery other) {
+	protected boolean isEquivalentTo_(NamedQuery other) {
 		boolean queriesEquivalent = ObjectTools.equals(this.query, other.getQuery());
 		if (this.isJpa2_0Compatible()) {
-			return queriesEquivalent && this.isEquivalentTo((NamedQuery2_0) other); 
+			return queriesEquivalent && this.isEquivalentTo_((NamedQuery2_0) other); 
 		}
 		return queriesEquivalent;
 	}
 
-	protected boolean isEquivalentTo(NamedQuery2_0 other) {
+	protected boolean isEquivalentTo_(NamedQuery2_0 other) {
 		return this.specifiedLockMode == other.getSpecifiedLockMode();
 	}
 
 	// ********** misc **********
 
-	public Class<NamedQuery> getType() {
+	public Class<NamedQuery> getQueryType() {
 		return NamedQuery.class;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSequenceGenerator.java
index d828ccd42a..e6d113c03e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSequenceGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSequenceGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -47,9 +47,9 @@ public class GenericJavaSequenceGenerator
 	// ********** validation **********
 
 	@Override
-	protected boolean isEquivalentTo(SequenceGenerator generator) {
-		return super.isEquivalentTo(generator) &&
-				ObjectTools.equals(this.getDbSchema(), generator.getDbSchema()) &&
-				ObjectTools.equals(this.getDbCatalog(), generator.getDbCatalog());
+	protected boolean isEquivalentTo_(SequenceGenerator other) {
+		return super.isEquivalentTo_(other) &&
+				ObjectTools.equals(this.getDbSchema(), other.getDbSchema()) &&
+				ObjectTools.equals(this.getDbCatalog(), other.getDbCatalog());
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java
index 2100c540c6..feca084f64 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java
@@ -543,29 +543,29 @@ public class GenericJavaTableGenerator
 	
 	// ********** misc **********
 
-	public Class<TableGenerator> getType() {
+	public Class<TableGenerator> getGeneratorType() {
 		return TableGenerator.class;
 	}
 
 	// ********** validation **********
 
 	@Override
-	protected boolean isEquivalentTo(DbGenerator generator) {
-		return super.isEquivalentTo(generator)
-				&& this.isEquivalentTo((TableGenerator) generator);
+	protected boolean isEquivalentTo_(DbGenerator other) {
+		return super.isEquivalentTo_(other)
+				&& this.isEquivalentTo_((TableGenerator) other);
 	}
 
-	protected boolean isEquivalentTo(TableGenerator generator) {
-		return ObjectTools.equals(this.specifiedTableName, generator.getSpecifiedTableName()) &&
-				ObjectTools.equals(this.specifiedSchema, generator.getSpecifiedSchema()) &&
-				ObjectTools.equals(this.specifiedCatalog, generator.getSpecifiedCatalog()) &&
-				ObjectTools.equals(this.specifiedPkColumnName, generator.getSpecifiedPkColumnName()) &&
-				ObjectTools.equals(this.specifiedPkColumnValue, generator.getSpecifiedPkColumnValue()) &&
-				ObjectTools.equals(this.specifiedValueColumnName, generator.getSpecifiedValueColumnName()) &&
-				this.uniqueConstrainsAreEquivalentTo(generator);
+	protected boolean isEquivalentTo_(TableGenerator other) {
+		return ObjectTools.equals(this.specifiedTableName, other.getSpecifiedTableName()) &&
+				ObjectTools.equals(this.specifiedSchema, other.getSpecifiedSchema()) &&
+				ObjectTools.equals(this.specifiedCatalog, other.getSpecifiedCatalog()) &&
+				ObjectTools.equals(this.specifiedPkColumnName, other.getSpecifiedPkColumnName()) &&
+				ObjectTools.equals(this.specifiedPkColumnValue, other.getSpecifiedPkColumnValue()) &&
+				ObjectTools.equals(this.specifiedValueColumnName, other.getSpecifiedValueColumnName()) &&
+				this.uniqueConstraintsAreEquivalentTo(other);
 	}
 
-	protected boolean uniqueConstrainsAreEquivalentTo(TableGenerator generator) {
+	protected boolean uniqueConstraintsAreEquivalentTo(TableGenerator generator) {
 		// get fixed lists of the unique constraints
 		ArrayList<JavaSpecifiedUniqueConstraint> uniqueConstraints1 = ListTools.list(this.getUniqueConstraints());
 		ArrayList<SpecifiedUniqueConstraint> uniqueConstraints2 = ListTools.list(generator.getUniqueConstraints());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedNativeQuery.java
index 63fa956b1c..13d5cd7b7c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedNativeQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedNativeQuery.java
@@ -168,12 +168,12 @@ public class GenericOrmNamedNativeQuery
 	}
 
 	@Override
-	protected boolean isEquivalentTo(Query other) {
-		return super.isEquivalentTo(other)
-				&& this.isEquivalentTo((NamedNativeQuery) other);
+	protected boolean isEquivalentTo_(Query other) {
+		return super.isEquivalentTo_(other)
+				&& this.isEquivalentTo_((NamedNativeQuery) other);
 	}
 	
-	protected boolean isEquivalentTo(NamedNativeQuery other) {
+	protected boolean isEquivalentTo_(NamedNativeQuery other) {
 		return ObjectTools.equals(this.query, other.getQuery()) &&
 				ObjectTools.equals(this.resultClass, other.getResultClass()) &&
 				ObjectTools.equals(this.resultSetMapping, other.getResultSetMapping());
@@ -181,7 +181,7 @@ public class GenericOrmNamedNativeQuery
 
 	// ********** misc **********
 
-	public Class<NamedNativeQuery> getType() {
+	public Class<NamedNativeQuery> getQueryType() {
 		return NamedNativeQuery.class;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedQuery.java
index 9c17b9e966..12ddf4c036 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedQuery.java
@@ -176,27 +176,27 @@ public final class GenericOrmNamedQuery
 	}
 
 	@Override
-	protected boolean isEquivalentTo(Query other) {
-		return super.isEquivalentTo(other)
-				&& this.isEquivalentTo((NamedQuery) other);
+	protected boolean isEquivalentTo_(Query other) {
+		return super.isEquivalentTo_(other)
+				&& this.isEquivalentTo_((NamedQuery) other);
 	}
 
-	protected boolean isEquivalentTo(NamedQuery other) {
+	protected boolean isEquivalentTo_(NamedQuery other) {
 		boolean queriesEquivalent = ObjectTools.equals(this.query, other.getQuery());
 		if (this.isJpa2_0Compatible()) {
-			return queriesEquivalent && this.isEquivalentTo((NamedQuery2_0) other); 
+			return queriesEquivalent && this.isEquivalentTo_((NamedQuery2_0) other); 
 		}
 		return queriesEquivalent;
 	}
 
-	protected boolean isEquivalentTo(NamedQuery2_0 other) {
+	protected boolean isEquivalentTo_(NamedQuery2_0 other) {
 		return this.specifiedLockMode == other.getSpecifiedLockMode();
 	}
 
 
 	// ********** misc **********
 
-	public Class<NamedQuery> getType() {
+	public Class<NamedQuery> getQueryType() {
 		return NamedQuery.class;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSequenceGenerator.java
index 0bdd698a82..dc6dca344a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSequenceGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSequenceGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -46,10 +46,10 @@ public class GenericOrmSequenceGenerator
 	// ********** validation **********
 
 	@Override
-	protected boolean isEquivalentTo(SequenceGenerator generator) {
-		return super.isEquivalentTo(generator) &&
-				ObjectTools.equals(this.getDbSchema(), generator.getDbSchema()) &&
-				ObjectTools.equals(this.getDbCatalog(), generator.getDbCatalog());
+	protected boolean isEquivalentTo_(SequenceGenerator other) {
+		return super.isEquivalentTo_(other) &&
+				ObjectTools.equals(this.getDbSchema(), other.getDbSchema()) &&
+				ObjectTools.equals(this.getDbCatalog(), other.getDbCatalog());
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java
index d15258219f..1faa60d7ca 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java
@@ -417,29 +417,29 @@ public class GenericOrmTableGenerator
 
 	// ********** misc **********
 
-	public Class<TableGenerator> getType() {
+	public Class<TableGenerator> getGeneratorType() {
 		return TableGenerator.class;
 	}
 
 	// ********** validation **********
 
 	@Override
-	protected boolean isEquivalentTo(DbGenerator generator) {
-		return super.isEquivalentTo(generator)
-				&& this.isEquivalentTo((TableGenerator) generator);
+	protected boolean isEquivalentTo_(DbGenerator other) {
+		return super.isEquivalentTo_(other)
+				&& this.isEquivalentTo_((TableGenerator) other);
 	}
 
-	protected boolean isEquivalentTo(TableGenerator generator) {
-		return ObjectTools.equals(this.specifiedTableName, generator.getSpecifiedTableName()) &&
-				ObjectTools.equals(this.specifiedSchema, generator.getSpecifiedSchema()) &&
-				ObjectTools.equals(this.specifiedCatalog, generator.getSpecifiedCatalog()) &&
-				ObjectTools.equals(this.specifiedPkColumnName, generator.getSpecifiedPkColumnName()) &&
-				ObjectTools.equals(this.specifiedValueColumnName, generator.getSpecifiedValueColumnName()) &&
-				ObjectTools.equals(this.specifiedPkColumnValue, generator.getSpecifiedPkColumnValue()) &&
-				this.uniqueConstrainsAreEquivalentTo(generator);
+	protected boolean isEquivalentTo_(TableGenerator other) {
+		return ObjectTools.equals(this.specifiedTableName, other.getSpecifiedTableName()) &&
+				ObjectTools.equals(this.specifiedSchema, other.getSpecifiedSchema()) &&
+				ObjectTools.equals(this.specifiedCatalog, other.getSpecifiedCatalog()) &&
+				ObjectTools.equals(this.specifiedPkColumnName, other.getSpecifiedPkColumnName()) &&
+				ObjectTools.equals(this.specifiedValueColumnName, other.getSpecifiedValueColumnName()) &&
+				ObjectTools.equals(this.specifiedPkColumnValue, other.getSpecifiedPkColumnValue()) &&
+				this.uniqueConstraintsAreEquivalentTo(other);
 	}
 
-	protected boolean uniqueConstrainsAreEquivalentTo(TableGenerator generator) {
+	protected boolean uniqueConstraintsAreEquivalentTo(TableGenerator generator) {
 		// get fixed lists of the unique constraints
 		ArrayList<OrmSpecifiedUniqueConstraint> uniqueConstraints1 = ListTools.list(this.getUniqueConstraints());
 		ArrayList<SpecifiedUniqueConstraint> uniqueConstraints2 = ListTools.list(generator.getUniqueConstraints());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0.java
index e7d24d9b3c..c9a3c9a69a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2009, 2010 Oracle. All rights reserved.
+* Copyright (c) 2009, 2013 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -132,9 +132,9 @@ public class GenericJavaSequenceGenerator2_0
 	// ********** validation **********
 
 	@Override
-	protected boolean isEquivalentTo(SequenceGenerator generator) {
-		return super.isEquivalentTo(generator) &&
-				ObjectTools.equals(this.specifiedSchema, ((SequenceGenerator2_0) generator).getSpecifiedSchema()) &&
-				ObjectTools.equals(this.specifiedCatalog, ((SequenceGenerator2_0) generator).getSpecifiedCatalog());
+	protected boolean isEquivalentTo_(SequenceGenerator other) {
+		return super.isEquivalentTo_(other) &&
+				ObjectTools.equals(this.specifiedSchema, ((SequenceGenerator2_0) other).getSpecifiedSchema()) &&
+				ObjectTools.equals(this.specifiedCatalog, ((SequenceGenerator2_0) other).getSpecifiedCatalog());
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmSequenceGenerator2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmSequenceGenerator2_0.java
index 74b66998c0..d2340502be 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmSequenceGenerator2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmSequenceGenerator2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2009, 2012 Oracle. All rights reserved.
+* Copyright (c) 2009, 2013 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -134,10 +134,10 @@ public class GenericOrmSequenceGenerator2_0
 	// ********** validation **********
 
 	@Override
-	protected boolean isEquivalentTo(SequenceGenerator generator) {
-		return super.isEquivalentTo(generator) &&
-				ObjectTools.equals(this.specifiedSchema, ((SequenceGenerator2_0) generator).getSpecifiedSchema()) &&
-				ObjectTools.equals(this.specifiedCatalog, ((SequenceGenerator2_0) generator).getSpecifiedCatalog());
+	protected boolean isEquivalentTo_(SequenceGenerator other) {
+		return super.isEquivalentTo_(other) &&
+				ObjectTools.equals(this.specifiedSchema, ((SequenceGenerator2_0) other).getSpecifiedSchema()) &&
+				ObjectTools.equals(this.specifiedCatalog, ((SequenceGenerator2_0) other).getSpecifiedCatalog());
 	}
 
 	// ********** metadata conversion **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaNamedStoredProcedureQuery2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaNamedStoredProcedureQuery2_1.java
index dad1b07e1c..09b9bc86e0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaNamedStoredProcedureQuery2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaNamedStoredProcedureQuery2_1.java
@@ -282,12 +282,12 @@ public class GenericJavaNamedStoredProcedureQuery2_1
 	// ********** validation **********
 
 	@Override
-	protected boolean isEquivalentTo(Query other) {
-		return super.isEquivalentTo(other)
-				&& this.isEquivalentTo((NamedStoredProcedureQuery2_1) other);
+	protected boolean isEquivalentTo_(Query other) {
+		return super.isEquivalentTo_(other)
+				&& this.isEquivalentTo_((NamedStoredProcedureQuery2_1) other);
 	}
 
-	protected boolean isEquivalentTo(NamedStoredProcedureQuery2_1 other) {
+	protected boolean isEquivalentTo_(NamedStoredProcedureQuery2_1 other) {
 		return ObjectTools.equals(this.procedureName, other.getProcedureName()) &&
 				this.parametersAreEquivalentTo(other) &&
 				IterableTools.elementsAreEqual(this.getResultClasses(), other.getResultClasses()) &&
@@ -311,7 +311,7 @@ public class GenericJavaNamedStoredProcedureQuery2_1
 
 	// ********** misc **********
 
-	public Class<NamedStoredProcedureQuery2_1> getType() {
+	public Class<NamedStoredProcedureQuery2_1> getQueryType() {
 		return NamedStoredProcedureQuery2_1.class;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmNamedStoredProcedureQuery2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmNamedStoredProcedureQuery2_1.java
index 92aad5c0c9..69866642c8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmNamedStoredProcedureQuery2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmNamedStoredProcedureQuery2_1.java
@@ -295,12 +295,12 @@ public class GenericOrmNamedStoredProcedureQuery2_1
 	// ********** validation **********
 
 	@Override
-	protected boolean isEquivalentTo(Query other) {
-		return super.isEquivalentTo(other)
-				&& this.isEquivalentTo((NamedStoredProcedureQuery2_1) other);
+	protected boolean isEquivalentTo_(Query other) {
+		return super.isEquivalentTo_(other)
+				&& this.isEquivalentTo_((NamedStoredProcedureQuery2_1) other);
 	}
 
-	protected boolean isEquivalentTo(NamedStoredProcedureQuery2_1 other) {
+	protected boolean isEquivalentTo_(NamedStoredProcedureQuery2_1 other) {
 		return ObjectTools.equals(this.procedureName, other.getProcedureName()) &&
 				this.parametersAreEquivalentTo(other) &&
 				IterableTools.elementsAreEqual(this.getResultClasses(), other.getResultClasses()) &&
@@ -324,7 +324,7 @@ public class GenericOrmNamedStoredProcedureQuery2_1
 
 	// ********** misc **********
 
-	public Class<NamedStoredProcedureQuery2_1> getType() {
+	public Class<NamedStoredProcedureQuery2_1> getQueryType() {
 		return NamedStoredProcedureQuery2_1.class;
 	}