Internal naming style.

Author: oskarb

src/NHibernate/Collection/Generic/PersistentGenericSet.cs

@@ -24,7 +24,7 @@ public class PersistentGenericSet<T> : AbstractPersistentCollection, ISet<T>
 		/// <summary>
 		/// The <see cref="ISet{T}"/> that NHibernate is wrapping.
 		/// </summary>
-		protected ISet<T> set;
+		protected ISet<T> WrappedSet;
 
 		/// <summary>
 		/// A temporary list that holds the objects while the PersistentSet is being
@@ -67,7 +67,7 @@ public PersistentGenericSet(ISessionImplementor session, ISet<T> original)
 			// do we need to copy it to be sure it won't be changing
 			// underneath us?
 			// ie. this.set.addAll(set);
-			set = original;
+			WrappedSet = original;
 			SetInitialized();
 			IsDirectlyAccessible = true;
 		}
@@ -80,8 +80,8 @@ public override bool RowUpdatePossible
 		public override object GetSnapshot(ICollectionPersister persister)
 		{
 			var entityMode = Session.EntityMode;
-			var clonedSet = new SetSnapShot<T>(set.Count);
-			var enumerable = from object current in set
+			var clonedSet = new SetSnapShot<T>(WrappedSet.Count);
+			var enumerable = from object current in WrappedSet
 							 select persister.ElementType.DeepCopy(current, entityMode, persister.Factory);
 			foreach (var copied in enumerable)
 			{
@@ -95,21 +95,21 @@ public override ICollection GetOrphans(object snapshot, string entityName)
 			var sn = new SetSnapShot<T>((IEnumerable<T>)snapshot);
 
 			// TODO: Avoid duplicating shortcuts and array copy, by making base class GetOrphans() more flexible
-			if (set.Count == 0) return sn;
+			if (WrappedSet.Count == 0) return sn;
 			if (((ICollection)sn).Count == 0) return sn;
-			return GetOrphans(sn, set.ToArray(), entityName, Session);
+			return GetOrphans(sn, WrappedSet.ToArray(), entityName, Session);
 		}
 
 		public override bool EqualsSnapshot(ICollectionPersister persister)
 		{
 			var elementType = persister.ElementType;
 			var snapshot = (ISetSnapshot<T>)GetSnapshot();
-			if (((ICollection)snapshot).Count != set.Count)
+			if (((ICollection)snapshot).Count != WrappedSet.Count)
 			{
 				return false;
 			}
 
-			return !(from object obj in set
+			return !(from object obj in WrappedSet
 					 let oldValue = snapshot[(T)obj]
 					 where oldValue == null || elementType.IsDirty(oldValue, obj, Session)
 					 select obj).Any();
@@ -122,7 +122,7 @@ public override bool IsSnapshotEmpty(object snapshot)
 
 		public override void BeforeInitialize(ICollectionPersister persister, int anticipatedSize)
 		{
-			set = (ISet<T>)persister.CollectionType.Instantiate(anticipatedSize);
+			WrappedSet = (ISet<T>)persister.CollectionType.Instantiate(anticipatedSize);
 		}
 
 		/// <summary>
@@ -141,21 +141,21 @@ public override void InitializeFromCache(ICollectionPersister persister, object
 				var element = (T)persister.ElementType.Assemble(array[i], Session, owner);
 				if (element != null)
 				{
-					set.Add(element);
+					WrappedSet.Add(element);
 				}
 			}
 			SetInitialized();
 		}
 
 		public override bool Empty
 		{
-			get { return set.Count == 0; }
+			get { return WrappedSet.Count == 0; }
 		}
 
 		public override string ToString()
 		{
 			Read();
-			return StringHelper.CollectionToString(set);
+			return StringHelper.CollectionToString(WrappedSet);
 		}
 
 		public override object ReadFrom(IDataReader rs, ICollectionPersister role, ICollectionAliases descriptor, object owner)
@@ -187,7 +187,7 @@ public override bool EndRead(ICollectionPersister persister)
 		{
 			foreach (T item in _tempList)
 			{
-				set.Add(item);
+				WrappedSet.Add(item);
 			}
 			_tempList = null;
 			SetInitialized();
@@ -196,15 +196,15 @@ public override bool EndRead(ICollectionPersister persister)
 
 		public override IEnumerable Entries(ICollectionPersister persister)
 		{
-			return set;
+			return WrappedSet;
 		}
 
 		public override object Disassemble(ICollectionPersister persister)
 		{
-			var result = new object[set.Count];
+			var result = new object[WrappedSet.Count];
 			int i = 0;
 
-			foreach (object obj in set)
+			foreach (object obj in WrappedSet)
 			{
 				result[i++] = persister.ElementType.Disassemble(obj, Session, null);
 			}
@@ -217,9 +217,9 @@ public override IEnumerable GetDeletes(ICollectionPersister persister, bool inde
 			var sn = (ISetSnapshot<T>)GetSnapshot();
 			var deletes = new List<T>(((ICollection<T>)sn).Count);
 
-			deletes.AddRange(sn.Where(obj => !set.Contains(obj)));
+			deletes.AddRange(sn.Where(obj => !WrappedSet.Contains(obj)));
 
-			deletes.AddRange(from obj in set
+			deletes.AddRange(from obj in WrappedSet
 							 let oldValue = sn[obj]
 							 where oldValue != null && elementType.IsDirty(obj, oldValue, Session)
 							 select oldValue);
@@ -265,13 +265,13 @@ public override bool Equals(object other)
 				return false;
 			}
 			Read();
-			return set.SequenceEqual(that);
+			return WrappedSet.SequenceEqual(that);
 		}
 
 		public override int GetHashCode()
 		{
 			Read();
-			return set.GetHashCode();
+			return WrappedSet.GetHashCode();
 		}
 
 		public override bool EntryExists(object entry, int i)
@@ -281,7 +281,7 @@ public override bool EntryExists(object entry, int i)
 
 		public override bool IsWrapper(object collection)
 		{
-			return set == collection;
+			return WrappedSet == collection;
 		}
 
 		#region ISet<T> Members
@@ -290,7 +290,7 @@ public override bool IsWrapper(object collection)
 		public bool Contains(T item)
 		{
 			bool? exists = ReadElementExistence(item);
-			return exists == null ? set.Contains(item) : exists.Value;
+			return exists == null ? WrappedSet.Contains(item) : exists.Value;
 		}
 
 
@@ -300,7 +300,7 @@ public bool Add(T o)
 			if (!exists.HasValue)
 			{
 				Initialize(true);
-				if (set.Add(o))
+				if (WrappedSet.Add(o))
 				{
 					Dirty();
 					return true;
@@ -324,9 +324,9 @@ public void UnionWith(IEnumerable<T> other)
 
 			Initialize(true);
 
-			var oldCount = set.Count;
-			set.UnionWith(collection);
-			var newCount = set.Count;
+			var oldCount = WrappedSet.Count;
+			WrappedSet.UnionWith(collection);
+			var newCount = WrappedSet.Count;
 
 			// Union can only add, so if the set was modified the count must increase.
 			if (oldCount != newCount)
@@ -337,9 +337,9 @@ public void IntersectWith(IEnumerable<T> other)
 		{
 			Initialize(true);
 
-			var oldCount = set.Count;
-			set.IntersectWith(other);
-			var newCount = set.Count;
+			var oldCount = WrappedSet.Count;
+			WrappedSet.IntersectWith(other);
+			var newCount = WrappedSet.Count;
 
 			// Intersect can only remove, so if the set was modified the count must decrease.
 			if (oldCount != newCount)
@@ -354,9 +354,9 @@ public void ExceptWith(IEnumerable<T> other)
 
 			Initialize(true);
 
-			var oldCount = set.Count;
-			set.ExceptWith(collection);
-			var newCount = set.Count;
+			var oldCount = WrappedSet.Count;
+			WrappedSet.ExceptWith(collection);
+			var newCount = WrappedSet.Count;
 
 			// Except can only remove, so if the set was modified the count must decrease.
 			if (oldCount != newCount)
@@ -371,7 +371,7 @@ public void SymmetricExceptWith(IEnumerable<T> other)
 
 			Initialize(true);
 
-			set.SymmetricExceptWith(collection);
+			WrappedSet.SymmetricExceptWith(collection);
 
 			// If the other collection is non-empty, we are guaranteed to 
 			// remove or add at least one element.
@@ -381,37 +381,37 @@ public void SymmetricExceptWith(IEnumerable<T> other)
 		public bool IsSubsetOf(IEnumerable<T> other)
 		{
 			Read();
-			return set.IsProperSupersetOf(other);
+			return WrappedSet.IsProperSupersetOf(other);
 		}
 
 		public bool IsSupersetOf(IEnumerable<T> other)
 		{
 			Read();
-			return set.IsSupersetOf(other);
+			return WrappedSet.IsSupersetOf(other);
 		}
 
 		public bool IsProperSupersetOf(IEnumerable<T> other)
 		{
 			Read();
-			return set.IsProperSupersetOf(other);
+			return WrappedSet.IsProperSupersetOf(other);
 		}
 
 		public bool IsProperSubsetOf(IEnumerable<T> other)
 		{
 			Read();
-			return set.IsProperSubsetOf(other);
+			return WrappedSet.IsProperSubsetOf(other);
 		}
 
 		public bool Overlaps(IEnumerable<T> other)
 		{
 			Read();
-			return set.Overlaps(other);
+			return WrappedSet.Overlaps(other);
 		}
 
 		public bool SetEquals(IEnumerable<T> other)
 		{
 			Read();
-			return set.SetEquals(other);
+			return WrappedSet.SetEquals(other);
 		}
 
 		public bool Remove(T o)
@@ -420,7 +420,7 @@ public bool Remove(T o)
 			if (!exists.HasValue)
 			{
 				Initialize(true);
-				if (set.Remove(o))
+				if (WrappedSet.Remove(o))
 				{
 					Dirty();
 					return true;
@@ -445,9 +445,9 @@ public void Clear()
 			else
 			{
 				Initialize(true);
-				if (set.Count != 0)
+				if (WrappedSet.Count != 0)
 				{
-					set.Clear();
+					WrappedSet.Clear();
 					Dirty();
 				}
 			}
@@ -461,12 +461,12 @@ public void CopyTo(T[] array, int arrayIndex)
 		{
 			// NH : we really need to initialize the set ?
 			Read();
-			set.CopyTo(array, arrayIndex);
+			WrappedSet.CopyTo(array, arrayIndex);
 		}
 
 		public int Count
 		{
-			get { return ReadSize() ? CachedSize : set.Count; }
+			get { return ReadSize() ? CachedSize : WrappedSet.Count; }
 		}
 
 		public bool IsReadOnly
@@ -497,7 +497,7 @@ void ICollection<T>.Add(T item)
 		IEnumerator IEnumerable.GetEnumerator()
 		{
 			Read();
-			return set.GetEnumerator();
+			return WrappedSet.GetEnumerator();
 		}
 
 		#endregion
@@ -507,7 +507,7 @@ IEnumerator IEnumerable.GetEnumerator()
 		public IEnumerator<T> GetEnumerator()
 		{
 			Read();
-			return set.GetEnumerator();
+			return WrappedSet.GetEnumerator();
 		}
 
 		#endregion
@@ -536,7 +536,7 @@ public object Orphan
 
 			public void Operate()
 			{
-				enclosingInstance.set.Clear();
+				enclosingInstance.WrappedSet.Clear();
 			}
 		}
 
@@ -563,7 +563,7 @@ public object Orphan
 
 			public void Operate()
 			{
-				enclosingInstance.set.Add(value);
+				enclosingInstance.WrappedSet.Add(value);
 			}
 		}
 
@@ -590,7 +590,7 @@ public object Orphan
 
 			public void Operate()
 			{
-				enclosingInstance.set.Remove(value);
+				enclosingInstance.WrappedSet.Remove(value);
 			}
 		}