[Nhibernate-commit] nhibernate/src/NHibernate/Collection Set.cs,1.18,1.19 SortedSet.cs,1.9,1.10

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1408/Collection

Modified Files:
	Set.cs SortedSet.cs 
Log Message:
NHibernate is now CLSCompliant

Index: SortedSet.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/SortedSet.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SortedSet.cs	18 Nov 2004 14:40:33 -0000	1.9
--- SortedSet.cs	21 Nov 2004 22:56:27 -0000	1.10
***************
*** 22,27 ****
  		protected override object Snapshot(CollectionPersister persister) 
  		{
! 			SortedList clonedSet = new SortedList(comparer, _set.Count);
! 			foreach(object obj in _set) 
  			{
  				object copy = persister.ElementType.DeepCopy( obj );
--- 22,27 ----
  		protected override object Snapshot(CollectionPersister persister) 
  		{
! 			SortedList clonedSet = new SortedList(comparer, internalSet.Count);
! 			foreach(object obj in internalSet) 
  			{
  				object copy = persister.ElementType.DeepCopy( obj );
***************
*** 40,44 ****
  		public override void BeforeInitialize(CollectionPersister persister) 
  		{
! 			_set = new Iesi.Collections.SortedSet( Comparer ); 
  			// an ArrayList of the identifiers is what Set uses because there is not
  			// both a Key & Value to worry about - just the Key.
--- 40,44 ----
  		public override void BeforeInitialize(CollectionPersister persister) 
  		{
! 			internalSet = new Iesi.Collections.SortedSet( Comparer ); 
  			// an ArrayList of the identifiers is what Set uses because there is not
  			// both a Key & Value to worry about - just the Key.
***************
*** 75,79 ****
  			{
  				object newObject = persister.ElementType.Assemble(array[i], session, owner);
! 				_set.Add( newObject );
  			}

--- 75,79 ----
  			{
  				object newObject = persister.ElementType.Assemble(array[i], session, owner);
! 				internalSet.Add( newObject );
  			}

Index: Set.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/Set.cs,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Set.cs	18 Nov 2004 14:40:33 -0000	1.18
--- Set.cs	21 Nov 2004 22:56:27 -0000	1.19
***************
*** 20,24 ****
  	public class Set : PersistentCollection, Iesi.Collections.ISet	
  	{
! 		protected Iesi.Collections.ISet _set;

  		[NonSerialized] protected IList tempIdentifierList;
--- 20,24 ----
  	public class Set : PersistentCollection, Iesi.Collections.ISet	
  	{
! 		protected Iesi.Collections.ISet internalSet;

  		[NonSerialized] protected IList tempIdentifierList;
***************
*** 31,36 ****
  		protected override object Snapshot(CollectionPersister persister) 
  		{
! 			Hashtable clonedMap = new Hashtable( _set.Count );
! 			foreach( object obj in _set )
  			{
  				object copied = persister.ElementType.DeepCopy( obj );
--- 31,36 ----
  		protected override object Snapshot(CollectionPersister persister) 
  		{
! 			Hashtable clonedMap = new Hashtable( internalSet.Count );
! 			foreach( object obj in internalSet )
  			{
  				object copied = persister.ElementType.DeepCopy( obj );
***************
*** 45,49 ****
  			ArrayList result = new ArrayList(sn.Keys.Count);
  			result.AddRange(sn.Keys);
! 			PersistentCollection.IdentityRemoveAll( result,_set, session );
  			return result;
  		}
--- 45,49 ----
  			ArrayList result = new ArrayList(sn.Keys.Count);
  			result.AddRange(sn.Keys);
! 			PersistentCollection.IdentityRemoveAll( result, internalSet, session );
  			return result;
  		}
***************
*** 55,59 ****
  		{
  			IDictionary snapshot = (IDictionary) GetSnapshot();
! 			if ( snapshot.Count!= _set.Count ) 
  			{
  				return false;
--- 55,59 ----
  		{
  			IDictionary snapshot = (IDictionary) GetSnapshot();
! 			if ( snapshot.Count!= internalSet.Count ) 
  			{
  				return false;
***************
*** 61,65 ****
  			else 
  			{
! 				foreach( object obj in _set ) 
  				{
  					object oldValue = snapshot[ obj ];
--- 61,65 ----
  			else 
  			{
! 				foreach( object obj in internalSet ) 
  				{
  					object oldValue = snapshot[ obj ];
***************
*** 86,90 ****
  		public Set(ISessionImplementor session, Iesi.Collections.ISet collection) : base(session) 
  		{
! 			_set = collection;
  			initialized = true;
  			directlyAccessible = true;
--- 86,90 ----
  		public Set(ISessionImplementor session, Iesi.Collections.ISet collection) : base(session) 
  		{
! 			internalSet = collection;
  			initialized = true;
  			directlyAccessible = true;
***************
*** 98,102 ****
  			for (int i=0; i<array.Length; i+=2)
  			{
! 				_set.Add( persister.ElementType.Assemble( array[i], session, owner ) );
  			}
  			initialized = true;
--- 98,102 ----
  			for (int i=0; i<array.Length; i+=2)
  			{
! 				internalSet.Add( persister.ElementType.Assemble( array[i], session, owner ) );
  			}
  			initialized = true;
***************
*** 110,118 ****
  			if(persister.HasOrdering) 
  			{
! 				_set = new Iesi.Collections.ListSet();
  			}
  			else 
  			{
! 				_set = new Iesi.Collections.HashedSet();
  			}
  		}
--- 110,118 ----
  			if(persister.HasOrdering) 
  			{
! 				internalSet = new Iesi.Collections.ListSet();
  			}
  			else 
  			{
! 				internalSet = new Iesi.Collections.HashedSet();
  			}
  		}
***************
*** 128,132 ****
  		{
  			Read();
! 			_set.CopyTo( array, index );
  		}

--- 128,132 ----
  		{
  			Read();
! 			internalSet.CopyTo( array, index );
  		}

***************
*** 139,143 ****
  			{
  				Read();
! 				return _set.Count;
  			}
  		}
--- 139,143 ----
  			{
  				Read();
! 				return internalSet.Count;
  			}
  		}
***************
*** 166,170 ****
  		{
  			Write();
! 			return _set.Add( value );
  		}

--- 166,170 ----
  		{
  			Write();
! 			return internalSet.Add( value );
  		}

***************
*** 172,176 ****
  		{
  			Write();
! 			_set.Clear();
  		}

--- 172,176 ----
  		{
  			Write();
! 			internalSet.Clear();
  		}

***************
*** 178,182 ****
  		{
  			Read();
! 			return _set.Contains( key );
  		}

--- 178,182 ----
  		{
  			Read();
! 			return internalSet.Contains( key );
  		}

***************
*** 184,188 ****
  		{
  			Read();
! 			return _set.ContainsAll( c );
  		}

--- 184,188 ----
  		{
  			Read();
! 			return internalSet.ContainsAll( c );
  		}

***************
*** 190,194 ****
  		{
  			Read();
! 			return _set.ExclusiveOr( a );
  		}

--- 190,194 ----
  		{
  			Read();
! 			return internalSet.ExclusiveOr( a );
  		}

***************
*** 196,200 ****
  		{
  			Read();
! 			return _set.Intersect( a );
  		}

--- 196,200 ----
  		{
  			Read();
! 			return internalSet.Intersect( a );
  		}

***************
*** 204,208 ****
  			{
  				Read();
! 				return _set.IsEmpty;
  			}
  		}
--- 204,208 ----
  			{
  				Read();
! 				return internalSet.IsEmpty;
  			}
  		}
***************
*** 211,215 ****
  		{
  			Read();
! 			return _set.Minus( a );
  		}

--- 211,215 ----
  		{
  			Read();
! 			return internalSet.Minus( a );
  		}

***************
*** 217,221 ****
  		{
  			Write();
! 			return _set.Remove( key );
  		}

--- 217,221 ----
  		{
  			Write();
! 			return internalSet.Remove( key );
  		}

***************
*** 223,227 ****
  		{
  			Write();
! 			return _set.RemoveAll( c );
  		}

--- 223,227 ----
  		{
  			Write();
! 			return internalSet.RemoveAll( c );
  		}

***************
*** 229,233 ****
  		{
  			Write();
! 			return _set.RetainAll( c );
  		}

--- 229,233 ----
  		{
  			Write();
! 			return internalSet.RetainAll( c );
  		}

***************
*** 235,259 ****
  		{
  			Read();
! 			return _set.Union( a );
  		}

  		#endregion

- //		/// <summary>
- //		/// <see cref="IDictionary.IsFixedSize"/>
- //		/// </summary>
- //		public bool IsFixedSize 
- //		{
- //			get { return false; }
- //		}
- //
- //		/// <summary>
- //		/// <see cref="IDictionary.IsReadOnly"/>
- //		/// </summary>
- //		public bool IsReadOnly 
- //		{
- //			get { return false; }
- //		}
- 
  		#region System.Collections.IEnumerable Members

--- 235,243 ----
  		{
  			Read();
! 			return internalSet.Union( a );
  		}

  		#endregion

  		#region System.Collections.IEnumerable Members

***************
*** 264,268 ****
  		{
  			Read();
! 			return _set.GetEnumerator();
  		}

--- 248,252 ----
  		{
  			Read();
! 			return internalSet.GetEnumerator();
  		}

***************
*** 275,279 ****
  		{
  			Read();
! 			return _set.Clone();
  		}

--- 259,263 ----
  		{
  			Read();
! 			return internalSet.Clone();
  		}

***************
*** 285,289 ****
  		public override ICollection Elements() 
  		{
! 			return _set;
  		}

--- 269,273 ----
  		public override ICollection Elements() 
  		{
! 			return internalSet;
  		}

***************
*** 293,297 ****
  		public override bool Empty 
  		{
! 			get { return _set.Count==0; }
  		}

--- 277,281 ----
  		public override bool Empty 
  		{
! 			get { return internalSet.Count==0; }
  		}

***************
*** 299,303 ****
  		{
  			Read();
! 			return _set.ToString();
  		}

--- 283,287 ----
  		{
  			Read();
! 			return internalSet.ToString();
  		}

***************
*** 308,312 ****
  		public override void WriteTo(IDbCommand st, CollectionPersister persister, object entry, int i, bool writeOrder) 
  		{
! 			persister.WriteElement(st, entry, writeOrder, session);
  		}

--- 292,296 ----
  		public override void WriteTo(IDbCommand st, CollectionPersister persister, object entry, int i, bool writeOrder) 
  		{
! 			persister.WriteElement( st, entry, writeOrder, session );
  		}

***************
*** 342,346 ****
  			{
  				object element = persister.ElementType.ResolveIdentifier(identifier, session, owner);
! 				_set.Add( element );
  			}

--- 326,330 ----
  			{
  				object element = persister.ElementType.ResolveIdentifier(identifier, session, owner);
! 				internalSet.Add( element );
  			}

***************
*** 352,356 ****
  		public override ICollection Entries() 
  		{
! 			return _set;
  		}

--- 336,340 ----
  		public override ICollection Entries() 
  		{
! 			return internalSet;
  		}

***************
*** 361,368 ****
  		public override object Disassemble(CollectionPersister persister) 
  		{
! 			object[] result = new object[ _set.Count ];
  			int i=0;

! 			foreach( object obj in _set ) 
  			{
  				result[i++] = persister.ElementType.Disassemble( obj, session );
--- 345,352 ----
  		public override object Disassemble(CollectionPersister persister) 
  		{
! 			object[] result = new object[ internalSet.Count ];
  			int i=0;

! 			foreach( object obj in internalSet ) 
  			{
  				result[i++] = persister.ElementType.Disassemble( obj, session );
***************
*** 383,387 ****
  				object test = e.Key;

! 				if( _set.Contains( test )==false ) 
  				{
  					deletes.Add( test );
--- 367,371 ----
  				object test = e.Key;

! 				if( internalSet.Contains( test )==false ) 
  				{
  					deletes.Add( test );
***************
*** 390,394 ****
  			}

! 			foreach(object obj in _set) 
  			{
  				//object testKey = e.Key;
--- 374,378 ----
  			}

! 			foreach(object obj in internalSet) 
  			{
  				//object testKey = e.Key;