[Hibernate-commits] Hibernate3/src/org/hibernate/tuple IdentifierProperty.java,1.3,1.4 PropertyFactory.java,1.9,1.10

[<epb...@us...>]

Update of /cvsroot/hibernate/Hibernate3/src/org/hibernate/tuple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4307/src/org/hibernate/tuple

Modified Files:
	IdentifierProperty.java PropertyFactory.java 
Log Message:
HHH-1489

Index: IdentifierProperty.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/tuple/IdentifierProperty.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- IdentifierProperty.java	5 Jun 2005 04:31:34 -0000	1.3
+++ IdentifierProperty.java	15 Feb 2006 22:28:15 -0000	1.4
@@ -19,6 +19,7 @@
 	private IdentifierValue unsavedValue;
 	private IdentifierGenerator identifierGenerator;
 	private boolean identifierAssignedByInsert;
+	private boolean hasIdentifierMapper;
 
 	/**
 	 * Construct a non-virtual identifier property.
@@ -34,15 +35,16 @@
 	 * @param identifierGenerator The generator to use for id value generation.
 	 */
 	public IdentifierProperty(
-	        String name,
-	        String node,
-	        Type type,
-	        boolean embedded,
-	        IdentifierValue unsavedValue,
-	        IdentifierGenerator identifierGenerator) {
+			String name,
+			String node,
+			Type type,
+			boolean embedded,
+			IdentifierValue unsavedValue,
+			IdentifierGenerator identifierGenerator) {
 		super(name, node, type);
 		this.virtual = false;
 		this.embedded = embedded;
+		this.hasIdentifierMapper = false;
 		this.unsavedValue = unsavedValue;
 		this.identifierGenerator = identifierGenerator;
 		this.identifierAssignedByInsert = identifierGenerator instanceof PostInsertIdentifierGenerator;
@@ -60,11 +62,13 @@
 	public IdentifierProperty(
 	        Type type,
 	        boolean embedded,
-	        IdentifierValue unsavedValue,
+			boolean hasIdentifierMapper,
+			IdentifierValue unsavedValue,
 	        IdentifierGenerator identifierGenerator) {
 		super(null, null, type);
 		this.virtual = true;
 		this.embedded = embedded;
+		this.hasIdentifierMapper = hasIdentifierMapper;
 		this.unsavedValue = unsavedValue;
 		this.identifierGenerator = identifierGenerator;
 		this.identifierAssignedByInsert = identifierGenerator instanceof PostInsertIdentifierGenerator;
@@ -89,4 +93,8 @@
 	public boolean isIdentifierAssignedByInsert() {
 		return identifierAssignedByInsert;
 	}
+
+	public boolean hasIdentifierMapper() {
+		return hasIdentifierMapper;
+	}
 }

Index: PropertyFactory.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/tuple/PropertyFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- PropertyFactory.java	26 Sep 2005 19:29:03 -0000	1.9
+++ PropertyFactory.java	15 Feb 2006 22:28:15 -0000	1.10
@@ -53,6 +53,7 @@
 			return new IdentifierProperty(
 			        type,
 					mappedEntity.hasEmbeddedIdentifier(),
+					mappedEntity.hasIdentifierMapper(),
 					unsavedValue,
 					generator
 				);