changed getAnnotatedJavaSourceClassNames() to getAnnotatedJavaSourceTypes(), first for performance since it leads to less follow-up lookups of JavaResoursAbstractType by name and second to match the change to getMappedJavaSourceTypes().

3 files changed, 19 insertions, 29 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java
index af56e527d4..de869a3908 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java
@@ -223,10 +223,10 @@ public interface JpaProject
 	// ********** Java resources **********
 
 	/**
-	 * Return the names of the JPA project's annotated Java classes
+	 * Return the resource types of the JPA project's annotated Java classes
 	 * (ignoring classes in JARs referenced in the <code>persistence.xml</code>).
 	 */
-	Iterable<String> getAnnotatedJavaSourceClassNames();
+	Iterable<JavaResourceAbstractType> getAnnotatedJavaSourceTypes();
 	
 	/**
 	 * Return only the types of those valid <em>mapped</em> (i.e. annotated with
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
index ab44b0e71a..51d770fe17 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
@@ -818,22 +818,13 @@ public abstract class AbstractJpaProject
 
 	// ********** annotated Java source classes **********
 
-	public Iterable<String> getAnnotatedJavaSourceClassNames() {
-		return new TransformationIterable<JavaResourceAbstractType, String>(this.getInternalAnnotatedSourceJavaResourceTypes()) {
-			@Override
-			protected String transform(JavaResourceAbstractType jraType) {
-				return jraType.getTypeBinding().getQualifiedName();
-			}
-		};
-	}
-
 	/**
 	 * Return only those valid annotated Java resource types that are
 	 * directly part of the JPA project, ignoring those in JARs referenced in
 	 * <code>persistence.xml</code>.
 	 * @see JavaResourceAbstractType#isAnnotated()
 	 */
-	protected Iterable<JavaResourceAbstractType> getInternalAnnotatedSourceJavaResourceTypes() {
+	public Iterable<JavaResourceAbstractType> getAnnotatedJavaSourceTypes() {
 		return new FilteringIterable<JavaResourceAbstractType>(this.getInternalSourceJavaResourceTypes()) {
 			@Override
 			protected boolean accept(JavaResourceAbstractType jraType) {
@@ -860,7 +851,7 @@ public abstract class AbstractJpaProject
 	 */
 	protected Iterable<JavaResourceAbstractType> getInternalMappedSourceJavaResourceTypes() {
 		final Iterable<String> typeMappingAnnotationNames = this.getTypeMappingAnnotationNames();
-		return new FilteringIterable<JavaResourceAbstractType>(this.getInternalAnnotatedSourceJavaResourceTypes()) {
+		return new FilteringIterable<JavaResourceAbstractType>(this.getAnnotatedJavaSourceTypes()) {
 			@Override
 			protected boolean accept(JavaResourceAbstractType jraType) {
 				return jraType.isAnnotatedWithAnyOf(typeMappingAnnotationNames);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java
index 4d8be66e97..60f8ca6762 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java
@@ -283,28 +283,27 @@ public class GenericRootContextNode
 		}
 
 		PersistenceUnit persistenceUnit = persistence.getPersistenceUnits().iterator().next();
-		HashBag<String> annotatedClassNames = CollectionTools.bag(this.jpaProject.getAnnotatedJavaSourceClassNames());
-		HashBag<String> orphans = annotatedClassNames.clone();
-		for (String annotatedClassName : annotatedClassNames) {
-			if (persistenceUnit.specifiesPersistentType(annotatedClassName)) {
-				orphans.remove(annotatedClassName);
+		HashBag<JavaResourceAbstractType> annotatedTypes = CollectionTools.bag(this.jpaProject.getAnnotatedJavaSourceTypes());
+		HashBag<JavaResourceAbstractType> orphans = annotatedTypes.clone();
+		for (JavaResourceAbstractType jrat : annotatedTypes) {
+			if (persistenceUnit.specifiesPersistentType(jrat.getTypeBinding().getQualifiedName())) {
+				orphans.remove(jrat);
 			}
-			else if (MetamodelSynchronizer.MetamodelTools.isMetamodel(getJpaProject().getJavaResourceType(annotatedClassName))) {
-				orphans.remove(annotatedClassName);
+			else if (MetamodelSynchronizer.MetamodelTools.isMetamodel(jrat)) {
+				orphans.remove(jrat);
 			}
 		}
 
 		Iterable<String> typeMappingAnnotationNames = this.jpaProject.getTypeMappingAnnotationNames();
-		for (String orphan : orphans) {
-			JavaResourceAbstractType jrt = this.jpaProject.getJavaResourceType(orphan);
-			if (jrt.isAnnotatedWithAnyOf(typeMappingAnnotationNames)) {
+		for (JavaResourceAbstractType jrat : annotatedTypes) {
+			if (jrat.isAnnotatedWithAnyOf(typeMappingAnnotationNames)) {
 				messages.add(
 					DefaultJpaValidationMessages.buildMessage(
 						IMessage.HIGH_SEVERITY,
 						JpaValidationMessages.PERSISTENT_TYPE_MAPPED_BUT_NOT_INCLUDED_IN_PERSISTENCE_UNIT,
-						new String[] {jrt.getTypeBinding().getQualifiedName()},
-						jrt.getFile(),
-						jrt.getNameTextRange()
+						new String[] {jrat.getTypeBinding().getQualifiedName()},
+						jrat.getFile(),
+						jrat.getNameTextRange()
 					)
 				);
 			}
@@ -313,9 +312,9 @@ public class GenericRootContextNode
 					DefaultJpaValidationMessages.buildMessage(
 						IMessage.NORMAL_SEVERITY,
 						JpaValidationMessages.PERSISTENT_TYPE_ANNOTATED_BUT_NOT_INCLUDED_IN_PERSISTENCE_UNIT,
-						new String[] {jrt.getName()},
-						jrt.getFile(),
-						jrt.getNameTextRange()
+						new String[] {jrat.getName()},
+						jrat.getFile(),
+						jrat.getNameTextRange()
 					)
 				);
 			}