[hibernate-commits] Hibernate SVN: r17043 - in jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap: annotation and 1 other directories.

Author: hardy.ferentschik Date: 2009-07-08 08:12:22 -0400 (Wed, 08 Jul 2009) New Revision: 17043 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/annotation/MetaEntity.java jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/xml/XmlMetaEntity.java Log: Changed processing order and made sure that model classes gets written out at end of processing 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:41:26 UTC (rev 17042) +++ jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java 2009-07-08 12:12:22 UTC (rev 17043) @@ -1,346 +1,341 @@ -// $Id:$ -package org.hibernate.jpa.metamodel.ap; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.text.SimpleDateFormat; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import javax.annotation.Generated; -import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.FilerException; -import javax.annotation.processing.ProcessingEnvironment; -import javax.annotation.processing.RoundEnvironment; -import javax.annotation.processing.SupportedAnnotationTypes; -import javax.annotation.processing.SupportedSourceVersion; -import static javax.lang.model.SourceVersion.RELEASE_6; -import javax.lang.model.element.AnnotationMirror; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.TypeElement; -import javax.lang.model.util.Elements; -import javax.tools.Diagnostic; -import javax.tools.FileObject; -import javax.tools.StandardLocation; -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; -import org.hibernate.jpa.metamodel.xml.jaxb.Entity; -import org.hibernate.jpa.metamodel.xml.jaxb.EntityMappings; -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 - */ -//(a)SupportedAnnotationTypes(&quot;javax.persistence.Entity&quot;) -@SupportedAnnotationTypes("*") -@SupportedSourceVersion(RELEASE_6) -public class JPAMetaModelEntityProcessor extends AbstractProcessor { - - private static final String PATH_SEPARATOR = "/"; - private static final String PERSISTENCE_XML = "/META-INF/persistence.xml"; - - 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 ); - } - - @Override - public boolean process(final Set<? extends TypeElement> annotations, - final RoundEnvironment roundEnvironment) { - - if ( roundEnvironment.processingOver() ) { - processingEnv.getMessager() - .printMessage( Diagnostic.Kind.NOTE, "Finished processing" ); - return false; - } - - if ( !hostJPAAnnotations( annotations ) ) { - processingEnv.getMessager() - .printMessage( Diagnostic.Kind.NOTE, "Current processing round does not contain entities" ); - return true; - } - - if ( !xmlProcessed ) { - parsePersistenceXml(); - } - - Set<? extends Element> elements = roundEnvironment.getRootElements(); - for ( Element element : elements ) { - processingEnv.getMessager().printMessage( Diagnostic.Kind.NOTE, "Processing " + element.toString() ); - handleRootElementAnnotationMirrors( element ); - } - - return true; - } - - private boolean hostJPAAnnotations(Set<? extends TypeElement> annotations) { - for ( TypeElement type : annotations ) { - 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; - } - - private void parsePersistenceXml() { - Persistence persistence = parseXml( PERSISTENCE_XML, Persistence.class ); - if ( persistence != null ) - - { - List<Persistence.PersistenceUnit> persistenceUnits = persistence.getPersistenceUnit(); - for ( Persistence.PersistenceUnit unit : persistenceUnits ) { - List<String> mappingFiles = unit.getMappingFile(); - for ( String mappingFile : mappingFiles ) { - parsingOrmXml( mappingFile ); - } - } - } - xmlProcessed = true; - } - - - private void parsingOrmXml(String resource) { - EntityMappings mappings = parseXml( resource, EntityMappings.class ); - if ( mappings == null ) { - return; - } - Collection<Entity> entities = mappings.getEntity(); - String packageName = mappings.getPackage(); - for ( Entity entity : entities ) { - String fullyQualifiedClassName = packageName + "." + entity.getClazz(); - Elements utils = processingEnv.getElementUtils(); - XmlMetaEntity metaEntity = new XmlMetaEntity( - entity, packageName, utils.getTypeElement( fullyQualifiedClassName ) - ); - - if ( metaEntities.containsKey( fullyQualifiedClassName ) ) { - processingEnv.getMessager().printMessage( - Diagnostic.Kind.WARNING, - fullyQualifiedClassName + " was already processed once. Skipping second occurance." - ); - } - - writeFile( metaEntity ); - metaEntities.put( fullyQualifiedClassName, metaEntity ); - } - } - - private void writeProcessingDiagnostics(Set<? extends TypeElement> annotations, RoundEnvironment roundEnvironment) { - StringBuilder sb = new StringBuilder(); - sb.append( "\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" ); - sb.append( new SimpleDateFormat().format( new Date() ) ); - sb.append( "\n" ); - sb.append( "Processing annotations " ).append( annotations ).append( " on:" ); - - Set<? extends Element> elements = roundEnvironment.getRootElements(); - sb.append( "\n" ); - for ( Element element : elements ) { - sb.append( element.toString() ); - sb.append( "\n" ); - } - sb.append( ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" ); - processingEnv.getMessager().printMessage( Diagnostic.Kind.NOTE, sb.toString() ); - } - - private void handleRootElementAnnotationMirrors(final Element element) { - - List<? extends AnnotationMirror> annotationMirrors = element - .getAnnotationMirrors(); - - for ( AnnotationMirror mirror : annotationMirrors ) { - final String annotationType = mirror.getAnnotationType().toString(); - - if ( element.getKind() == ElementKind.CLASS && - annotationType.equals( ENTITY_ANN ) ) { - MetaEntity metaEntity = new MetaEntity( processingEnv, ( TypeElement ) element ); - writeFile( metaEntity ); - } - } - } - - private void writeFile(IMetaEntity entity) { - - try { - String metaModelPackage = entity.getPackageName(); - - StringBuffer body = generateBody( entity ); - - FileObject fo = processingEnv.getFiler().createSourceFile( - metaModelPackage + "." + entity.getSimpleName() + "_" - ); - OutputStream os = fo.openOutputStream(); - PrintWriter pw = new PrintWriter( os ); - - pw.println( "package " + metaModelPackage + ";" ); - - pw.println(); - - pw.println( entity.generateImports() ); - - pw.println( body ); - - pw.flush(); - pw.close(); - - } - catch ( FilerException filerEx ) { - processingEnv.getMessager().printMessage( - Diagnostic.Kind.ERROR, - "Problem with Processing Environment Filer: " - + filerEx.getMessage() - ); - } - catch ( IOException ioEx ) { - processingEnv.getMessager().printMessage( - Diagnostic.Kind.ERROR, - "Problem opening file to write MetaModel for " + entity.getSimpleName() - + ioEx.getMessage() - ); - } - } - - /** - * Generate everything after import statements. - * - * @param entity The meta entity for which to write the body - * - * @return body content - */ - private StringBuffer generateBody(IMetaEntity entity) { - - StringWriter sw = new StringWriter(); - PrintWriter pw = null; - try { - - pw = new PrintWriter( sw ); - - pw.println( "@" + entity.importType( Generated.class.getName() ) + "(\"JPA MetaModel for " + entity.getQualifiedName() + "\")" ); - - pw.println( "@" + entity.importType( "javax.persistence.metamodel.StaticMetamodel" ) + "(" + entity.getSimpleName() + ".class)" ); - - pw.println( "public abstract class " + entity.getSimpleName() + "_" + " {" ); - - pw.println(); - - List<IMetaAttribute> members = entity.getMembers(); - - for ( IMetaAttribute metaMember : members ) { - pw.println( " " + metaMember.getDeclarationString() ); - } - pw.println(); - pw.println( "}" ); - return sw.getBuffer(); - } - finally { - if ( pw != null ) { - pw.close(); - } - } - } - - private InputStream getInputStreamForResource(String resource) { - String pkg = getPackage( resource ); - String name = getRelativeName( resource ); - processingEnv.getMessager() - .printMessage( Diagnostic.Kind.NOTE, "Checking for " + resource ); - InputStream ormStream; - try { - FileObject fileObject = processingEnv.getFiler().getResource( StandardLocation.CLASS_OUTPUT, pkg, name ); - ormStream = fileObject.openInputStream(); - } - catch ( IOException e1 ) { - processingEnv.getMessager() - .printMessage( - Diagnostic.Kind.WARNING, - "Could not load " + resource + " using Filer.getResource(). Trying classpath..." - ); - ormStream = this.getClass().getResourceAsStream( resource ); - } - return ormStream; - } - - /** - * Tries to open the specified xml file and return an instance of the specified class using JAXB. - * - * @param resource the xml file name - * @param clazz The type of jaxb node to return - * - * @return The top level jaxb instance contained in the xml file or {@code null} in case the file could not be found. - */ - private <T> T parseXml(String resource, Class<T> clazz) { - - InputStream stream = getInputStreamForResource( resource ); - - if ( stream == null ) { - processingEnv.getMessager().printMessage( Diagnostic.Kind.NOTE, resource + " not found." ); - return null; - } - try { - JAXBContext jc = JAXBContext.newInstance( ObjectFactory.class ); - Unmarshaller unmarshaller = jc.createUnmarshaller(); - return clazz.cast( unmarshaller.unmarshal( stream ) ); - } - catch ( JAXBException e ) { - processingEnv.getMessager().printMessage( Diagnostic.Kind.NOTE, "Error unmarshalling " + resource ); - e.printStackTrace(); - return null; - } - catch ( Exception e ) { - processingEnv.getMessager().printMessage( - Diagnostic.Kind.ERROR, - "Problem while reading " + resource + " " + e.getMessage() - ); - e.printStackTrace(); - return null; - } - } - - private String getPackage(String resourceName) { - if ( !resourceName.contains( PATH_SEPARATOR ) ) { - return ""; - } - else { - return resourceName.substring( 0, resourceName.lastIndexOf( PATH_SEPARATOR ) ); - } - } - - private String getRelativeName(String resourceName) { - if ( !resourceName.contains( PATH_SEPARATOR ) ) { - return resourceName; - } - else { - return resourceName.substring( resourceName.lastIndexOf( PATH_SEPARATOR ) + 1 ); - } - } -} +// $Id:$ +package org.hibernate.jpa.metamodel.ap; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.annotation.Generated; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.FilerException; +import javax.annotation.processing.ProcessingEnvironment; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.annotation.processing.SupportedSourceVersion; +import static javax.lang.model.SourceVersion.RELEASE_6; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.TypeElement; +import javax.lang.model.util.Elements; +i! mport javax.tools.Diagnostic; +import javax.tools.FileObject; +import javax.tools.StandardLocation; +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; +import org.hibernate.jpa.metamodel.xml.jaxb.Entity; +import org.hibernate.jpa.metamodel.xml.jaxb.EntityMappings; +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 + */ +//(a)SupportedAnnotationTypes(&quot;javax.persistence.Entity&quot;) +@SupportedAnnotationTypes("*") +@SupportedSourceVersion(RELEASE_6) +public class JPAMetaModelEntityProcessor extends AbstractProcessor { + + private static final String PATH_SEPARAT! OR = "/"; + private static final String PERSISTENCE_XML = "/ME! TA-INF/p ersistence.xml"; + private static final Boolean ALLOW_OTHER_PROCESSORS_TO_CLAIM_ANNOTATIONS = Boolean.FALSE; + + 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 ); + } + + @Override + public boolean process(final Set<? extends TypeElement> annotations, + final RoundEnvironment roundEnvironment) { + + if ( roundEnvironment.processingOver() ) { + processingEnv.getMessager() + .printMessage( Diagnostic.Kind.NOTE, "Last processing round." ); + + createMetaModelClasses(); + + ! processingEnv.getMessager() + .printMessage( Diagnostic.Kind.NOTE, "Finished processing" ); + return ALLOW_OTHER_PROCESSORS_TO_CLAIM_ANNOTATIONS; + } + + if ( !xmlProcessed ) { + parsePersistenceXml(); + } + + if ( !hostJPAAnnotations( annotations ) ) { + processingEnv.getMessager() + .printMessage( Diagnostic.Kind.NOTE, "Current processing round does not contain entities" ); + return ALLOW_OTHER_PROCESSORS_TO_CLAIM_ANNOTATIONS; + } + + Set<? extends Element> elements = roundEnvironment.getRootElements(); + for ( Element element : elements ) { + processingEnv.getMessager().printMessage( Diagnostic.Kind.NOTE, "Processing " + element.toString() ); + handleRootElementAnnotationMirrors( element ); + } + + return ALLOW_OTHER_PROCESSORS_TO_CLAIM_ANNOTATIONS; + } + + private void createMetaModelClasses() { + for ( IMetaEntity entity : metaEntities.values() ) { + processingEnv.getMessager() + .printMessage( Diagnostic.Kind.NOTE, "Writing meta m! odel for " + entity ); + writeFile( entity ); + } + } + + p! rivate b oolean hostJPAAnnotations(Set<? extends TypeElement> annotations) { + for ( TypeElement type : annotations ) { + 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; + } + + private void parsePersistenceXml() { + Persistence persistence = parseXml( PERSISTENCE_XML, Persistence.class ); + if ( persistence != null ) + + { + List<Persistence.PersistenceUnit> persistenceUnits = persistence.getPersistenceUnit(); + for ( Persistence.PersistenceUnit unit : persistenceUnits ) { + List<String> mappingFiles = unit.getMappingFile(); + for ( String mappingFile : mappingFiles ) { + parsingOrmXml( mappingFile ); + } + } + } + xmlProcessed = true; + } + + + private void parsingOrmXml(String resource) { + EntityM! appings mappings = parseXml( resource, EntityMappings.class ); + if ( mappings == null ) { + return; + } + Collection<Entity> entities = mappings.getEntity(); + String packageName = mappings.getPackage(); + for ( Entity entity : entities ) { + String fullyQualifiedClassName = packageName + "." + entity.getClazz(); + Elements utils = processingEnv.getElementUtils(); + XmlMetaEntity metaEntity = new XmlMetaEntity( + entity, packageName, utils.getTypeElement( fullyQualifiedClassName ) + ); + + if ( metaEntities.containsKey( fullyQualifiedClassName ) ) { + processingEnv.getMessager().printMessage( + Diagnostic.Kind.WARNING, + fullyQualifiedClassName + " was already processed once. Skipping second occurance." + ); + } + metaEntities.put( fullyQualifiedClassName, metaEntity ); + } + } + + private void handleRootElementAnnotationMirrors(final Element element) { + + List<? extends AnnotationMirror> annotationMirrors = element + .getAnno! tationMirrors(); + + for ( AnnotationMirror mirror : annotati! onMirror s ) { + final String annotationType = mirror.getAnnotationType().toString(); + + if ( element.getKind() == ElementKind.CLASS && + annotationType.equals( ENTITY_ANN ) ) { + MetaEntity metaEntity = new MetaEntity( processingEnv, ( TypeElement ) element ); + + // TODO instead of just adding the entity we have to do some merging. + metaEntities.put( metaEntity.getQualifiedName(), metaEntity ); + } + } + } + + private void writeFile(IMetaEntity entity) { + + try { + String metaModelPackage = entity.getPackageName(); + + StringBuffer body = generateBody( entity ); + + FileObject fo = processingEnv.getFiler().createSourceFile( + metaModelPackage + "." + entity.getSimpleName() + "_" + ); + OutputStream os = fo.openOutputStream(); + PrintWriter pw = new PrintWriter( os ); + + pw.println( "package " + metaModelPackage + ";" ); + + pw.println(); + + pw.println( entity.generateImports() ); + + pw.println( body ); + + pw.flush(); + pw.clos! e(); + + } + catch ( FilerException filerEx ) { + processingEnv.getMessager().printMessage( + Diagnostic.Kind.ERROR, + "Problem with Processing Environment Filer: " + + filerEx.getMessage() + ); + } + catch ( IOException ioEx ) { + processingEnv.getMessager().printMessage( + Diagnostic.Kind.ERROR, + "Problem opening file to write MetaModel for " + entity.getSimpleName() + + ioEx.getMessage() + ); + } + } + + /** + * Generate everything after import statements. + * + * @param entity The meta entity for which to write the body + * + * @return body content + */ + private StringBuffer generateBody(IMetaEntity entity) { + + StringWriter sw = new StringWriter(); + PrintWriter pw = null; + try { + + pw = new PrintWriter( sw ); + + pw.println( "@" + entity.importType( Generated.class.getName() ) + "(\"JPA MetaModel for " + entity.getQualifiedName() + "\")" ); + + pw.println( "@" + entity.importType( "javax.persistence.metamode! l.StaticMetamodel" ) + "(" + entity.getSimpleName() + ".class)! " ); + + pw.println( "public abstract class " + entity.getSimpleName() + "_" + " {" ); + + pw.println(); + + List<IMetaAttribute> members = entity.getMembers(); + + for ( IMetaAttribute metaMember : members ) { + pw.println( " " + metaMember.getDeclarationString() ); + } + pw.println(); + pw.println( "}" ); + return sw.getBuffer(); + } + finally { + if ( pw != null ) { + pw.close(); + } + } + } + + private InputStream getInputStreamForResource(String resource) { + String pkg = getPackage( resource ); + String name = getRelativeName( resource ); + processingEnv.getMessager() + .printMessage( Diagnostic.Kind.NOTE, "Checking for " + resource ); + InputStream ormStream; + try { + FileObject fileObject = processingEnv.getFiler().getResource( StandardLocation.CLASS_OUTPUT, pkg, name ); + ormStream = fileObject.openInputStream(); + } + catch ( IOException e1 ) { + processingEnv.getMessager() + .printMessage( + Diagnostic.Kind.WARNING, ! + "Could not load " + resource + " using Filer.getResource(). Trying classpath..." + ); + ormStream = this.getClass().getResourceAsStream( resource ); + } + return ormStream; + } + + /** + * Tries to open the specified xml file and return an instance of the specified class using JAXB. + * + * @param resource the xml file name + * @param clazz The type of jaxb node to return + * + * @return The top level jaxb instance contained in the xml file or {@code null} in case the file could not be found. + */ + private <T> T parseXml(String resource, Class<T> clazz) { + + InputStream stream = getInputStreamForResource( resource ); + + if ( stream == null ) { + processingEnv.getMessager().printMessage( Diagnostic.Kind.NOTE, resource + " not found." ); + return null; + } + try { + JAXBContext jc = JAXBContext.newInstance( ObjectFactory.class ); + Unmarshaller unmarshaller = jc.createUnmarshaller(); + return clazz.cast( unmarshaller.unmarshal( stream )! ); + } + catch ( JAXBException e ) { + processingEnv.getM! essager( ).printMessage( Diagnostic.Kind.NOTE, "Error unmarshalling " + resource ); + e.printStackTrace(); + return null; + } + catch ( Exception e ) { + processingEnv.getMessager().printMessage( + Diagnostic.Kind.ERROR, + "Problem while reading " + resource + " " + e.getMessage() + ); + e.printStackTrace(); + return null; + } + } + + private String getPackage(String resourceName) { + if ( !resourceName.contains( PATH_SEPARATOR ) ) { + return ""; + } + else { + return resourceName.substring( 0, resourceName.lastIndexOf( PATH_SEPARATOR ) ); + } + } + + private String getRelativeName(String resourceName) { + if ( !resourceName.contains( PATH_SEPARATOR ) ) { + return resourceName; + } + else { + return resourceName.substring( resourceName.lastIndexOf( PATH_SEPARATOR ) + 1 ); + } + } +} Property changes on: jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/annotation/MetaEntity.java =================================================================== --- jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/annotation/MetaEntity.java 2009-07-08 11:41:26 UTC (rev 17042) +++ jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/annotation/MetaEntity.java 2009-07-08 12:12:22 UTC (rev 17043) @@ -132,6 +132,14 @@ return false; } + @Override + public String toString() { + final StringBuilder sb = new StringBuilder(); + sb.append( "MetaEntity" ); + sb.append( "{element=" ).append( element ); + sb.append( '}' ); + return sb.toString(); + } static Map<String, String> COLLECTIONS = new HashMap<String, String>(); Property changes on: jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/annotation/MetaEntity.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/xml/XmlMetaEntity.java =================================================================== --- jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/xml/XmlMetaEntity.java 2009-07-08 11:41:26 UTC (rev 17042) +++ jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/xml/XmlMetaEntity.java 2009-07-08 12:12:22 UTC (rev 17043) @@ -172,4 +172,13 @@ } return typeName; } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder(); + sb.append( "XmlMetaEntity" ); + sb.append( "{type=" ).append( type ); + sb.append( '}' ); + return sb.toString(); + } } Property changes on: jpamodelgen/trunk/generator/src/main/java/org/hibernate/jpa/metamodel/ap/xml/XmlMetaEntity.java ___________________________________________________________________ Name: svn:keywords + Id