[hibernate-commits] Hibernate SVN: r17873 - in core/trunk: core/src/main/java/org/hibernate/cfg and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2009-10-28 20:36:07 -0400 (Wed, 28 Oct 2009)
New Revision: 17873

Modified:
   core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java
   core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java
   core/trunk/core/src/main/java/org/hibernate/cfg/Mappings.java
   core/trunk/core/src/main/java/org/hibernate/mapping/MappedSuperclass.java
Log:
HHH-4533 move metamodel storage to Hibernate Core

Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
--- core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java	2009-10-29 00:13:24 UTC (rev 17872)
+++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java	2009-10-29 00:36:07 UTC (rev 17873)
@@ -986,6 +986,7 @@
 			mappedSuperclass = mappings.getMappedSuperclass( type );
 			if (mappedSuperclass == null) {
 				mappedSuperclass = new org.hibernate.mapping.MappedSuperclass(parentSuperclass, superEntity );
+				mappedSuperclass.setMappedClass( type );
 				mappings.addMappedSuperclass( type, mappedSuperclass );
 			}
 		}

Modified: core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java	2009-10-29 00:13:24 UTC (rev 17872)
+++ core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java	2009-10-29 00:36:07 UTC (rev 17873)
@@ -296,6 +296,16 @@
 	}
 
 	/**
+	 * Iterate the mapped superclasses mappings
+	 * EXPERIMENTAL Consider this API as PRIVATE
+	 *
+	 * @return Iterator<MappedSuperclass> over the MappedSuperclass mapping currently contained in the configuration.
+	 */
+	public Iterator getMappedSuperclassMappings() {
+		return mappedSuperclasses.values().iterator();
+	}
+
+	/**
 	 * Get the mapping for a particular entity
 	 *
 	 * @param entityName An entity name.
@@ -2761,9 +2771,5 @@
 		public MappedSuperclass getMappedSuperclass(Class type) {
 			return (MappedSuperclass) mappedSuperclasses.get( type );
 		}
-
-		public Iterator iterateMappedSuperclasses() {
-			return mappedSuperclasses.values().iterator();
-		}
 	}
 }

Modified: core/trunk/core/src/main/java/org/hibernate/cfg/Mappings.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/cfg/Mappings.java	2009-10-29 00:13:24 UTC (rev 17872)
+++ core/trunk/core/src/main/java/org/hibernate/cfg/Mappings.java	2009-10-29 00:36:07 UTC (rev 17873)
@@ -543,12 +543,4 @@
 	 * @return the MappedSuperclass
 	 */
 	org.hibernate.mapping.MappedSuperclass getMappedSuperclass(Class type);
-
-	/**
-	 * Iterator over the MappedSuperclass mappings
-	 * Use an iterator as a symetry to the other methods on Mappings
-	 * 
-	 * @return mappedSuperclasses
-	 */
-	public Iterator iterateMappedSuperclasses();
 }
\ No newline at end of file

Modified: core/trunk/core/src/main/java/org/hibernate/mapping/MappedSuperclass.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/mapping/MappedSuperclass.java	2009-10-29 00:13:24 UTC (rev 17872)
+++ core/trunk/core/src/main/java/org/hibernate/mapping/MappedSuperclass.java	2009-10-29 00:36:07 UTC (rev 17873)
@@ -20,6 +20,7 @@
 	private final MappedSuperclass superMappedSuperclass;
 	private final PersistentClass superPersistentClass;
 	private final List properties;
+	private Class mappedClass;
 
 	public MappedSuperclass(MappedSuperclass superMappedSuperclass, PersistentClass superPersistentClass) {
 		this.superMappedSuperclass = superMappedSuperclass;
@@ -64,4 +65,12 @@
 		}
 		properties.add(p);
 	}
+
+	public Class getMappedClass() {
+		return mappedClass;
+	}
+
+	public void setMappedClass(Class mappedClass) {
+		this.mappedClass = mappedClass;
+	}
 }