[hibernate-commits] Hibernate SVN: r17042 - jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2009-07-08 07:41:26 -0400 (Wed, 08 Jul 2009)
New Revision: 17042

Modified:
   jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java
Log:
clearer name

Modified: jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java
===================================================================
--- jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java	2009-07-08 11:12:57 UTC (rev 17041)
+++ jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java	2009-07-08 11:41:26 UTC (rev 17042)
@@ -32,6 +32,8 @@
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Embeddable;
 
 import org.hibernate.jpa.metamodel.ap.annotation.MetaEntity;
 import org.hibernate.jpa.metamodel.ap.xml.XmlMetaEntity;
@@ -56,7 +58,11 @@
 
 	private final Map<String, IMetaEntity> metaEntities = new HashMap<String, IMetaEntity>();
 	private boolean xmlProcessed = false;
+	private static final String ENTITY_ANN = javax.persistence.Entity.class.getName();
+	private static final String MAPPED_SUPERCLASS_ANN = MappedSuperclass.class.getName();
+	private static final String EMBEDDABLE_ANN = Embeddable.class.getName();
 
+
 	public void init(ProcessingEnvironment env) {
 		super.init( env );
 		processingEnv.getMessager().printMessage( Diagnostic.Kind.NOTE, "Init Processor " + this );
@@ -72,7 +78,7 @@
 			return false;
 		}
 
-		if ( !processingRoundConstainsEntities( annotations ) ) {
+		if ( !hostJPAAnnotations( annotations ) ) {
 			processingEnv.getMessager()
 					.printMessage( Diagnostic.Kind.NOTE, "Current processing round does not contain entities" );
 			return true;
@@ -91,11 +97,18 @@
 		return true;
 	}
 
-	private boolean processingRoundConstainsEntities(Set<? extends TypeElement> annotations) {
+	private boolean hostJPAAnnotations(Set<? extends TypeElement> annotations) {
 		for ( TypeElement type : annotations ) {
-			if ( type.getQualifiedName().toString().equals( javax.persistence.Entity.class.getName() ) ) {
+			final String typeName = type.getQualifiedName().toString();
+			if ( typeName.equals( ENTITY_ANN ) ) {
 				return true;
 			}
+			else if ( typeName.equals( EMBEDDABLE_ANN ) ) {
+				return true;
+			}
+			else if ( typeName.equals( MAPPED_SUPERCLASS_ANN ) ) {
+				return true;
+			}
 		}
 		return false;
 	}
@@ -169,7 +182,7 @@
 			final String annotationType = mirror.getAnnotationType().toString();
 
 			if ( element.getKind() == ElementKind.CLASS &&
-					annotationType.equals( javax.persistence.Entity.class.getName() ) ) {
+					annotationType.equals( ENTITY_ANN ) ) {
 				MetaEntity metaEntity = new MetaEntity( processingEnv, ( TypeElement ) element );
 				writeFile( metaEntity );
 			}