[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Resources BuiltinResourceSet.cs,1.2,1.3 ResourceSet.cs,1.6,1.7

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Resources
In directory subversions:/tmp/cvs-serv5946/runtime/System/Resources

Modified Files:
        BuiltinResourceSet.cs ResourceSet.cs 
Log Message:


Signature-compatibility fixes to a large number of classes.


Index: BuiltinResourceSet.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Resources/BuiltinResourceSet.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** BuiltinResourceSet.cs       16 Apr 2003 03:17:55 -0000      1.2
--- BuiltinResourceSet.cs       25 Apr 2003 03:53:07 -0000      1.3
***************
*** 179,183 ****
  
        // Read all resources into the hash table.
!       public override void ReadResources()
                        {
                                if(!readResourcesCalled)
--- 179,183 ----
  
        // Read all resources into the hash table.
!       protected override void ReadResources()
                        {
                                if(!readResourcesCalled)
***************
*** 190,193 ****
--- 190,200 ----
                                        readResourcesCalled = true;
                                }
+                       }
+ 
+       // Get the dictionary enumerator for this instance.
+       public override IDictionaryEnumerator GetEnumerator()
+                       {
+                               ReadResources();
+                               return base.GetEnumerator();
                        }
  

Index: ResourceSet.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Resources/ResourceSet.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ResourceSet.cs      16 Apr 2003 03:17:55 -0000      1.6
--- ResourceSet.cs      25 Apr 2003 03:53:07 -0000      1.7
***************
*** 29,32 ****
--- 29,33 ----
  using System.Collections;
  using System.Globalization;
+ using System.Runtime.InteropServices;
  
  #if ECMA_COMPAT
***************
*** 35,39 ****
  public
  #endif
! class ResourceSet : IDisposable
  {
        // Internal state.
--- 36,40 ----
  public
  #endif
! class ResourceSet : IDisposable, IEnumerable
  {
        // Internal state.
***************
*** 76,80 ****
  
        // Close this resource set.
!       public void Close()
                        {
                                Dispose(true);
--- 77,81 ----
  
        // Close this resource set.
!       public virtual void Close()
                        {
                                Dispose(true);
***************
*** 99,102 ****
--- 100,118 ----
                        }
  
+       // Implement IEnumerable.
+       IEnumerator IEnumerable.GetEnumerator()
+                       {
+                               return GetEnumerator();
+                       }
+ 
+       // Get the dictionary enumerator for this instance.
+ #if !ECMA_COMPAT
+       [ComVisible(false)]
+ #endif
+       public virtual IDictionaryEnumerator GetEnumerator()
+                       {
+                               return Table.GetEnumerator();
+                       }
+ 
        // Get the default reader type for this resource set.
        public virtual Type GetDefaultReader()
***************
*** 241,245 ****
  
        // Read all resources into the hash table.
!       public virtual void ReadResources()
                        {
                                IDictionaryEnumerator e = 
Reader.GetEnumerator();
--- 257,261 ----
  
        // Read all resources into the hash table.
!       protected virtual void ReadResources()
                        {
                                IDictionaryEnumerator e = 
Reader.GetEnumerator();