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

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-07-08 06:42:49 -0400 (Wed, 08 Jul 2009)
New Revision: 17037

Modified:
   jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java
Log:
cleanup of processing and log

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 09:09:38 UTC (rev 17036)
+++ jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java	2009-07-08 10:42:49 UTC (rev 17037)
@@ -1,3 +1,4 @@
+// $Id:$
 package org.hibernate.jpa.metamodel.ap;
 
 import java.io.IOException;
@@ -39,6 +40,12 @@
 import org.hibernate.jpa.metamodel.xml.jaxb.ObjectFactory;
 import org.hibernate.jpa.metamodel.xml.jaxb.Persistence;
 
+/**
+ * Main annotation processor.
+ *
+ * @author Max Andersen
+ * @author Hardy Ferentschik
+ */
 //@SupportedAnnotationTypes("javax.persistence.Entity")
 @SupportedAnnotationTypes("*")
 @SupportedSourceVersion(RELEASE_6)
@@ -60,11 +67,8 @@
 						   final RoundEnvironment roundEnvironment) {
 
 		if ( roundEnvironment.processingOver() ) {
-			//assuming that when processing is over, we are done and clear resources like ORM parsing
-			//we could keep some ORM parsing in memory but how to detect that a file has changed / not changed?
-			xmlProcessed = false;
-			metaEntities.clear();
-			processingEnv.getMessager().printMessage( Diagnostic.Kind.NOTE, "Clear ORM processing resources" );
+			processingEnv.getMessager()
+					.printMessage( Diagnostic.Kind.NOTE, "Finished processing" );
 			return false;
 		}
 
@@ -74,12 +78,13 @@
 			return true;
 		}
 
-		writeProcessingDiagnostics( annotations, roundEnvironment );
+		if ( !xmlProcessed ) {
+			parsePersistenceXml();
+		}
 
-		parsePersistenceXml();
-
 		Set<? extends Element> elements = roundEnvironment.getRootElements();
 		for ( Element element : elements ) {
+			processingEnv.getMessager().printMessage( Diagnostic.Kind.NOTE, "Processing " + element.toString() );
 			handleRootElementAnnotationMirrors( element );
 		}
 
@@ -96,13 +101,10 @@
 	}
 
 	private void parsePersistenceXml() {
-		if ( xmlProcessed ) {
-			return;
-		}
-
 		Persistence persistence = parseXml( PERSISTENCE_XML, Persistence.class );
+		if ( persistence != null )
 
-		if ( persistence != null ) {
+		{
 			List<Persistence.PersistenceUnit> persistenceUnits = persistence.getPersistenceUnit();
 			for ( Persistence.PersistenceUnit unit : persistenceUnits ) {
 				List<String> mappingFiles = unit.getMappingFile();
@@ -116,7 +118,6 @@
 
 
 	private void parsingOrmXml(String resource) {
-
 		EntityMappings mappings = parseXml( resource, EntityMappings.class );
 		if ( mappings == null ) {
 			return;