[Hibernate-commits] Hibernate/cirrus/hibernate/collections ArrayHolder.java,1.50,1.51 Bag.java,1.18,1.19 List.java,1.46,1.47 Map.java,1.47,1.48 PersistentCollection.java,1.79,1.80 Set.java,1.50,1.51

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

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

Modified Files:
	ArrayHolder.java Bag.java List.java Map.java 
	PersistentCollection.java Set.java 
Log Message:
detect collection modifications not made via wrapper

Index: ArrayHolder.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/ArrayHolder.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** ArrayHolder.java	26 Nov 2002 03:35:41 -0000	1.50
--- ArrayHolder.java	6 Mar 2003 10:55:08 -0000	1.51
***************
*** 168,172 ****
  	}
  	
! 	public boolean isArrayHolder() {
  		return true;
  	}
--- 168,172 ----
  	}
  	
! 	public boolean isDirectlyAccessible() {
  		return true;
  	}

Index: Bag.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/Bag.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Bag.java	17 Dec 2002 09:43:18 -0000	1.18
--- Bag.java	6 Mar 2003 10:55:09 -0000	1.19
***************
*** 43,46 ****
--- 43,47 ----
  		}
  		initialized = true;
+ 		directlyAccessible = true;
  	}
  

Index: List.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/List.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** List.java	17 Dec 2002 09:43:18 -0000	1.46
--- List.java	6 Mar 2003 10:55:09 -0000	1.47
***************
*** 56,59 ****
--- 56,60 ----
  		this.list = list;
  		initialized = true;
+ 		directlyAccessible = true;
  	}
  	public void beforeInitialize(CollectionPersister persister) {

Index: Map.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/Map.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** Map.java	19 Dec 2002 11:29:03 -0000	1.47
--- Map.java	6 Mar 2003 10:55:09 -0000	1.48
***************
*** 59,62 ****
--- 59,63 ----
  		this.map = map;
  		initialized = true;
+ 		directlyAccessible = true;
  	}
  	

Index: PersistentCollection.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/PersistentCollection.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** PersistentCollection.java	24 Dec 2002 13:45:37 -0000	1.79
--- PersistentCollection.java	6 Mar 2003 10:55:09 -0000	1.80
***************
*** 2,8 ****
  package cirrus.hibernate.collections;
  
! import cirrus.hibernate.type.Type;
! import cirrus.hibernate.impl.CollectionPersister;
! 
  import java.util.ArrayList;
  import java.util.Collection;
--- 2,9 ----
  package cirrus.hibernate.collections;
  
! import java.io.Serializable;
! import java.sql.PreparedStatement;
! import java.sql.ResultSet;
! import java.sql.SQLException;
  import java.util.ArrayList;
  import java.util.Collection;
***************
*** 11,21 ****
  import java.util.ListIterator;
  
- import cirrus.hibernate.*;
- import java.sql.*;
- import java.io.*;
- 
  import org.apache.commons.logging.LogFactory;
  
  import cirrus.hibernate.engine.SessionImplementor;
  
  /**
--- 12,23 ----
  import java.util.ListIterator;
  
  import org.apache.commons.logging.LogFactory;
  
+ import cirrus.hibernate.AssertionFailure;
+ import cirrus.hibernate.HibernateException;
+ import cirrus.hibernate.LazyInitializationException;
  import cirrus.hibernate.engine.SessionImplementor;
+ import cirrus.hibernate.impl.CollectionPersister;
+ import cirrus.hibernate.type.Type;
  
  /**
***************
*** 44,47 ****
--- 46,50 ----
  	protected transient SessionImplementor session;
  	protected boolean initialized;
+ 	protected boolean directlyAccessible;
  	private transient List additions;
  
***************
*** 149,154 ****
  	}
  
! 	public boolean isArrayHolder() {
! 		return false;
  	}
  
--- 152,157 ----
  	}
  
! 	public boolean isDirectlyAccessible() {
! 		return directlyAccessible;
  	}
  

Index: Set.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/Set.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** Set.java	26 Nov 2002 03:35:41 -0000	1.50
--- Set.java	6 Mar 2003 10:55:09 -0000	1.51
***************
*** 78,81 ****
--- 78,82 ----
  		this.set = set;
  		initialized = true;
+ 		directlyAccessible = true;
  	}