From e739e472198f76ae4c931ab73138f322b5ba8be2 Mon Sep 17 00:00:00 2001 From: "David M. Carr" Date: Wed, 15 Dec 2010 12:45:58 -0500 Subject: [PATCH] HHH-5794 More changeset cleanup. --- .../reflection/JPAOverridenAnnotationReader.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java b/core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java index 53c8805d2f..9d7cb4f4c8 100644 --- a/core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java +++ b/core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java @@ -760,6 +760,12 @@ public class JPAOverridenAnnotationReader implements AnnotationReader { addIfNotNull( annotationList, annotation ); annotation = getJavaAnnotation( Lob.class ); addIfNotNull( annotationList, annotation ); + annotation = getJavaAnnotation( Enumerated.class ); + addIfNotNull( annotationList, annotation ); + annotation = getJavaAnnotation( Temporal.class ); + addIfNotNull( annotationList, annotation ); + annotation = getJavaAnnotation( Column.class ); + addIfNotNull( annotationList, annotation ); annotation = getJavaAnnotation( OrderColumn.class ); addIfNotNull( annotationList, annotation ); annotation = getJavaAnnotation( MapKeyClass.class ); @@ -774,12 +780,6 @@ public class JPAOverridenAnnotationReader implements AnnotationReader { addIfNotNull( annotationList, annotation ); annotation = getJavaAnnotation( MapKeyJoinColumns.class ); addIfNotNull( annotationList, annotation ); - annotation = getJavaAnnotation( Column.class ); - addIfNotNull( annotationList, annotation ); - annotation = getJavaAnnotation( Temporal.class ); - addIfNotNull( annotationList, annotation ); - annotation = getJavaAnnotation( Enumerated.class ); - addIfNotNull( annotationList, annotation ); annotation = getJavaAnnotation( CollectionTable.class ); addIfNotNull( annotationList, annotation ); } @@ -839,6 +839,7 @@ public class JPAOverridenAnnotationReader implements AnnotationReader { } } + // TODO: Complete parsing of all element-collection related xml private void getElementCollection(List annotationList, XMLContext.Default defaults) { for ( Element element : elementsForProperty ) { if ( "element-collection".equals( element.getName() ) ) {