[Hibernate-commits] Hibernate Code SVN: r9604 - in trunk/HibernateExt/metadata/src/java/org/hibernate/cfg: . annotations

[<hib...@li...>]

Author: epbernard
Date: 2006-03-11 15:27:05 -0500 (Sat, 11 Mar 2006)
New Revision: 9604

Modified:
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java
Log:
ANN-282

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java	2006-03-11 19:13:47 UTC (rev 9603)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java	2006-03-11 20:27:05 UTC (rev 9604)
@@ -604,7 +604,7 @@
 					propertyAccessor, entityBinder,
 					null,
 					true,
-					mappings
+					false, mappings
 			);
 			inferredData = new PropertyPreloadedData(
 					propertyAccessor, "_identifierMapper", compositeClass
@@ -615,8 +615,8 @@
 					propertyAnnotated,
 					propertyAccessor, false,
 					entityBinder,
-					true,
-					mappings, true
+					true, true,
+					mappings
 			);
 			persistentClass.setIdentifierMapper( mapper );
 			Property property = new Property();
@@ -716,7 +716,7 @@
 			}
 		}
 		Boolean isPropertyAnnotated = isExplicitPropertyAnnotated == null ?
-				isPropertyAnnotated = Boolean.TRUE :  //default to property and fallback if needed
+				Boolean.TRUE :  //default to property and fallback if needed
 				isExplicitPropertyAnnotated;
 		String accessType = explicitAccessType != null ? explicitAccessType : "property";
 
@@ -1064,7 +1064,7 @@
 					propertyAccessor, entityBinder,
 					typeAnn,
 					false,
-					mappings
+					isIdentifierMapper, mappings
 			);
 			if ( log.isDebugEnabled() ) {
 				log.debug(
@@ -1407,8 +1407,9 @@
 			ExtendedMappings mappings, boolean isComponentEmbedded
 	) {
 		Component comp = fillComponent(
-				propertyHolder, inferredData, propertyAnnotated, propertyAccessor, true, entityBinder, isIdentifierMapper,
-				mappings, isComponentEmbedded
+				propertyHolder, inferredData, propertyAnnotated, propertyAccessor, true, entityBinder,
+				isComponentEmbedded, isIdentifierMapper,
+				mappings
 		);
 
 		PropertyBinder binder = new PropertyBinder();
@@ -1423,8 +1424,7 @@
 			PropertyHolder propertyHolder, PropertyData inferredData,
 			boolean propertyAnnotated, String propertyAccessor, boolean isNullable,
 			EntityBinder entityBinder,
-			boolean isIdentifierMapper, ExtendedMappings mappings,
-			boolean isComponentEmbedded
+			boolean isComponentEmbedded, boolean isIdentifierMapper, ExtendedMappings mappings
 	) {
 		Component comp = new Component( propertyHolder.getPersistentClass() );
 		comp.setEmbedded( isComponentEmbedded );
@@ -1480,7 +1480,7 @@
 			boolean isComposite,
 			boolean isPropertyAnnotated,
 			String propertyAccessor, EntityBinder entityBinder, Type typeAnn, boolean isEmbedded,
-			ExtendedMappings mappings
+			boolean isIdentifierMapper, ExtendedMappings mappings
 	) {
 		/*
 		 * Fill simple value and property since and Id is a property
@@ -1497,8 +1497,8 @@
 		SimpleValue id;
 		if ( isComposite ) {
 			id = fillComponent(
-					propertyHolder, inferredData, isPropertyAnnotated, propertyAccessor, false, entityBinder, false, mappings,
-					false
+					propertyHolder, inferredData, isPropertyAnnotated, propertyAccessor,
+					false, entityBinder, isEmbedded, isIdentifierMapper, mappings
 			);
 			( (Component) id ).setKey( true );
 			if ( ! id.getColumnIterator().hasNext() ) {

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java	2006-03-11 19:13:47 UTC (rev 9603)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java	2006-03-11 20:27:05 UTC (rev 9604)
@@ -833,8 +833,8 @@
 				//TODO be smart with isNullable
 				Component component = AnnotationBinder.fillComponent(
 						holder, inferredData, isPropertyAnnotated, isPropertyAnnotated ? "property" : "field", true,
-						entityBinder, false,
-						mappings, false
+						entityBinder, false, false,
+						mappings
 				);
 				collValue.setElement( component );
 			}