[Dotgnu-pnet-commits] CVS: pnetlib/Generics DictionaryEnumeratorAdapter.cs,1.2,1.3 DictionaryEnumeratorWrapper.cs,1.2,1.3 FixedSizeDictionary.cs,1.2,1.3 Hashtable.cs,1.4,1.5 IDictionaryIterator.cs,1.2,1.3 ReadOnlyDictionary.cs,1.3,1.4 SynchronizedDictionary.cs,1.1,1.2

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/Generics
In directory subversions:/tmp/cvs-serv26008/Generics

Modified Files:
        DictionaryEnumeratorAdapter.cs DictionaryEnumeratorWrapper.cs 
        FixedSizeDictionary.cs Hashtable.cs IDictionaryIterator.cs 
        ReadOnlyDictionary.cs SynchronizedDictionary.cs 
Log Message:


Remove the "Entry" property from "IDictionaryIterator", because it is
identical to "Current".


Index: DictionaryEnumeratorAdapter.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/DictionaryEnumeratorAdapter.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DictionaryEnumeratorAdapter.cs      24 Feb 2003 04:36:26 -0000      1.2
--- DictionaryEnumeratorAdapter.cs      24 Feb 2003 23:42:49 -0000      1.3
***************
*** 68,72 ****
                                get
                                {
!                                       DictionaryEntry<KeyT, ValueT> entry = 
e.Entry;
                                        return new 
System.Collections.DictionaryEntry
                                                (e.Key, e.Value);
--- 68,72 ----
                                get
                                {
!                                       DictionaryEntry<KeyT, ValueT> entry = 
e.Current;
                                        return new 
System.Collections.DictionaryEntry
                                                (e.Key, e.Value);

Index: DictionaryEnumeratorWrapper.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/DictionaryEnumeratorWrapper.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DictionaryEnumeratorWrapper.cs      24 Feb 2003 04:36:26 -0000      1.2
--- DictionaryEnumeratorWrapper.cs      24 Feb 2003 23:42:49 -0000      1.3
***************
*** 60,82 ****
                                throw new 
InvalidOperationException(S._("NotSupp_Remove"));
                        }
!       public ValueT Current
                        {
                                get
                                {
!                                       // Cannot use "e.Current", because that 
is the
!                                       // DictionaryEntry, not the entry's 
value.
!                                       return (ValueT)(e.Value);
                                }
                        }
  
        // Implement the IDictionaryIterator<KeyT, ValueT> interface.
-       public DictionaryEntry<KeyT, ValueT> Entry
-                       {
-                               get
-                               {
-                                       System.Collections.DictionaryEntry 
entry = e.Entry;
-                                       return new DictionaryEntry<KeyT, 
ValueT>(e.Key, e.Value);
-                               }
-                       }
        public KeyT Key
                        {
--- 60,74 ----
                                throw new 
InvalidOperationException(S._("NotSupp_Remove"));
                        }
!       public DictionaryEntry<KeyT, ValueT> Current
                        {
                                get
                                {
!                                       System.Collections.DictionaryEntry 
entry = e.Entry;
!                                       return new DictionaryEntry<KeyT, ValueT>
!                                               ((KeyT)(e.Key), 
(ValueT)(e.Value));
                                }
                        }
  
        // Implement the IDictionaryIterator<KeyT, ValueT> interface.
        public KeyT Key
                        {

Index: FixedSizeDictionary.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/FixedSizeDictionary.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** FixedSizeDictionary.cs      24 Feb 2003 07:56:27 -0000      1.2
--- FixedSizeDictionary.cs      24 Feb 2003 23:42:49 -0000      1.3
***************
*** 157,167 ****
  
                // Implement the IDictionaryIterator<KeyT, ValueT> interface.
-               public DictionaryEntry<KeyT, ValueT> Entry
-                               {
-                                       get
-                                       {
-                                               return iterator.Entry;
-                                       }
-                               }
                public KeyT Key
                                {
--- 157,160 ----

Index: Hashtable.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/Hashtable.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Hashtable.cs        24 Feb 2003 10:01:00 -0000      1.4
--- Hashtable.cs        24 Feb 2003 23:42:49 -0000      1.5
***************
*** 902,914 ****
                                        get
                                        {
-                                               return Entry;
-                                       }
-                               }
- 
-               // Implement the IDictionaryIterator<KeyT, ValueT> interface.
-               public DictionaryEntry<KeyT, ValueT> Entry
-                               {
-                                       get
-                                       {
                                                if(posn < 0 || posn >= 
table.capacity ||
                                               !(table.table[posn].hasEntry))
--- 902,905 ----
***************
*** 922,925 ****
--- 913,918 ----
                                        }
                                }
+ 
+               // Implement the IDictionaryIterator<KeyT, ValueT> interface.
                public KeyT Key
                                {

Index: IDictionaryIterator.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/IDictionaryIterator.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** IDictionaryIterator.cs      24 Feb 2003 05:20:34 -0000      1.2
--- IDictionaryIterator.cs      24 Feb 2003 23:42:49 -0000      1.3
***************
*** 32,36 ****
  {
  
-       DictionaryEntry<KeyT, ValueT> Entry { get; }
        KeyT Key { get; }
        ValueT Value { get; set; }
--- 32,35 ----

Index: ReadOnlyDictionary.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/ReadOnlyDictionary.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ReadOnlyDictionary.cs       24 Feb 2003 07:56:27 -0000      1.3
--- ReadOnlyDictionary.cs       24 Feb 2003 23:42:49 -0000      1.4
***************
*** 155,165 ****
  
                // Implement the IDictionaryIterator<KeyT, ValueT> interface.
-               public DictionaryEntry<KeyT, ValueT> Entry
-                               {
-                                       get
-                                       {
-                                               return iterator.Entry;
-                                       }
-                               }
                public KeyT Key
                                {
--- 155,158 ----

Index: SynchronizedDictionary.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Generics/SynchronizedDictionary.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SynchronizedDictionary.cs   24 Feb 2003 10:01:01 -0000      1.1
--- SynchronizedDictionary.cs   24 Feb 2003 23:42:49 -0000      1.2
***************
*** 202,215 ****
  
                // Implement the IDictionaryIterator<KeyT, ValueT> interface.
-               public DictionaryEntry<KeyT, ValueT> Entry
-                               {
-                                       get
-                                       {
-                                               lock(dict.SyncRoot)
-                                               {
-                                                       return iterator.Entry;
-                                               }
-                                       }
-                               }
                public KeyT Key
                                {
--- 202,205 ----