[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Resources ECMAResourceManager.cs,NONE,1.1 IResourceReader.cs,1.2,1.3 IResourceWriter.cs,1.2,1.3MissingManifestResourceException.cs,1.6,1.7 NeutralResourcesLanguageAttribute.cs,1.1,1.2 README.ECMA,1.1,1.2 ResourceManager.cs,1.9,1.10 ResourceReader.cs,1.3,1.4 ResourceSet.cs,1.4,1.5 ResourceWriter.cs,1.1,1.2 SatelliteContractVersionAttribute.cs,1.1,1.2

[Rhys Weatherley <address@hidden>]

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

Modified Files:
        IResourceReader.cs IResourceWriter.cs 
        MissingManifestResourceException.cs 
        NeutralResourcesLanguageAttribute.cs README.ECMA 
        ResourceManager.cs ResourceReader.cs ResourceSet.cs 
        ResourceWriter.cs SatelliteContractVersionAttribute.cs 
Added Files:
        ECMAResourceManager.cs 
Log Message:


Mark the contents of "System.Resources" as non-ECMA and introduce
a cut-down resource API for use in ECMA_COMPAT mode in the other assemblies.


--- NEW FILE ---
/*
 * ECMAResourceManager.cs - Implementation of the
 *              "System.Resources.ECMAResourceManager" class.
 *
 * Copyright (C) 2003  Southern Storm Software, Pty Ltd.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

namespace System.Resources
{

#if ECMA_COMPAT

using System;
using System.Globalization;
using System.Reflection;

// This class is intended to be used by other library assemblies
// in ECMA_COMPAT mode, when ResourceManager is not available.
// Use of this class in non-pnetlib code is not recommended.

public sealed class ECMAResourceManager
{
        // Internal state.
        private ResourceManager manager;

        // Constructor.
        public ECMAResourceManager(String baseName, Assembly assembly)
                        {
                                manager = new ResourceManager(baseName, 
assembly);
                        }

        // Get a string from this resource manager.
        public String GetString(String name)
                        {
                                return manager.GetString(name, null);
                        }
        public String GetString(String name, CultureInfo culture)
                        {
                                return manager.GetString(name, culture);
                        }

}; // class ECMAResourceManager

#endif // ECMA_COMPAT

}; // namespace System.Resources

Index: IResourceReader.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Resources/IResourceReader.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** IResourceReader.cs  12 Apr 2002 07:19:26 -0000      1.2
--- IResourceReader.cs  15 Apr 2003 01:48:05 -0000      1.3
***************
*** 26,30 ****
  using System.Collections;
  
! public interface IResourceReader : IEnumerable, IDisposable
  {
  
--- 26,35 ----
  using System.Collections;
  
! #if ECMA_COMPAT
! internal
! #else
! public
! #endif
! interface IResourceReader : IEnumerable, IDisposable
  {
  

Index: IResourceWriter.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Resources/IResourceWriter.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** IResourceWriter.cs  12 Apr 2002 07:19:26 -0000      1.2
--- IResourceWriter.cs  15 Apr 2003 01:48:05 -0000      1.3
***************
*** 25,29 ****
  using System;
  
! public interface IResourceWriter : IDisposable
  {
  
--- 25,34 ----
  using System;
  
! #if ECMA_COMPAT
! internal
! #else
! public
! #endif
! interface IResourceWriter : IDisposable
  {
  

Index: MissingManifestResourceException.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Resources/MissingManifestResourceException.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** MissingManifestResourceException.cs 7 Apr 2003 04:22:51 -0000       1.6
--- MissingManifestResourceException.cs 15 Apr 2003 01:48:05 -0000      1.7
***************
*** 26,30 ****
  using System.Runtime.Serialization;
  
! public class MissingManifestResourceException : Exception
  {
  
--- 26,35 ----
  using System.Runtime.Serialization;
  
! #if ECMA_COMPAT
! internal
! #else
! public
! #endif
! class MissingManifestResourceException : Exception
  {
  

Index: NeutralResourcesLanguageAttribute.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Resources/NeutralResourcesLanguageAttribute.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** NeutralResourcesLanguageAttribute.cs        10 Nov 2001 23:21:59 -0000      
1.1
--- NeutralResourcesLanguageAttribute.cs        15 Apr 2003 01:48:05 -0000      
1.2
***************
*** 26,30 ****
  
  [AttributeUsage(AttributeTargets.Assembly)]
! public sealed class NeutralResourcesLanguageAttribute : Attribute
  {
  
--- 26,35 ----
  
  [AttributeUsage(AttributeTargets.Assembly)]
! #if ECMA_COMPAT
! internal
! #else
! public
! #endif
! sealed class NeutralResourcesLanguageAttribute : Attribute
  {
  

Index: README.ECMA
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Resources/README.ECMA,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** README.ECMA 12 Apr 2002 07:19:26 -0000      1.1
--- README.ECMA 15 Apr 2003 01:48:05 -0000      1.2
***************
*** 1,3 ****
! The "System.Resources" classes are not strictly ECMA-compatible,
! but it is next to impossible to build a useful set of ECMA
! assemblies without some degree of resource support.
--- 1,4 ----
! The "System.Resources" classes are not ECMA-compatible, so we cannot
! export them when ECMA_COMPAT is set.  However, we do need to access
! string resources from other library assemblies.  "ECMAResourceManager"
! is defined in ECMA_COMPAT mode to get around this.

Index: ResourceManager.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Resources/ResourceManager.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** ResourceManager.cs  7 Apr 2003 06:32:05 -0000       1.9
--- ResourceManager.cs  15 Apr 2003 01:48:05 -0000      1.10
***************
*** 30,34 ****
  using System.Private;
  
! public class ResourceManager
  {
        // Current version supported by this resource manager implementation.
--- 30,39 ----
  using System.Private;
  
! #if ECMA_COMPAT
! internal
! #else
! public
! #endif
! class ResourceManager
  {
        // Current version supported by this resource manager implementation.

Index: ResourceReader.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Resources/ResourceReader.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ResourceReader.cs   16 Jun 2002 05:53:03 -0000      1.3
--- ResourceReader.cs   15 Apr 2003 01:48:05 -0000      1.4
***************
*** 28,32 ****
  using System.Text;
  
! public sealed class ResourceReader : IEnumerable, IDisposable, IResourceReader
  {
        // Internal state.
--- 28,37 ----
  using System.Text;
  
! #if ECMA_COMPAT
! internal
! #else
! public
! #endif
! sealed class ResourceReader : IEnumerable, IDisposable, IResourceReader
  {
        // Internal state.

Index: ResourceSet.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Resources/ResourceSet.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ResourceSet.cs      13 Apr 2002 07:08:07 -0000      1.4
--- ResourceSet.cs      15 Apr 2003 01:48:05 -0000      1.5
***************
*** 28,32 ****
  using System.Globalization;
  
! public class ResourceSet : IDisposable
  {
        // Internal state.
--- 28,37 ----
  using System.Globalization;
  
! #if ECMA_COMPAT
! internal
! #else
! public
! #endif
! class ResourceSet : IDisposable
  {
        // Internal state.

Index: ResourceWriter.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Resources/ResourceWriter.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ResourceWriter.cs   13 Apr 2002 07:05:19 -0000      1.1
--- ResourceWriter.cs   15 Apr 2003 01:48:05 -0000      1.2
***************
*** 28,32 ****
  using System.Globalization;
  
! public sealed class ResourceWriter : IDisposable, IResourceWriter
  {
        // Internal state.
--- 28,37 ----
  using System.Globalization;
  
! #if ECMA_COMPAT
! internal
! #else
! public
! #endif
! sealed class ResourceWriter : IDisposable, IResourceWriter
  {
        // Internal state.

Index: SatelliteContractVersionAttribute.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Resources/SatelliteContractVersionAttribute.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SatelliteContractVersionAttribute.cs        10 Nov 2001 23:21:59 -0000      
1.1
--- SatelliteContractVersionAttribute.cs        15 Apr 2003 01:48:05 -0000      
1.2
***************
*** 26,30 ****
  
  [AttributeUsage(AttributeTargets.Assembly)]
! public sealed class SatelliteContractVersionAttribute : Attribute
  {
  
--- 26,35 ----
  
  [AttributeUsage(AttributeTargets.Assembly)]
! #if ECMA_COMPAT
! internal
! #else
! public
! #endif
! sealed class SatelliteContractVersionAttribute : Attribute
  {