Menu
▾
▴
[Nhibernate-commit] nhibernate/src/NHibernate/Collection ArrayHolder.cs,1.10,1.11 Bag.cs,1.4,1.5 IdentifierBag.cs,1.2,1.3 List.cs,1.10,1.11 Map.cs,1.10,1.11 ODMGCollection.cs,1.7,1.8 PersistentCollection.cs,1.11,1.12 Set.cs,1.9,1.10 SortedMap.cs,1.3,1.4 SortedSet.cs,1.5,1.6
|
From: Michael D. <mik...@us...> - 2004-08-09 03:11:55
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8015/NHibernate/Collection Modified Files: ArrayHolder.cs Bag.cs IdentifierBag.cs List.cs Map.cs ODMGCollection.cs PersistentCollection.cs Set.cs SortedMap.cs SortedSet.cs Log Message: Added [Serializable] to match with h2.0.3 Index: ODMGCollection.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/ODMGCollection.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ODMGCollection.cs 2 Apr 2003 06:01:00 -0000 1.7 --- ODMGCollection.cs 9 Aug 2004 03:11:45 -0000 1.8 *************** *** 9,12 **** --- 9,13 ---- /// Last modified by edg...@ob... /// </summary> + [Serializable] public abstract class ODMGCollection : PersistentCollection, IDCollection { Index: Map.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/Map.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Map.cs 6 Jul 2004 21:08:17 -0000 1.10 --- Map.cs 9 Aug 2004 03:11:45 -0000 1.11 *************** *** 5,10 **** using NHibernate.Type; ! namespace NHibernate.Collection { ! public class Map : PersistentCollection, IDictionary { --- 5,15 ---- using NHibernate.Type; ! namespace NHibernate.Collection ! { ! /// <summary> ! /// A persistent wrapper for a <see cref="IDictionary" />. Underlying collection ! /// is a <see cref="Hashtable" />. ! /// </summary> ! [Serializable] public class Map : PersistentCollection, IDictionary { Index: PersistentCollection.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/PersistentCollection.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PersistentCollection.cs 9 Apr 2004 12:37:26 -0000 1.11 --- PersistentCollection.cs 9 Aug 2004 03:11:45 -0000 1.12 *************** *** 5,11 **** using NHibernate.Type; ! namespace NHibernate.Collection { ! ! /// <summary> /// Persistent collections are treated as value objects by Hibernate. --- 5,10 ---- using NHibernate.Type; ! namespace NHibernate.Collection ! { /// <summary> /// Persistent collections are treated as value objects by Hibernate. *************** *** 36,40 **** /// </summary> [Serializable] ! public abstract class PersistentCollection { private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(PersistentCollection)); --- 35,40 ---- /// </summary> [Serializable] ! public abstract class PersistentCollection ! { private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(PersistentCollection)); Index: List.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/List.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** List.cs 9 Apr 2004 12:37:26 -0000 1.10 --- List.cs 9 Aug 2004 03:11:45 -0000 1.11 *************** *** 6,15 **** ! namespace NHibernate.Collection { ! /// <summary> /// A persistent wrapper for an IList /// </summary> ! public class List : ODMGCollection , IList { private IList list; --- 6,17 ---- ! namespace NHibernate.Collection ! { /// <summary> /// A persistent wrapper for an IList /// </summary> ! [Serializable] ! public class List : ODMGCollection , IList ! { private IList list; Index: Bag.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/Bag.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Bag.cs 26 Apr 2004 03:48:02 -0000 1.4 --- Bag.cs 9 Aug 2004 03:11:45 -0000 1.5 *************** *** 9,14 **** { /// <summary> ! /// Summary description for Bag. /// </summary> public class Bag : ODMGCollection, IList { --- 9,18 ---- { /// <summary> ! /// An unordered, unkeyed collection that can contain the same element ! /// multiple times. The .net collections API, has no <tt>Bag</tt>. ! /// Most developers seem to use <tt>IList</tt>s to represent bag semantics, ! /// so NHibernate follows this practice. /// </summary> + [Serializable] public class Bag : ODMGCollection, IList { Index: ArrayHolder.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/ArrayHolder.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ArrayHolder.cs 13 Jul 2004 06:48:47 -0000 1.10 --- ArrayHolder.cs 9 Aug 2004 03:11:45 -0000 1.11 *************** *** 10,13 **** --- 10,14 ---- /// A persistent wrapper for an array. lazy initialization is NOT supported /// </summary> + [Serializable] public class ArrayHolder : PersistentCollection { *************** *** 15,21 **** private object array; ! private System.Type elementClass; ! private IList tempList; ! private IList tempListIdentifier; public ArrayHolder(ISessionImplementor session, object array) : base(session) --- 16,22 ---- private object array; ! [NonSerialized] private System.Type elementClass; ! [NonSerialized] private IList tempList; ! [NonSerialized] private IList tempListIdentifier; public ArrayHolder(ISessionImplementor session, object array) : base(session) Index: SortedSet.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/SortedSet.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SortedSet.cs 14 Jul 2004 21:26:35 -0000 1.5 --- SortedSet.cs 9 Aug 2004 03:11:45 -0000 1.6 *************** *** 19,22 **** --- 19,23 ---- /// element. /// </remarks> + [Serializable] public class SortedSet : Set, IDictionary { Index: SortedMap.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/SortedMap.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SortedMap.cs 6 Jul 2004 21:08:21 -0000 1.3 --- SortedMap.cs 9 Aug 2004 03:11:45 -0000 1.4 *************** *** 17,23 **** /// element. /// </remarks> public class SortedMap : Map, IDictionary { - private IComparer comparer; --- 17,23 ---- /// element. /// </remarks> + [Serializable] public class SortedMap : Map, IDictionary { private IComparer comparer; Index: Set.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/Set.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Set.cs 14 Jul 2004 21:26:34 -0000 1.9 --- Set.cs 9 Aug 2004 03:11:45 -0000 1.10 *************** *** 24,32 **** /// this[key]: will work but there is no guarantee that it contains a meaningful object. /// </summary> public class Set : PersistentCollection, IDictionary { protected IDictionary map; ! protected IList tempIdentifierList; /// <summary> --- 24,33 ---- /// this[key]: will work but there is no guarantee that it contains a meaningful object. /// </summary> + [Serializable] public class Set : PersistentCollection, IDictionary { protected IDictionary map; ! [NonSerialized] protected IList tempIdentifierList; /// <summary> Index: IdentifierBag.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/IdentifierBag.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IdentifierBag.cs 4 Jun 2004 19:58:18 -0000 1.2 --- IdentifierBag.cs 9 Aug 2004 03:11:45 -0000 1.3 *************** *** 24,27 **** --- 24,28 ---- /// </para> /// </remarks> + [Serializable] public class IdentifierBag : ODMGCollection, IList { |
