[Hibernate-commits] Hibernate/cirrus/hibernate/loader CollectionInitializer.java,1.4,1.5 OneToManyLoader.java,1.12,1.13 UniqueEntityLoader.java,1.3,1.4

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader
In directory sc8-pr-cvs1:/tmp/cvs-serv20166/cirrus/hibernate/loader

Modified Files:
	CollectionInitializer.java OneToManyLoader.java 
	UniqueEntityLoader.java 
Log Message:
fixed broken line-endings and added a test

Index: CollectionInitializer.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/CollectionInitializer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CollectionInitializer.java	5 Nov 2002 06:46:06 -0000	1.4
--- CollectionInitializer.java	26 Nov 2002 03:35:42 -0000	1.5
***************
*** 1,21 ****
! //$Id$
! package cirrus.hibernate.loader;
! 
! import java.io.Serializable;
! import java.sql.SQLException;
! 
! import cirrus.hibernate.HibernateException;
! import cirrus.hibernate.collections.PersistentCollection;
! import cirrus.hibernate.engine.SessionImplementor;
! 
! /**
!  * An interface for collection loaders
!  * @see CollectionLoader
!  * @see OneToManyLoader
!  */
! public interface CollectionInitializer {
! 	/**
! 	 * Initialize the given collection
! 	 */
! 	public void initialize(Serializable id, PersistentCollection collection, SessionImplementor session) throws SQLException, HibernateException;
! }
--- 1,21 ----
! //$Id$
! package cirrus.hibernate.loader;
! 
! import java.io.Serializable;
! import java.sql.SQLException;
! 
! import cirrus.hibernate.HibernateException;
! import cirrus.hibernate.collections.PersistentCollection;
! import cirrus.hibernate.engine.SessionImplementor;
! 
! /**
!  * An interface for collection loaders
!  * @see CollectionLoader
!  * @see OneToManyLoader
!  */
! public interface CollectionInitializer {
! 	/**
! 	 * Initialize the given collection
! 	 */
! 	public void initialize(Serializable id, PersistentCollection collection, SessionImplementor session) throws SQLException, HibernateException;
! }

Index: OneToManyLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/OneToManyLoader.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** OneToManyLoader.java	25 Nov 2002 07:25:20 -0000	1.12
--- OneToManyLoader.java	26 Nov 2002 03:35:42 -0000	1.13
***************
*** 59,63 ****
  			outerJoinGenerator.outerJoinStringAfterFrom(associations),
  			// WHERE CLAUSE
! 			whereString( collPersister.getKeyColumnNames(), alias ),
  			// OUTER JOINS (Insertion Point 2)
  			outerJoinGenerator.outerJoinStringAfterWhere(associations) +
--- 59,63 ----
  			outerJoinGenerator.outerJoinStringAfterFrom(associations),
  			// WHERE CLAUSE
! 			whereString( collPersister.getKeyColumnNames(), alias ), //BUG!!!!!!!!!!!
  			// OUTER JOINS (Insertion Point 2)
  			outerJoinGenerator.outerJoinStringAfterWhere(associations) +

Index: UniqueEntityLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/UniqueEntityLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** UniqueEntityLoader.java	5 Nov 2002 06:46:06 -0000	1.3
--- UniqueEntityLoader.java	26 Nov 2002 03:35:42 -0000	1.4
***************
*** 1,16 ****
! //$Id$
! package cirrus.hibernate.loader;
! 
! import java.io.Serializable;
! import java.sql.SQLException;
! 
! import cirrus.hibernate.HibernateException;
! import cirrus.hibernate.engine.SessionImplementor;
! 
! public interface UniqueEntityLoader {
! 	/**
! 	 * Load an entity instance. If <tt>optionalObject</tt> is supplied,
! 	 * load the entity state into the given (uninitialized) object.
! 	 */
! 	public Object load(SessionImplementor session, Serializable id, Object optionalObject) throws HibernateException, SQLException;
! }
--- 1,16 ----
! //$Id$
! package cirrus.hibernate.loader;
! 
! import java.io.Serializable;
! import java.sql.SQLException;
! 
! import cirrus.hibernate.HibernateException;
! import cirrus.hibernate.engine.SessionImplementor;
! 
! public interface UniqueEntityLoader {
! 	/**
! 	 * Load an entity instance. If <tt>optionalObject</tt> is supplied,
! 	 * load the entity state into the given (uninitialized) object.
! 	 */
! 	public Object load(SessionImplementor session, Serializable id, Object optionalObject) throws HibernateException, SQLException;
! }