HHH-5794 More changeset cleanup.

hibernate · Dec 16, 2010 · e739e47 · e739e47
1 parent a750936
commit e739e47
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/.../src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java b/.../src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java
@@ -760,6 +760,12 @@ else if ( isJavaAnnotationPresent( ElementCollection.class ) ) { //JPA2
 				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 @@ else if ( isJavaAnnotationPresent( ElementCollection.class ) ) { //JPA2
 				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 @@ private void addTargetClass(Element element, AnnotationDescriptor ad, String nod
 		}
 	}
 
+	// TODO: Complete parsing of all element-collection related xml
 	private void getElementCollection(List<Annotation> annotationList, XMLContext.Default defaults) {
 		for ( Element element : elementsForProperty ) {
 			if ( "element-collection".equals( element.getName() ) ) {