[Hibernate-commits] Hibernate2/src/net/sf/hibernate/type OneToOneType.java,1.3,1.4

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type
In directory sc8-pr-cvs1:/tmp/cvs-serv24927/hibernate/type

Modified Files:
	OneToOneType.java 
Log Message:
massive refactoring of XML mapping parsing code

Index: OneToOneType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/OneToOneType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OneToOneType.java	5 Jan 2003 02:11:24 -0000	1.3
--- OneToOneType.java	27 Jan 2003 07:12:04 -0000	1.4
***************
*** 57,86 ****
  		String[] names,
  		SessionImplementor session,
! 		Object owner)
! 		throws HibernateException, SQLException {
  			
! 			return session.getEntityIdentifier(owner);
! 		}
  		
! 		public Object resolveIdentifier(Object value, SessionImplementor session) throws HibernateException, SQLException {
! 			
! 			if (value==null) return null;
! 			
! 			Class clazz = getPersistentClass();
! 			Serializable id = (Serializable) value;
! 			
! 			return isNullable() ?
! 			session.internalLoadOneToOne(clazz, id) :
! 			session.internalLoad(clazz, id);
! 		}
  		
! 		public boolean isNullable() {
! 			return foreignKeyType==AssociationType.FOREIGN_KEY_TO_PARENT;
! 		}
  		
  	}
  	
  	
! 	
! 	
! 	
--- 57,82 ----
  		String[] names,
  		SessionImplementor session,
! 		Object owner
! 	) throws HibernateException, SQLException {
  			
! 		return session.getEntityIdentifier(owner);
! 	}
! 	
! 	public Object resolveIdentifier(Object value, SessionImplementor session) throws HibernateException, SQLException {
  		
! 		if (value==null) return null;
  		
! 		Class clazz = getPersistentClass();
! 		Serializable id = (Serializable) value;
  		
+ 		return isNullable() ?
+ 		session.internalLoadOneToOne(clazz, id) :
+ 		session.internalLoad(clazz, id);
  	}
  	
+ 	public boolean isNullable() {
+ 		return foreignKeyType==AssociationType.FOREIGN_KEY_TO_PARENT;
+ 	}
  	
! }
!