Please review the attached patch that refactors the
System.ComponentModel.Design.Serialization.ContextStack class in order
to update it to NET_2_0. Cheers.
--
Ivan N. Zlatev
Web: http://www.i-nZ.net
"It's all some kind of whacked out conspiracy."
Index: mcs/class/System/System.ComponentModel.Design.Serialization/ContextStack.cs
===================================================================
--- mcs/class/System/System.ComponentModel.Design.Serialization/ContextStack.cs (revision 79169)
+++ mcs/class/System/System.ComponentModel.Design.Serialization/ContextStack.cs (working copy)
@@ -4,9 +4,11 @@
// Author:
// Alejandro Sánchez Acosta ([EMAIL PROTECTED])
// Andreas Nahr ([EMAIL PROTECTED])
+// Ivan N. Zlatev ([EMAIL PROTECTED])
//
// (C) Alejandro Sánchez Acosta
// (C) 2003 Andreas Nahr
+// (C) 2007 Ivan N. Zlatev
//
//
@@ -30,33 +32,31 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System;
using System.Collections;
-namespace System.ComponentModel.Design.Serialization
+namespace Mono.Design
{
public sealed class ContextStack
{
- private Stack stack;
+ private ArrayList _contextList;
public ContextStack ()
{
- stack = new Stack ();
+ stack = new ArrayList ();
}
public object Current {
get {
- try {
- return stack.Peek ();
- }
- catch {
- return null;
- }
+ if (_contextList.Count > 0)
+ return _contextList[_contextList.Count-1];
+ return null;
}
}
public object this[Type type] {
get {
- foreach (object o in stack.ToArray())
+ foreach (object o in _contextList)
if (o.GetType () == type)
return o;
return null;
@@ -67,29 +67,39 @@
get {
if (level < 0)
throw new ArgumentException ("level has to be >= 0","level");
- Array A = stack.ToArray();
- if (level > (A.Length - 1))
- return null;
- return A.GetValue(level);
+ if (_contextList.Count > 0 && _contextList.Count > level)
+ return _contextList[_contextList.Count - 1 - level];
+ return null;
}
}
public object Pop ()
{
- return stack.Pop ();
+ object o = null;
+ if (_contextList.Count > 0) {
+ int lastItem = _contextList.Count - 1;
+ o = _contextList[lastItem];
+ _contextList.RemoveAt (lastItem);
+ }
+ return o;
}
public void Push (object context)
{
- stack.Push (context);
+ if (context == null)
+ throw new ArgumentNullException ("context");
+
+ _contextList.Add (context);
}
#if NET_2_0
- [MonoNotSupported ("")]
public void Append (object context)
{
- throw new NotImplementedException ();
+ if (context == null)
+ throw new ArgumentNullException ("context");
+ _contextList.Insert (0, context);
}
#endif
}
}
+
_______________________________________________
Mono-devel-list mailing list
Mono-devel-list@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-devel-list
