Merge branch 'master' of github.com:mono/mono

[mono.git] / mcs / class / System.Web / System.Web.UI / KeyedList.cs

diff --git a/mcs/class/System.Web/System.Web.UI/KeyedList.cs b/mcs/class/System.Web/System.Web.UI/KeyedList.cs
index ec3a061babb3327c4d272f6a13825c6bf6e31113..07daeb5f5038a58ab8ad7579bf07f8b885faa67b 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/KeyedList.cs
+++ b/mcs/class/System.Web/System.Web.UI/KeyedList.cs
@@ -5,19 +5,40 @@
 //
 // (C) 2003 Todd Berman
 
-#if NET_1_2
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 
 using System.Collections;
 using System.Collections.Specialized;
 
 namespace System.Web.UI
 {
-
-       public class KeyedList : IOrderedDictionary, IStateManager
+       class KeyedList : IOrderedDictionary
+#if !NET_4_0
+       , IStateManager // why do we implement it at all?
+#endif
        {
 
-               private Hashtable objectTable = new Hashtable ();
-               private ArrayList objectList = new ArrayList ();
+               Hashtable objectTable = new Hashtable ();
+               ArrayList objectList = new ArrayList ();
 
                public void Add (object key, object value)
                {
@@ -53,7 +74,9 @@ namespace System.Web.UI
                public void Remove (object key)
                {
                        objectTable.Remove (key);
-                       objectList.RemoveAt (IndexOf (key));
+                       int index = IndexOf (key);
+                       if (index >= 0)
+                               objectList.RemoveAt (index);
                }
 
                public void RemoveAt (int idx)
@@ -70,11 +93,16 @@ namespace System.Web.UI
                        return new KeyedListEnumerator (objectList);
                }
 
-               IEnumerator IEnumerable.GetEnumerator ()
+               IDictionaryEnumerator IOrderedDictionary.GetEnumerator ()
                {
                        return new KeyedListEnumerator (objectList);
                }
 
+               IEnumerator IEnumerable.GetEnumerator ()
+               {
+                       return new KeyedListEnumerator (objectList);
+               }
+#if !NET_4_0
                void IStateManager.LoadViewState (object state)
                {
                        if (state != null)
@@ -104,7 +132,7 @@ namespace System.Web.UI
                {
                        trackViewState = true;
                }
-
+#endif
                public int Count {
                        get { return objectList.Count; }
                }
@@ -172,13 +200,14 @@ namespace System.Web.UI
                        get { return this; }
                }
 
-               private bool trackViewState;
+#if !NET_4_0
+               bool trackViewState;
 
                bool IStateManager.IsTrackingViewState {
                        get { return trackViewState; }
                }
-
-               private int IndexOf (object key)
+#endif
+               int IndexOf (object key)
                {
                        for (int i = 0; i < objectList.Count; i++)
                        {
@@ -191,5 +220,3 @@ namespace System.Web.UI
                }
        }
 }
-
-#endif