[Nhibernate-commit] nhibernate/src/NHibernate/Collection ArrayHolder.cs,1.11,1.12 Map.cs,1.13,1.14 ODMGCollection.cs,1.8,1.9 PersistentCollection.cs,1.14,1.15 Set.cs,1.13,1.14

[Michael D. <mik...@us...>]

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

Modified Files:
	ArrayHolder.cs Map.cs ODMGCollection.cs 
	PersistentCollection.cs Set.cs 
Log Message:
patch for NH-117 applied

Index: ODMGCollection.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/ODMGCollection.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ODMGCollection.cs	9 Aug 2004 03:11:45 -0000	1.8
--- ODMGCollection.cs	16 Sep 2004 14:03:29 -0000	1.9
***************
*** 43,53 ****
  			return iter.MoveNext() ? iter.Current : null;
  		}
- 
- 		public abstract void CopyTo(Array a, int index);
- 		public abstract int Count { get; }
- 		public abstract bool IsSynchronized { get; }
- 		public abstract object SyncRoot { get; }
- 		public abstract IEnumerator GetEnumerator();
- 
  	}
  }
--- 43,46 ----

Index: Map.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/Map.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Map.cs	2 Sep 2004 15:07:19 -0000	1.13
--- Map.cs	16 Sep 2004 14:03:29 -0000	1.14
***************
*** 97,101 ****
  		}
  
! 		public int Count {
  			get {
  				Read();
--- 97,101 ----
  		}
  
! 		public override int Count {
  			get {
  				Read();
***************
*** 104,108 ****
  		}
  
! 		public bool IsSynchronized {
  			get { return false; }
  		}
--- 104,108 ----
  		}
  
! 		public override bool IsSynchronized {
  			get { return false; }
  		}
***************
*** 113,117 ****
  			get { return false; }
  		}
! 		public object SyncRoot {
  			get { return this; }
  		}
--- 113,117 ----
  			get { return false; }
  		}
! 		public override object SyncRoot {
  			get { return this; }
  		}
***************
*** 133,137 ****
  			
  		}
! 		public IEnumerator GetEnumerator() {
  			Read();
  			return map.GetEnumerator();
--- 133,137 ----
  			
  		}
! 		public override IEnumerator GetEnumerator() {
  			Read();
  			return map.GetEnumerator();
***************
*** 150,154 ****
  		}
  
! 		public void CopyTo(System.Array array, int index) {
  			Read();
  			map.CopyTo(array, index);
--- 150,154 ----
  		}
  
! 		public override void CopyTo(System.Array array, int index) {
  			Read();
  			map.CopyTo(array, index);

Index: PersistentCollection.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/PersistentCollection.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** PersistentCollection.cs	10 Sep 2004 21:23:14 -0000	1.14
--- PersistentCollection.cs	16 Sep 2004 14:03:29 -0000	1.15
***************
*** 34,38 ****
  	/// </summary>
  	[Serializable]
! 	public abstract class PersistentCollection 
  	{
  		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(PersistentCollection));
--- 34,38 ----
  	/// </summary>
  	[Serializable]
! 	public abstract class PersistentCollection : ICollection
  	{
  		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(PersistentCollection));
***************
*** 368,371 ****
--- 368,397 ----
  		#endregion
  
+ 		#region ICollection Members
+ 
+ 		public abstract bool IsSynchronized
+ 		{
+ 			get;
+ 		}
+ 
+ 		public abstract int Count
+ 		{
+ 			get;
+ 		}
+ 
+ 		public abstract void CopyTo(Array array, int index);
+ 
+ 		public abstract object SyncRoot
+ 		{
+ 			get;
+ 		}
+ 
+ 		#endregion
+ 
+ 		#region IEnumerable Members
+ 
+ 		public abstract IEnumerator GetEnumerator();
+ 
+ 		#endregion
  	}
  

Index: Set.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/Set.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Set.cs	10 Sep 2004 21:23:14 -0000	1.13
--- Set.cs	16 Sep 2004 14:03:29 -0000	1.14
***************
*** 116,120 ****
  		/// <see cref="ICollection.Count"/>
  		/// </summary>
! 		public int Count {
  			get {
  				Read();
--- 116,120 ----
  		/// <see cref="ICollection.Count"/>
  		/// </summary>
! 		public override int Count {
  			get {
  				Read();
***************
*** 126,130 ****
  		/// <see cref="ICollection.IsSynchronized"/>
  		/// </summary>
! 		public bool IsSynchronized {
  			get { return false; }
  		}
--- 126,130 ----
  		/// <see cref="ICollection.IsSynchronized"/>
  		/// </summary>
! 		public override bool IsSynchronized {
  			get { return false; }
  		}
***************
*** 147,151 ****
  		/// <see cref="ICollection.SyncRoot"/>
  		/// </summary>
! 		public object SyncRoot {
  			get { return this; }
  		}
--- 147,151 ----
  		/// <see cref="ICollection.SyncRoot"/>
  		/// </summary>
! 		public override object SyncRoot {
  			get { return this; }
  		}
***************
*** 178,182 ****
  		/// <see cref="IEnumerable.GetEnumerator"/>
  		/// </summary>
! 		public virtual IEnumerator GetEnumerator() {
  			Read();
  			return map.Keys.GetEnumerator();
--- 178,182 ----
  		/// <see cref="IEnumerable.GetEnumerator"/>
  		/// </summary>
! 		public override IEnumerator GetEnumerator() {
  			Read();
  			return map.Keys.GetEnumerator();
***************
*** 202,206 ****
  		/// <see cref="ICollection.CopyTo"/>
  		/// </summary>
! 		public void CopyTo(System.Array array, int index) {
  			Read();
  			map.CopyTo(array, index);
--- 202,206 ----
  		/// <see cref="ICollection.CopyTo"/>
  		/// </summary>
! 		public override void CopyTo(System.Array array, int index) {
  			Read();
  			map.CopyTo(array, index);

Index: ArrayHolder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/ArrayHolder.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ArrayHolder.cs	9 Aug 2004 03:11:45 -0000	1.11
--- ArrayHolder.cs	16 Sep 2004 14:03:29 -0000	1.12
***************
*** 265,269 ****
  			return entry!=null;
  		}
! 			
  
  	}
--- 265,305 ----
  			return entry!=null;
  		}
! 
! 		public override void CopyTo(Array array, int index)
! 		{
! 			((System.Array)this.array).CopyTo(array, index);
! 		}
! 
! 		public override int Count
! 		{
! 			get
! 			{
! 				return ((Array)array).Length;
! 			}
! 		}
! 
! 		public override IEnumerator GetEnumerator()
! 		{
! 			return ((Array)array).GetEnumerator();
! 		}
! 
! 		public override bool IsSynchronized
! 		{
! 			get
! 			{
! 				return false;
! 			}
! 		}
! 
! 		public override object SyncRoot
! 		{
! 			get
! 			{
! 				return this;
! 			}
! 		}
! 
! 
! 
  
  	}