From f9b47e69c825de52c13f63f7f91b6ea8d6c5380d Mon Sep 17 00:00:00 2001
From: Jb Evain <jbevain@gmail.com>
Date: Thu, 1 Apr 2010 17:28:00 +0000
Subject: [PATCH] 2010-04-01  Jb Evain  <jbevain@novell.com>

	* SortedSet.cs: fix API.


svn path=/trunk/mcs/; revision=154654
---
 .../System/System.Collections.Generic/ChangeLog    |  4 ++
 .../System/System.Collections.Generic/SortedSet.cs | 52 ++++++++++++++--------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/mcs/class/System/System.Collections.Generic/ChangeLog b/mcs/class/System/System.Collections.Generic/ChangeLog
index 200ed5345d6..9b4d4d01bcc 100644
--- a/mcs/class/System/System.Collections.Generic/ChangeLog
+++ b/mcs/class/System/System.Collections.Generic/ChangeLog
@@ -1,5 +1,9 @@
 2010-04-01  Jb Evain  <jbevain@novell.com>
 
+	* SortedSet.cs: fix API.
+
+2010-04-01  Jb Evain  <jbevain@novell.com>
+
 	* SortedSet.cs: add new SortedSet type in .net 4.0
 
 2010-03-03  Miguel de Icaza  <miguel@novell.com>
diff --git a/mcs/class/System/System.Collections.Generic/SortedSet.cs b/mcs/class/System/System.Collections.Generic/SortedSet.cs
index 3793dadc567..55100e94e14 100644
--- a/mcs/class/System/System.Collections.Generic/SortedSet.cs
+++ b/mcs/class/System/System.Collections.Generic/SortedSet.cs
@@ -100,10 +100,25 @@ namespace System.Collections.Generic {
 		SerializationInfo si;
 
 		public SortedSet ()
-			: this (null as IComparer<T>)
+			: this (Comparer<T>.Default)
 		{
 		}
 
+		public SortedSet (IEnumerable<T> collection)
+			: this (collection, Comparer<T>.Default)
+		{
+		}
+
+		public SortedSet (IEnumerable<T> collection, IComparer<T> comparer)
+			: this (comparer)
+		{
+			if (collection == null)
+				throw new ArgumentNullException ("collection");
+	
+			foreach (var item in collection)
+				Add (item);
+		}
+
 		public SortedSet (IComparer<T> comparer)
 		{
 			this.helper = NodeHelper.GetHelper (comparer);
@@ -133,7 +148,7 @@ namespace System.Collections.Generic {
 			get { throw new NotImplementedException (); }
 		}
 
-		public virtual bool Add (T item)
+		public bool Add (T item)
 		{
 			var node = new Node (item);
 			return tree.Intern (item, node) == node;
@@ -154,7 +169,7 @@ namespace System.Collections.Generic {
 			CopyTo (array, 0, Count);
 		}
 
-		public virtual void CopyTo (T [] array, int index)
+		public void CopyTo (T [] array, int index)
 		{
 			CopyTo (array, index, Count);
 		}
@@ -178,7 +193,7 @@ namespace System.Collections.Generic {
 			}
 		}
 
-		public virtual bool Remove (T item)
+		public bool Remove (T item)
 		{
 			return tree.Remove (item) != null;
 		}
@@ -247,13 +262,13 @@ namespace System.Collections.Generic {
 		}
 
 		[MonoTODO]
-		public virtual void ExceptWith (IEnumerable<T> other)
+		public void ExceptWith (IEnumerable<T> other)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		public virtual void GetViewBetween (T lowerValue, T upperValue)
+		public virtual SortedSet<T> GetViewBetween (T lowerValue, T upperValue)
 		{
 			throw new NotImplementedException ();
 		}
@@ -265,62 +280,61 @@ namespace System.Collections.Generic {
 		}
 
 		[MonoTODO]
-		public virtual bool IsProperSubsetOf (IEnumerable<T> other)
+		public bool IsProperSubsetOf (IEnumerable<T> other)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		public virtual bool IsProperSupersetOf (IEnumerable<T> other)
+		public bool IsProperSupersetOf (IEnumerable<T> other)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		public virtual bool IsSubsetOf (IEnumerable<T> other)
+		public bool IsSubsetOf (IEnumerable<T> other)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		public virtual bool IsSupersetOf (IEnumerable<T> other)
+		public bool IsSupersetOf (IEnumerable<T> other)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		public virtual bool IsPropertSubsetOf (IEnumerable<T> other)
+		public bool Overlaps (IEnumerable<T> other)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		public virtual bool Overlaps (IEnumerable<T> other)
+		public bool SetEquals (IEnumerable<T> other)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		public virtual bool SetEquals (IEnumerable<T> other)
+		public void SymmetricExceptWith (IEnumerable<T> other)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		public virtual void SymmetricExceptWith (IEnumerable<T> other)
+		public void UnionWith (IEnumerable<T> other)
 		{
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO]
-		public virtual void UnionWith (IEnumerable<T> other)
+		void ICollection<T>.Add (T item)
 		{
-			throw new NotImplementedException ();
+			Add (item);
 		}
 
-		void ICollection<T>.Add (T item)
+		void ICollection<T>.CopyTo (T [] array, int index)
 		{
-			Add (item);
+			CopyTo (array, index, Count);
 		}
 
 		bool ICollection<T>.IsReadOnly {
-- 
2.11.4.GIT