From: <one...@us...> - 2003-04-06 10:11:42
|
Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/collection In directory sc8-pr-cvs1:/tmp/cvs-serv26833/collection Modified Files: ArrayHolder.java Bag.java CollectionPersister.java List.java Map.java PersistentCollection.java Set.java SortedMap.java SortedSet.java Log Message: * reworked CompositeUserType * improved some exception handling Index: ArrayHolder.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/collection/ArrayHolder.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ArrayHolder.java 2 Apr 2003 01:06:52 -0000 1.11 --- ArrayHolder.java 6 Apr 2003 10:11:07 -0000 1.12 *************** *** 159,163 **** //Arrays have to do things a bit differently. ! public Object getInitialValue(boolean lazy) throws SQLException, HibernateException { super.getInitialValue(false); session.addArrayHolder(this); --- 159,163 ---- //Arrays have to do things a bit differently. ! public Object getInitialValue(boolean lazy) throws HibernateException { super.getInitialValue(false); session.addArrayHolder(this); *************** *** 175,179 **** public ArrayHolder(SessionImplementor session, CollectionPersister persister, Serializable disassembled, Object owner) ! throws HibernateException, SQLException { super(session); Serializable[] cached = (Serializable[]) disassembled; --- 175,179 ---- public ArrayHolder(SessionImplementor session, CollectionPersister persister, Serializable disassembled, Object owner) ! throws HibernateException { super(session); Serializable[] cached = (Serializable[]) disassembled; Index: Bag.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/collection/Bag.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Bag.java 6 Mar 2003 11:12:09 -0000 1.9 --- Bag.java 6 Apr 2003 10:11:07 -0000 1.10 *************** *** 161,165 **** */ public Bag(SessionImplementor session, CollectionPersister persister, Serializable disassembled, Object owner) ! throws HibernateException, SQLException { super(session); beforeInitialize(persister); --- 161,165 ---- */ public Bag(SessionImplementor session, CollectionPersister persister, Serializable disassembled, Object owner) ! throws HibernateException { super(session); beforeInitialize(persister); Index: CollectionPersister.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/collection/CollectionPersister.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** CollectionPersister.java 2 Apr 2003 01:06:52 -0000 1.17 --- CollectionPersister.java 6 Apr 2003 10:11:07 -0000 1.18 *************** *** 224,228 **** } ! public PersistentCollection getCachedCollection(Serializable id, Object owner, SessionImplementor s) throws HibernateException, SQLException { if (cache==null) { return null; --- 224,228 ---- } ! public PersistentCollection getCachedCollection(Serializable id, Object owner, SessionImplementor s) throws HibernateException { if (cache==null) { return null; Index: List.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/collection/List.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** List.java 6 Mar 2003 11:12:10 -0000 1.10 --- List.java 6 Apr 2003 10:11:07 -0000 1.11 *************** *** 317,321 **** public List(SessionImplementor session, CollectionPersister persister, Serializable disassembled, Object owner) ! throws HibernateException, SQLException { super(session); beforeInitialize(persister); --- 317,321 ---- public List(SessionImplementor session, CollectionPersister persister, Serializable disassembled, Object owner) ! throws HibernateException { super(session); beforeInitialize(persister); Index: Map.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/collection/Map.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Map.java 6 Mar 2003 11:12:11 -0000 1.10 --- Map.java 6 Apr 2003 10:11:07 -0000 1.11 *************** *** 310,314 **** public Map(SessionImplementor session, CollectionPersister persister, Serializable disassembled, Object owner) ! throws HibernateException, SQLException { super(session); beforeInitialize(persister); --- 310,314 ---- public Map(SessionImplementor session, CollectionPersister persister, Serializable disassembled, Object owner) ! throws HibernateException { super(session); beforeInitialize(persister); Index: PersistentCollection.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/collection/PersistentCollection.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PersistentCollection.java 2 Apr 2003 01:06:52 -0000 1.11 --- PersistentCollection.java 6 Apr 2003 10:11:07 -0000 1.12 *************** *** 114,118 **** // As far as every client is concerned, the collection is // loaded after this call! (Actually its done lazily) ! public Object getInitialValue(boolean lazy) throws SQLException, HibernateException { if ( !lazy ) { session.initialize(this, false); --- 114,118 ---- // As far as every client is concerned, the collection is // loaded after this call! (Actually its done lazily) ! public Object getInitialValue(boolean lazy) throws HibernateException { if ( !lazy ) { session.initialize(this, false); Index: Set.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/collection/Set.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Set.java 2 Apr 2003 01:06:53 -0000 1.10 --- Set.java 6 Apr 2003 10:11:07 -0000 1.11 *************** *** 72,76 **** directlyAccessible = true; } ! public Set(SessionImplementor session, CollectionPersister persister, Serializable disassembled, Object owner) throws HibernateException, SQLException { super(session); beforeInitialize(persister); --- 72,76 ---- directlyAccessible = true; } ! public Set(SessionImplementor session, CollectionPersister persister, Serializable disassembled, Object owner) throws HibernateException { super(session); beforeInitialize(persister); Index: SortedMap.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/collection/SortedMap.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SortedMap.java 15 Feb 2003 01:00:51 -0000 1.7 --- SortedMap.java 6 Apr 2003 10:11:07 -0000 1.8 *************** *** 4,8 **** import java.io.Serializable; - import java.sql.SQLException; import java.util.Iterator; import java.util.TreeMap; --- 4,7 ---- *************** *** 39,43 **** public SortedMap(SessionImplementor session, CollectionPersister persister, Comparator comparator, Serializable disassembled, Object owner) ! throws HibernateException, SQLException { super(session); this.comparator=comparator; --- 38,42 ---- public SortedMap(SessionImplementor session, CollectionPersister persister, Comparator comparator, Serializable disassembled, Object owner) ! throws HibernateException { super(session); this.comparator=comparator; Index: SortedSet.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/collection/SortedSet.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SortedSet.java 19 Feb 2003 01:51:30 -0000 1.8 --- SortedSet.java 6 Apr 2003 10:11:08 -0000 1.9 *************** *** 3,7 **** import java.io.Serializable; - import java.sql.SQLException; import java.util.Iterator; import java.util.TreeMap; --- 3,6 ---- *************** *** 141,145 **** Serializable disassembled, Object owner) ! throws HibernateException, SQLException { this(session); --- 140,144 ---- Serializable disassembled, Object owner) ! throws HibernateException { this(session); |