[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnetlib/Generics ArrayList.cs,1.6,1.7 ArrayQ
|
From: |
Rhys Weatherley <address@hidden> |
|
Subject: |
[Dotgnu-pnet-commits] CVS: pnetlib/Generics ArrayList.cs,1.6,1.7 ArrayQueue.cs,1.5,1.6 ArrayStack.cs,1.5,1.6 CollectionWrapper.cs,1.2,1.3 DictionaryWrapper.cs,1.3,1.4 FixedSizeCollection.cs,1.2,1.3 FixedSizeDeque.cs,1.1,1.2 FixedSizeDictionary.cs,1.3,1.4 FixedSizeList.cs,1.3,1.4 FixedSizeQueue.cs,1.2,1.3 FixedSizeSet.cs,1.1,1.2 FixedSizeStack.cs,1.2,1.3 Hashtable.cs,1.5,1.6 ICollection.cs,1.2,1.3 IDeque.cs,1.2,1.3 IDictionary.cs,1.3,1.4 IList.cs,1.3,1.4 IQueue.cs,1.4,1.5 ISet.cs,1.1,1.2 IStack.cs,1.4,1.5 LinkedList.cs,1.7,1.8 ListSet.cs,1.1,1.2 ListWrapper.cs,1.3,1.4 ReadOnlyCollection.cs,1.3,1.4 ReadOnlyDeque.cs,1.2,1.3 ReadOnlyDictionary.cs,1.4,1.5 ReadOnlyList.cs,1.4,1.5 ReadOnlyQueue.cs,1.3,1.4 ReadOnlySet.cs,1.1,1.2 ReadOnlyStack.cs,1.3,1.4 SynchronizedCollection.cs,1.2,1.3 SynchronizedDeque.cs,1.2,1.3 SynchronizedDictionary.cs,1.3,1.4 SynchronizedList.cs,1.2,1.3 SynchronizedQueue.cs,1.3,1.4 SynchronizedSet.cs,1.2,1.3 SynchronizedStack.cs,1.3,1.4 |
|
Date: |
Mon, 24 Feb 2003 20:43:50 -0500 |
Update of /cvsroot/dotgnu-pnet/pnetlib/Generics
In directory subversions:/tmp/cvs-serv19816/Generics
Modified Files:
ArrayList.cs ArrayQueue.cs ArrayStack.cs CollectionWrapper.cs
DictionaryWrapper.cs FixedSizeCollection.cs FixedSizeDeque.cs
FixedSizeDictionary.cs FixedSizeList.cs FixedSizeQueue.cs
FixedSizeSet.cs FixedSizeStack.cs Hashtable.cs ICollection.cs
IDeque.cs IDictionary.cs IList.cs IQueue.cs ISet.cs IStack.cs
LinkedList.cs ListSet.cs ListWrapper.cs ReadOnlyCollection.cs
ReadOnlyDeque.cs ReadOnlyDictionary.cs ReadOnlyList.cs
ReadOnlyQueue.cs ReadOnlySet.cs ReadOnlyStack.cs
SynchronizedCollection.cs SynchronizedDeque.cs
SynchronizedDictionary.cs SynchronizedList.cs
SynchronizedQueue.cs SynchronizedSet.cs SynchronizedStack.cs
Log Message:
Move "IsReadOnly" and "IsFixedSize" into "ICollection<T>" because
they are common collection traits.
Index: ArrayList.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/ArrayList.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ArrayList.cs 24 Feb 2003 10:01:00 -0000 1.6
--- ArrayList.cs 25 Feb 2003 01:43:47 -0000 1.7
***************
*** 206,223 ****
Delete(1, index);
}
- public virtual bool IsFixedSize
- {
- get
- {
- return false;
- }
- }
- public virtual bool IsReadOnly
- {
- get
- {
- return false;
- }
- }
public virtual bool IsRandomAccess
{
--- 206,209 ----
***************
*** 421,424 ****
--- 407,424 ----
}
}
+ public virtual bool IsFixedSize
+ {
+ get
+ {
+ return false;
+ }
+ }
+ public virtual bool IsReadOnly
+ {
+ get
+ {
+ return false;
+ }
+ }
public virtual bool IsSynchronized
{
***************
*** 962,1485 ****
}; // class ArrayListIterator<T>
-
- // Adapt an IList<T> to appear to look like an ArrayList<T>.
- public static ArrayList<T> Adapter<T>(IList<T> list)
- {
- if(list == null)
- {
- throw new ArgumentNullException("list");
- }
- else if(list is ArrayList<T>)
- {
- return (ArrayList)list;
- }
- else
- {
- return new IListWrapper<T>(list);
- }
- }
-
- // Wrapper class for IList.
- private class IListWrapper<T> : ArrayList<T>
- {
-
- // Internal state.
- private IList<T> list;
-
- // Constructor
- public IListWrapper(IList<T> list)
- {
- this.list = list;
- }
-
- // Implement the IList interface.
- public override int Add(T value)
- {
- return list.Add(value);
- }
- public override void Clear()
- {
- list.Clear();
- }
- public override bool Contains(T item)
- {
- return list.Contains(item);
- }
- public override int IndexOf(T value)
- {
- return list.IndexOf(value);
- }
- public override void Insert(int index, T value)
- {
- list.Insert(index, value);
- }
- public override void Remove(T value)
- {
- list.Remove(value);
- }
- public override void RemoveAt(int index)
- {
- list.RemoveAt(index);
- }
- public override bool IsFixedSize
- {
- get
- {
- return list.IsFixedSize;
- }
- }
- public override bool IsReadOnly
- {
- get
- {
- return list.IsReadOnly;
- }
- }
- public override T this[int index]
- {
- get
- {
- return list[index];
- }
- set
- {
- list[index] = value;
- }
- }
-
- // Implement the ICloneable interface.
- public override Object Clone()
- {
- return new IListWrapper<T>(list);
- }
-
- // Range-related methods.
- public override void AddRange(ICollection<T> c)
- {
- if(c == null)
- {
- throw new
ArgumentNullException("c");
- }
- IIterator<T> iterator = c.GetIterator();
- while(iterator.MoveNext())
- {
- list.Add(iterator.Current);
- }
- }
- public override void InsertRange(int index, ICollection<T> c)
- {
- if(c == null)
- {
- throw new
ArgumentNullException("c");
- }
- IIterator<T> enumerator =
c.GetIterator();
- while(iterator.MoveNext())
- {
- list.Insert(index++,
iterator.Current);
- }
- }
- public override void RemoveRange(int index, int count)
- {
- if(index < 0 || index >= list.Count)
- {
- throw new
ArgumentOutOfRangeException
- ("index",
S._("ArgRange_Array"));
- }
- if(count < 0)
- {
- throw new
ArgumentOutOfRangeException
- ("count",
S._("ArgRange_Array"));
- }
- while(count > 0)
- {
- list.RemoveAt(index);
- --count;
- }
- }
- public override void SetRange(int index, ICollection<T> c)
- {
- if(c == null)
- {
- throw new
ArgumentNullException("c");
- }
- IIterator<T> enumerator =
c.GetIterator();
- while(iterator.MoveNext())
- {
- list[index++] =
iterator.Current;
- }
- }
-
- // Implement the ICollection interface.
- public override void CopyTo(T[] array, int arrayIndex)
- {
- list.CopyTo(array, arrayIndex);
- }
- public override int Count
- {
- get
- {
- return list.Count;
- }
- }
- public override bool IsSynchronized
- {
- get
- {
- return list.IsSynchronized;
- }
- }
- public override Object SyncRoot
- {
- get
- {
- return list.SyncRoot;
- }
- }
-
- // Copy from this array list to another array.
- public override void CopyTo(T[] array)
- {
- list.CopyTo(array, 0);
- }
-
- // Reverse the contents of this array list.
- public override void Reverse()
- {
- Reverse(0, Count);
- }
- public override void Reverse(int index, int count)
- {
- // Validate the parameters.
- if(index < 0)
- {
- throw new
ArgumentOutOfRangeException
- ("index",
S._("ArgRange_Array"));
- }
- if(count < 0)
- {
- throw new
ArgumentOutOfRangeException
- ("count",
S._("ArgRange_Array"));
- }
- if((Count - index) < count)
- {
- throw new ArgumentException
-
(S._("Arg_InvalidArrayRange"));
- }
-
- // Perform the reversal.
- T temp;
- int lower = index;
- int upper = index + count - 1;
- while(lower < upper)
- {
- temp = list[lower];
- list[lower] = list[upper];
- list[upper] = temp;
- ++lower;
- --upper;
- }
- }
-
- // Trim the array list to its actual size.
- public override void TrimToSize()
- {
- // Nothing can be done here.
- }
-
- // Get or set the current capacity of the array list.
- public override int Capacity
- {
- get
- {
- // Return the IList<T>'s count
as the capacity.
- return list.Count;
- }
- set
- {
- // IList<T> does not have a
capacity, so just validate.
- if(value < list.Count)
- {
- throw new
ArgumentOutOfRangeException
- ("value",
S._("Arg_CannotReduceCapacity"));
- }
- }
- }
-
- }; // class IListWrapper<T>
-
- // Adapt an array list to get access to a sub-range.
- public virtual ArrayList<T> GetRange(int index, int count)
- {
- if(index < 0)
- {
- throw new ArgumentOutOfRangeException
- ("index",
S._("ArgRange_Array"));
- }
- if(count < 0)
- {
- throw new ArgumentOutOfRangeException
- ("count",
S._("ArgRange_Array"));
- }
- if((this.count - index) < count)
- {
- throw new
ArgumentException(S._("Arg_InvalidArrayRange"));
- }
- return new RangeWrapper<T>(this, index, count);
- }
-
- // Wrapper class for sub-range array lists.
- private class RangeWrapper<T> : ArrayList<T>
- {
- private ArrayList<T> list;
- private int index;
- private new int count;
-
- public RangeWrapper(ArrayList<T> list, int index, int count)
- : base(list)
- {
- this.list = list;
- this.index = index;
- this.count = count;
- }
-
- // Implement the IList interface.
- public override int Add(T value)
- {
- list.Insert(index + count, value);
- return index + count;
- }
- public override void Clear()
- {
- list.Clear();
- }
- public override bool Contains(T item)
- {
- return (list.IndexOf(item) != -1);
- }
- public override int IndexOf(T value)
- {
- return list.IndexOf(value, index,
count);
- }
- public override void Insert(int index, T value)
- {
- if(index < 0 || index >= count)
- {
- throw new
ArgumentOutOfRangeException
- ("index",
S._("ArgRange_Array"));
- }
- list.Insert(index + this.index, value);
- }
- public override void Remove(T value)
- {
- int ind = list.IndexOf(value, index,
count);
- if(ind != -1)
- {
- list.RemoveAt(ind);
- }
- }
- public override void RemoveAt(int index)
- {
- list.RemoveAt(index + this.index);
- }
- public override bool IsFixedSize
- {
- get
- {
- return list.IsFixedSize;
- }
- }
- public override bool IsReadOnly
- {
- get
- {
- return list.IsReadOnly;
- }
- }
- public override T this[int index]
- {
- get
- {
- if(index < 0 || index >= count)
- {
- throw new
ArgumentOutOfRangeException
- ("index",
S._("ArgRange_Array"));
- }
- return list[index + this.index];
- }
- set
- {
- if(index < 0 || index >= count)
- {
- throw new
ArgumentOutOfRangeException
- ("index",
S._("ArgRange_Array"));
- }
- list[index + this.index] =
value;
- }
- }
-
- // Range-related methods.
- public override void AddRange(ICollection<T> c)
- {
- list.InsertRange(index + count, c);
- }
- public override void InsertRange(int index, ICollection<T> c)
- {
- list.InsertRange(index + this.index, c);
- }
- public override void RemoveRange(int index, int count)
- {
- list.RemoveRange(index + this.index,
count);
- }
- public override void SetRange(int index, ICollection<T> c)
- {
- list.SetRange(index + this.index, c);
- }
-
- // Implement the ICloneable interface.
- public override Object Clone()
- {
- return new RangeWrapper<T>
- ((ArrayList<T>)(list.Clone()),
index, count);
- }
-
- // Searching methods.
- public override int BinarySearch(T value)
- {
- return list.BinarySearch
- (index, count, value,
(IComparer<T>)null);
- }
- public override int BinarySearch(T value, IComparer<T> comparer)
- {
- return list.BinarySearch(index, count,
value, comparer);
- }
- public override int BinarySearch(int index, int count,
- T
value, IComparer<T> comparer)
- {
- return list.BinarySearch(index +
this.index, count,
-
value, comparer);
- }
- public override int IndexOf(T value, int startIndex)
- {
- return list.IndexOf(value, startIndex);
- }
- public override int IndexOf(T value, int startIndex, int count)
- {
- return list.IndexOf(value, startIndex,
count);
- }
- public override int LastIndexOf(T value)
- {
- return list.LastIndexOf(value);
- }
- public override int LastIndexOf(T value, int startIndex)
- {
- return list.LastIndexOf(value,
startIndex);
- }
- public override int LastIndexOf(T value, int startIndex, int
count)
- {
- return list.LastIndexOf(value,
startIndex, count);
- }
-
- // Implement the ICollection interface.
- public override void CopyTo(T[] array, int arrayIndex)
- {
- list.CopyTo(array, arrayIndex);
- }
- public override int Count
- {
- get
- {
- return count;
- }
- }
- public override bool IsSynchronized
- {
- get
- {
- return list.IsSynchronized;
- }
- }
- public override Object SyncRoot
- {
- get
- {
- return list.SyncRoot;
- }
- }
-
- // Copy from this array list to another array.
- public override void CopyTo(T[] array)
- {
- list.CopyTo(array);
- }
- public override void CopyTo(int index, T[] array,
- int
arrayIndex, int count)
- {
- list.CopyTo(index, array, arrayIndex,
count);
- }
-
- // Reverse the contents of this array list.
- public override void Reverse()
- {
- list.Reverse();
- }
- public override void Reverse(int index, int count)
- {
- list.Reverse(index, count);
- }
-
- // Sort the contents of this array list.
- public override void Sort()
- {
- list.Sort();
- }
- public override void Sort(IComparer<T> comparer)
- {
- list.Sort(comparer);
- }
- public override void Sort(int index, int count, IComparer<T>
comparer)
- {
- list.Sort(index, count, comparer);
- }
-
- // Create an array that contains the elements of this array
list.
- public override T[] ToArray()
- {
- return list.ToArray();
- }
- public override Array ToArray(Type type)
- {
- return list.ToArray(type);
- }
-
- // Trim the array list to its actual size.
- public override void TrimToSize()
- {
- list.TrimToSize();
- }
-
- // Get or set the current capacity of the array list.
- public override int Capacity
- {
- get
- {
- return list.Capacity;
- }
- set
- {
- list.Capacity = value;
- }
- }
-
- // Get an iterator for this array list.
- public override IIterator<T> GetIterator()
- {
- return list.GetIterator();
- }
- public override IIterator<T> GetIterator(int index, int count)
- {
- return list.GetIterator(index, count);
- }
-
- }; // class RangeWrapper<T>
}; // class ArrayList<T>
--- 962,965 ----
Index: ArrayQueue.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/ArrayQueue.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ArrayQueue.cs 25 Feb 2003 00:43:42 -0000 1.5
--- ArrayQueue.cs 25 Feb 2003 01:43:47 -0000 1.6
***************
*** 117,120 ****
--- 117,134 ----
}
}
+ public bool IsFixedSize
+ {
+ get
+ {
+ return false;
+ }
+ }
+ public bool IsReadOnly
+ {
+ get
+ {
+ return false;
+ }
+ }
public bool IsSynchronized
{
***************
*** 270,287 ****
}
return array;
- }
- public bool IsFixedSize
- {
- get
- {
- return false;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return false;
- }
}
--- 284,287 ----
Index: ArrayStack.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/ArrayStack.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ArrayStack.cs 25 Feb 2003 00:43:43 -0000 1.5
--- ArrayStack.cs 25 Feb 2003 01:43:47 -0000 1.6
***************
*** 85,88 ****
--- 85,102 ----
}
}
+ public bool IsFixedSize
+ {
+ get
+ {
+ return false;
+ }
+ }
+ public bool IsReadOnly
+ {
+ get
+ {
+ return false;
+ }
+ }
public bool IsSynchronized
{
***************
*** 204,221 ****
}
return array;
- }
- public bool IsFixedSize
- {
- get
- {
- return false;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return false;
- }
}
--- 218,221 ----
Index: CollectionWrapper.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/CollectionWrapper.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CollectionWrapper.cs 24 Feb 2003 04:36:26 -0000 1.2
--- CollectionWrapper.cs 25 Feb 2003 01:43:47 -0000 1.3
***************
*** 55,58 ****
--- 55,90 ----
}
}
+ public bool IsFixedSize
+ {
+ get
+ {
+ if(coll is
System.Collections.IDictionary)
+ {
+ return
((System.Collections.IDictionary)coll)
+ .IsFixedSize;
+ }
+ else if(coll is IList)
+ {
+ return
((System.Collections.IList)coll).IsFixedSize;
+ }
+ return false;
+ }
+ }
+ public bool IsReadOnly
+ {
+ get
+ {
+ if(coll is
System.Collections.IDictionary)
+ {
+ return
((System.Collections.IDictionary)coll)
+ .IsReadOnly;
+ }
+ else if(coll is IList)
+ {
+ return
((System.Collections.IList)coll).IsReadOnly;
+ }
+ return false;
+ }
+ }
public bool IsSynchronized
{
Index: DictionaryWrapper.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/DictionaryWrapper.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** DictionaryWrapper.cs 24 Feb 2003 05:20:34 -0000 1.3
--- DictionaryWrapper.cs 25 Feb 2003 01:43:47 -0000 1.4
***************
*** 65,82 ****
dict.Remove(key);
}
- public bool IsFixedSize
- {
- get
- {
- return dict.IsFixedSize;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return dict.IsReadOnly;
- }
- }
public ValueT this[KeyT key]
{
--- 65,68 ----
***************
*** 115,118 ****
--- 101,118 ----
{
return dict.Count;
+ }
+ }
+ public bool IsFixedSize
+ {
+ get
+ {
+ return dict.IsFixedSize;
+ }
+ }
+ public bool IsReadOnly
+ {
+ get
+ {
+ return dict.IsReadOnly;
}
}
Index: FixedSizeCollection.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/FixedSizeCollection.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** FixedSizeCollection.cs 24 Feb 2003 07:56:27 -0000 1.2
--- FixedSizeCollection.cs 25 Feb 2003 01:43:47 -0000 1.3
***************
*** 55,58 ****
--- 55,72 ----
}
}
+ public bool IsFixedSize
+ {
+ get
+ {
+ return true;
+ }
+ }
+ public bool IsReadOnly
+ {
+ get
+ {
+ return coll.IsReadOnly;
+ }
+ }
public bool IsSynchronized
{
Index: FixedSizeDeque.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/FixedSizeDeque.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FixedSizeDeque.cs 24 Feb 2003 07:21:00 -0000 1.1
--- FixedSizeDeque.cs 25 Feb 2003 01:43:47 -0000 1.2
***************
*** 72,89 ****
return deque.ToArray();
}
- public bool IsFixedSize
- {
- get
- {
- return true;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return deque.IsReadOnly;
- }
- }
// Implement the ICloneable interface.
--- 72,75 ----
Index: FixedSizeDictionary.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/FixedSizeDictionary.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** FixedSizeDictionary.cs 24 Feb 2003 23:42:49 -0000 1.3
--- FixedSizeDictionary.cs 25 Feb 2003 01:43:47 -0000 1.4
***************
*** 66,83 ****
(S._("NotSupp_FixedSizeCollection"));
}
- public bool IsFixedSize
- {
- get
- {
- return true;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return dict.IsReadOnly;
- }
- }
public ValueT this[KeyT key]
{
--- 66,69 ----
Index: FixedSizeList.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/FixedSizeList.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** FixedSizeList.cs 24 Feb 2003 08:58:10 -0000 1.3
--- FixedSizeList.cs 25 Feb 2003 01:43:47 -0000 1.4
***************
*** 77,94 ****
(S._("NotSupp_FixedSizeCollection"));
}
- public bool IsFixedSize
- {
- get
- {
- return true;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return list.IsReadOnly;
- }
- }
public bool IsRandomAccess
{
--- 77,80 ----
Index: FixedSizeQueue.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/FixedSizeQueue.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** FixedSizeQueue.cs 25 Feb 2003 00:43:43 -0000 1.2
--- FixedSizeQueue.cs 25 Feb 2003 01:43:47 -0000 1.3
***************
*** 67,84 ****
return queue.ToArray();
}
- public bool IsFixedSize
- {
- get
- {
- return true;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return queue.IsReadOnly;
- }
- }
// Implement the ICloneable interface.
--- 67,70 ----
Index: FixedSizeSet.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/FixedSizeSet.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FixedSizeSet.cs 25 Feb 2003 01:19:42 -0000 1.1
--- FixedSizeSet.cs 25 Feb 2003 01:43:47 -0000 1.2
***************
*** 59,76 ****
(S._("NotSupp_FixedSizeCollection"));
}
- public bool IsFixedSize
- {
- get
- {
- return true;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return set.IsReadOnly;
- }
- }
// Implement the ICloneable interface.
--- 59,62 ----
Index: FixedSizeStack.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/FixedSizeStack.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** FixedSizeStack.cs 25 Feb 2003 00:43:43 -0000 1.2
--- FixedSizeStack.cs 25 Feb 2003 01:43:47 -0000 1.3
***************
*** 67,84 ****
return stack.ToArray();
}
- public bool IsFixedSize
- {
- get
- {
- return true;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return stack.IsReadOnly;
- }
- }
// Implement the ICloneable interface.
--- 67,70 ----
Index: Hashtable.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/Hashtable.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Hashtable.cs 24 Feb 2003 23:42:49 -0000 1.5
--- Hashtable.cs 25 Feb 2003 01:43:47 -0000 1.6
***************
*** 530,533 ****
--- 530,547 ----
}
}
+ public virtual bool IsFixedSize
+ {
+ get
+ {
+ return false;
+ }
+ }
+ public virtual bool IsReadOnly
+ {
+ get
+ {
+ return false;
+ }
+ }
public virtual bool IsSynchronized
{
***************
*** 627,644 ****
hash = (hash + 1) % capacity;
--count;
- }
- }
- public virtual bool IsFixedSize
- {
- get
- {
- return false;
- }
- }
- public virtual bool IsReadOnly
- {
- get
- {
- return false;
}
}
--- 641,644 ----
Index: ICollection.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/ICollection.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ICollection.cs 24 Feb 2003 04:36:26 -0000 1.2
--- ICollection.cs 25 Feb 2003 01:43:47 -0000 1.3
***************
*** 33,36 ****
--- 33,38 ----
void CopyTo(T[] array, int index);
int Count { get; }
+ bool IsFixedSize { get; }
+ bool IsReadOnly { get; }
bool IsSynchronized { get; }
Object SyncRoot { get; }
Index: IDeque.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/IDeque.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** IDeque.cs 24 Feb 2003 06:56:27 -0000 1.2
--- IDeque.cs 25 Feb 2003 01:43:47 -0000 1.3
***************
*** 37,42 ****
T PeekEnd();
T[] ToArray();
- bool IsFixedSize { get; }
- bool IsReadOnly { get; }
}; // interface IDeque<T>
--- 37,40 ----
Index: IDictionary.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/IDictionary.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** IDictionary.cs 24 Feb 2003 05:20:34 -0000 1.3
--- IDictionary.cs 25 Feb 2003 01:43:47 -0000 1.4
***************
*** 37,42 ****
new IDictionaryIterator<KeyT, ValueT> GetIterator();
void Remove(KeyT key);
- bool IsFixedSize { get; }
- bool IsReadOnly { get; }
ValueT this[KeyT key] { get; set; }
ICollection<KeyT> Keys { get; }
--- 37,40 ----
Index: IList.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/IList.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** IList.cs 24 Feb 2003 08:58:10 -0000 1.3
--- IList.cs 25 Feb 2003 01:43:47 -0000 1.4
***************
*** 39,44 ****
void Remove(T value);
void RemoveAt(int index);
- bool IsFixedSize { get; }
- bool IsReadOnly { get; }
bool IsRandomAccess { get; }
T this[int index] { get; set; }
--- 39,42 ----
Index: IQueue.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/IQueue.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** IQueue.cs 25 Feb 2003 00:43:43 -0000 1.4
--- IQueue.cs 25 Feb 2003 01:43:47 -0000 1.5
***************
*** 36,41 ****
T Peek();
T[] ToArray();
- bool IsFixedSize { get; }
- bool IsReadOnly { get; }
}; // interface IQueue<T>
--- 36,39 ----
Index: ISet.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/ISet.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ISet.cs 25 Feb 2003 01:19:42 -0000 1.1
--- ISet.cs 25 Feb 2003 01:43:47 -0000 1.2
***************
*** 35,40 ****
bool Contains(T value);
void Remove(T value);
- bool IsFixedSize { get; }
- bool IsReadOnly { get; }
}; // interface ISet<T>
--- 35,38 ----
Index: IStack.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/IStack.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** IStack.cs 25 Feb 2003 00:43:43 -0000 1.4
--- IStack.cs 25 Feb 2003 01:43:47 -0000 1.5
***************
*** 36,41 ****
T Peek();
T[] ToArray();
- bool IsFixedSize { get; }
- bool IsReadOnly { get; }
}; // interface IStack<T>
--- 36,39 ----
Index: LinkedList.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/LinkedList.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** LinkedList.cs 25 Feb 2003 00:43:43 -0000 1.7
--- LinkedList.cs 25 Feb 2003 01:43:47 -0000 1.8
***************
*** 237,254 ****
return array;
}
- bool IDeque<T>.IsFixedSize
- {
- get
- {
- return IsFixedSize;
- }
- }
- bool IDeque<T>.IsReadOnly
- {
- get
- {
- return IsReadOnly;
- }
- }
// Implement the IQueue<T> interface privately.
--- 237,240 ----
***************
*** 277,294 ****
return ToArray();
}
- bool IQueue<T>.IsFixedSize
- {
- get
- {
- return IsFixedSize;
- }
- }
- bool IQueue<T>.IsReadOnly
- {
- get
- {
- return IsReadOnly;
- }
- }
// Implement the IStack<T> interface privately.
--- 263,266 ----
***************
*** 317,349 ****
return ToArray();
}
! bool IStack<T>.IsFixedSize
{
! get
{
! return IsFixedSize;
}
}
! bool IStack<T>.IsReadOnly
{
get
{
! return IsReadOnly;
}
}
!
! // Implement the ICollection<T> interface.
! public void CopyTo(T[] array, int index)
{
! IIterator<T> iterator = GetIterator();
! while(iterator.MoveNext())
{
! array[index++] = iterator.Current;
}
}
! public int Count
{
get
{
! return count;
}
}
--- 289,321 ----
return ToArray();
}
!
! // Implement the ICollection<T> interface.
! public void CopyTo(T[] array, int index)
{
! IIterator<T> iterator = GetIterator();
! while(iterator.MoveNext())
{
! array[index++] = iterator.Current;
}
}
! public int Count
{
get
{
! return count;
}
}
! public bool IsFixedSize
{
! get
{
! return false;
}
}
! public bool IsReadOnly
{
get
{
! return false;
}
}
***************
*** 528,545 ****
{
Remove(Get(index));
- }
- public bool IsFixedSize
- {
- get
- {
- return false;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return false;
- }
}
public bool IsRandomAccess
--- 500,503 ----
Index: ListSet.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/ListSet.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ListSet.cs 25 Feb 2003 01:19:42 -0000 1.1
--- ListSet.cs 25 Feb 2003 01:43:47 -0000 1.2
***************
*** 67,95 ****
list.Remove(value);
}
! public bool IsFixedSize
{
get
{
! return list.IsFixedSize;
}
}
! public bool IsReadOnly
{
get
{
! return list.IsReadOnly;
}
}
!
! // Implement the ICollection<T> interface.
! public void CopyTo(T[] array, int index)
! {
! list.CopyTo(array, index);
! }
! public int Count
{
get
{
! return list.Count;
}
}
--- 67,95 ----
list.Remove(value);
}
!
! // Implement the ICollection<T> interface.
! public void CopyTo(T[] array, int index)
! {
! list.CopyTo(array, index);
! }
! public int Count
{
get
{
! return list.Count;
}
}
! public bool IsFixedSize
{
get
{
! return list.IsFixedSize;
}
}
! public bool IsReadOnly
{
get
{
! return list.IsReadOnly;
}
}
Index: ListWrapper.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/ListWrapper.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ListWrapper.cs 24 Feb 2003 08:58:10 -0000 1.3
--- ListWrapper.cs 25 Feb 2003 01:43:47 -0000 1.4
***************
*** 77,94 ****
list.RemoveAt(index);
}
- public bool IsFixedSize
- {
- get
- {
- return list.IsFixedSize;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return list.IsReadOnly;
- }
- }
public bool IsRandomAccess
{
--- 77,80 ----
***************
*** 121,124 ****
--- 107,124 ----
{
return list.Count;
+ }
+ }
+ public bool IsFixedSize
+ {
+ get
+ {
+ return list.IsFixedSize;
+ }
+ }
+ public bool IsReadOnly
+ {
+ get
+ {
+ return list.IsReadOnly;
}
}
Index: ReadOnlyCollection.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/ReadOnlyCollection.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ReadOnlyCollection.cs 24 Feb 2003 07:56:27 -0000 1.3
--- ReadOnlyCollection.cs 25 Feb 2003 01:43:47 -0000 1.4
***************
*** 55,58 ****
--- 55,72 ----
}
}
+ public bool IsFixedSize
+ {
+ get
+ {
+ return coll.IsFixedSize;
+ }
+ }
+ public bool IsReadOnly
+ {
+ get
+ {
+ return true;
+ }
+ }
public bool IsSynchronized
{
Index: ReadOnlyDeque.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/ReadOnlyDeque.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ReadOnlyDeque.cs 24 Feb 2003 07:21:00 -0000 1.2
--- ReadOnlyDeque.cs 25 Feb 2003 01:43:47 -0000 1.3
***************
*** 68,85 ****
return deque.ToArray();
}
- public bool IsFixedSize
- {
- get
- {
- return deque.IsFixedSize;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return true;
- }
- }
// Implement the ICloneable interface.
--- 68,71 ----
Index: ReadOnlyDictionary.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/ReadOnlyDictionary.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ReadOnlyDictionary.cs 24 Feb 2003 23:42:49 -0000 1.4
--- ReadOnlyDictionary.cs 25 Feb 2003 01:43:47 -0000 1.5
***************
*** 63,80 ****
throw new
InvalidOperationException(S._("NotSupp_ReadOnly"));
}
- public bool IsFixedSize
- {
- get
- {
- return dict.IsFixedSize;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return true;
- }
- }
public ValueT this[KeyT key]
{
--- 63,66 ----
Index: ReadOnlyList.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/ReadOnlyList.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ReadOnlyList.cs 24 Feb 2003 08:58:10 -0000 1.4
--- ReadOnlyList.cs 25 Feb 2003 01:43:47 -0000 1.5
***************
*** 72,89 ****
throw new
InvalidOperationException(S._("NotSupp_ReadOnly"));
}
- public bool IsFixedSize
- {
- get
- {
- return list.IsFixedSize;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return true;
- }
- }
public bool IsRandomAccess
{
--- 72,75 ----
Index: ReadOnlyQueue.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/ReadOnlyQueue.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ReadOnlyQueue.cs 25 Feb 2003 00:43:43 -0000 1.3
--- ReadOnlyQueue.cs 25 Feb 2003 01:43:47 -0000 1.4
***************
*** 64,81 ****
return queue.ToArray();
}
- public bool IsFixedSize
- {
- get
- {
- return queue.IsFixedSize;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return true;
- }
- }
// Implement the ICloneable interface.
--- 64,67 ----
Index: ReadOnlySet.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/ReadOnlySet.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ReadOnlySet.cs 25 Feb 2003 01:19:42 -0000 1.1
--- ReadOnlySet.cs 25 Feb 2003 01:43:47 -0000 1.2
***************
*** 56,73 ****
throw new
InvalidOperationException(S._("NotSupp_ReadOnly"));
}
- public bool IsFixedSize
- {
- get
- {
- return set.IsFixedSize;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return true;
- }
- }
// Implement the ICloneable interface.
--- 56,59 ----
Index: ReadOnlyStack.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/ReadOnlyStack.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ReadOnlyStack.cs 25 Feb 2003 00:43:43 -0000 1.3
--- ReadOnlyStack.cs 25 Feb 2003 01:43:47 -0000 1.4
***************
*** 64,81 ****
return stack.ToArray();
}
- public bool IsFixedSize
- {
- get
- {
- return stack.IsFixedSize;
- }
- }
- public bool IsReadOnly
- {
- get
- {
- return true;
- }
- }
// Implement the ICloneable interface.
--- 64,67 ----
Index: SynchronizedCollection.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/SynchronizedCollection.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SynchronizedCollection.cs 25 Feb 2003 01:23:57 -0000 1.2
--- SynchronizedCollection.cs 25 Feb 2003 01:43:47 -0000 1.3
***************
*** 61,64 ****
--- 61,84 ----
}
}
+ public bool IsFixedSize
+ {
+ get
+ {
+ lock(SyncRoot)
+ {
+ return coll.IsFixedSize;
+ }
+ }
+ }
+ public bool IsReadOnly
+ {
+ get
+ {
+ lock(SyncRoot)
+ {
+ return coll.IsReadOnly;
+ }
+ }
+ }
public bool IsSynchronized
{
Index: SynchronizedDeque.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/SynchronizedDeque.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SynchronizedDeque.cs 25 Feb 2003 01:23:57 -0000 1.2
--- SynchronizedDeque.cs 25 Feb 2003 01:43:47 -0000 1.3
***************
*** 89,112 ****
}
}
- public bool IsFixedSize
- {
- get
- {
- lock(SyncRoot)
- {
- return deque.IsFixedSize;
- }
- }
- }
- public bool IsReadOnly
- {
- get
- {
- lock(SyncRoot)
- {
- return deque.IsReadOnly;
- }
- }
- }
// Implement the ICloneable interface.
--- 89,92 ----
Index: SynchronizedDictionary.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/SynchronizedDictionary.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** SynchronizedDictionary.cs 25 Feb 2003 01:23:57 -0000 1.3
--- SynchronizedDictionary.cs 25 Feb 2003 01:43:47 -0000 1.4
***************
*** 78,101 ****
}
}
- public bool IsFixedSize
- {
- get
- {
- lock(SyncRoot)
- {
- return dict.IsFixedSize;
- }
- }
- }
- public bool IsReadOnly
- {
- get
- {
- lock(SyncRoot)
- {
- return dict.IsReadOnly;
- }
- }
- }
public ValueT this[KeyT key]
{
--- 78,81 ----
Index: SynchronizedList.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/SynchronizedList.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SynchronizedList.cs 25 Feb 2003 01:23:57 -0000 1.2
--- SynchronizedList.cs 25 Feb 2003 01:43:47 -0000 1.3
***************
*** 97,120 ****
}
}
- public bool IsFixedSize
- {
- get
- {
- lock(SyncRoot)
- {
- return list.IsFixedSize;
- }
- }
- }
- public bool IsReadOnly
- {
- get
- {
- lock(SyncRoot)
- {
- return list.IsReadOnly;
- }
- }
- }
public bool IsRandomAccess
{
--- 97,100 ----
Index: SynchronizedQueue.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/SynchronizedQueue.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** SynchronizedQueue.cs 25 Feb 2003 01:23:57 -0000 1.3
--- SynchronizedQueue.cs 25 Feb 2003 01:43:47 -0000 1.4
***************
*** 82,105 ****
}
}
- public bool IsFixedSize
- {
- get
- {
- lock(SyncRoot)
- {
- return queue.IsFixedSize;
- }
- }
- }
- public bool IsReadOnly
- {
- get
- {
- lock(SyncRoot)
- {
- return queue.IsReadOnly;
- }
- }
- }
// Implement the ICloneable interface.
--- 82,85 ----
Index: SynchronizedSet.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/SynchronizedSet.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SynchronizedSet.cs 25 Feb 2003 01:23:57 -0000 1.2
--- SynchronizedSet.cs 25 Feb 2003 01:43:47 -0000 1.3
***************
*** 68,91 ****
}
}
- public bool IsFixedSize
- {
- get
- {
- lock(SyncRoot)
- {
- return set.IsFixedSize;
- }
- }
- }
- public bool IsReadOnly
- {
- get
- {
- lock(SyncRoot)
- {
- return set.IsReadOnly;
- }
- }
- }
// Implement the ICloneable interface.
--- 68,71 ----
Index: SynchronizedStack.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/SynchronizedStack.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** SynchronizedStack.cs 25 Feb 2003 01:23:57 -0000 1.3
--- SynchronizedStack.cs 25 Feb 2003 01:43:47 -0000 1.4
***************
*** 82,105 ****
}
}
- public bool IsFixedSize
- {
- get
- {
- lock(SyncRoot)
- {
- return stack.IsFixedSize;
- }
- }
- }
- public bool IsReadOnly
- {
- get
- {
- lock(SyncRoot)
- {
- return stack.IsReadOnly;
- }
- }
- }
// Implement the ICloneable interface.
--- 82,85 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnetlib/Generics ArrayList.cs,1.6,1.7 ArrayQueue.cs,1.5,1.6 ArrayStack.cs,1.5,1.6 CollectionWrapper.cs,1.2,1.3 DictionaryWrapper.cs,1.3,1.4 FixedSizeCollection.cs,1.2,1.3 FixedSizeDeque.cs,1.1,1.2 FixedSizeDictionary.cs,1.3,1.4 FixedSizeList.cs,1.3,1.4 FixedSizeQueue.cs,1.2,1.3 FixedSizeSet.cs,1.1,1.2 FixedSizeStack.cs,1.2,1.3 Hashtable.cs,1.5,1.6 ICollection.cs,1.2,1.3 IDeque.cs,1.2,1.3 IDictionary.cs,1.3,1.4 IList.cs,1.3,1.4 IQueue.cs,1.4,1.5 ISet.cs,1.1,1.2 IStack.cs,1.4,1.5 LinkedList.cs,1.7,1.8 ListSet.cs,1.1,1.2 ListWrapper.cs,1.3,1.4 ReadOnlyCollection.cs,1.3,1.4 ReadOnlyDeque.cs,1.2,1.3 ReadOnlyDictionary.cs,1.4,1.5 ReadOnlyList.cs,1.4,1.5 ReadOnlyQueue.cs,1.3,1.4 ReadOnlySet.cs,1.1,1.2 ReadOnlyStack.cs,1.3,1.4 SynchronizedCollection.cs,1.2,1.3 SynchronizedDeque.cs,1.2,1.3 SynchronizedDictionary.cs,1.3,1.4 SynchronizedList.cs,1.2,1.3 SynchronizedQueue.cs,1.3,1.4 SynchronizedSet.cs,1.2,1.3 SynchronizedStack.cs,1.3,1.4,
Rhys Weatherley <address@hidden> <=
- Prev by Date:
[Dotgnu-pnet-commits] CVS: pnetlib ChangeLog,1.720,1.721
- Next by Date:
[Dotgnu-pnet-commits] CVS: pnetlib/Generics Generics.html,NONE,1.1 README,1.1,1.2
- Previous by thread:
[Dotgnu-pnet-commits] CVS: pnetlib ChangeLog,1.720,1.721
- Next by thread:
[Dotgnu-pnet-commits] CVS: pnetlib/Generics Generics.html,NONE,1.1 README,1.1,1.2
- Index(es):