2005-08-02 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / mcs / class / corlib / System.Resources / ResourceSet.cs

diff --git a/mcs/class/corlib/System.Resources/ResourceSet.cs b/mcs/class/corlib/System.Resources/ResourceSet.cs
index d96df5e5fa20e454c329d2455daa050fd3d5d59d..4bbd50e13fab0aa15b6e6a21397d086bb98cc61d 100644 (file)
--- a/mcs/class/corlib/System.Resources/ResourceSet.cs
+++ b/mcs/class/corlib/System.Resources/ResourceSet.cs
@@ -1,19 +1,49 @@
 //
 // System.Resources.ResourceSet.cs
 //
-// Author:
+// Authors:
 //     Duncan Mak (duncan@ximian.com)
+//     Dick Porter (dick@ximian.com)
+//     Andreas Nahr (ClassDevelopment@A-SoftTech.com)
 //
-// (C) 2001 Ximian, Inc.               http://www.ximian.com
+// (C) 2001, 2002 Ximian, Inc.         http://www.ximian.com
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
 using System.Collections;
 using System.IO;
+using System.Globalization;
+using System.Runtime.InteropServices;
+using System.Security.Permissions;
 
 namespace System.Resources
 {
        [Serializable]
        public class ResourceSet : IDisposable
+
+#if (NET_1_1)
+                                               , IEnumerable
+#endif
+
        {
 
                protected IResourceReader Reader;
@@ -21,6 +51,7 @@ namespace System.Resources
 
                // Constructors
                protected ResourceSet () {}
+
                public ResourceSet (IResourceReader reader)
                {
                        if (reader == null)
@@ -28,13 +59,26 @@ namespace System.Resources
                        Reader = reader;
                }
 
+               [SecurityPermission (SecurityAction.LinkDemand, SerializationFormatter = true)]
                public ResourceSet (Stream stream)
                {
+                       if(stream==null) {
+                               throw new ArgumentNullException("stream is null");
+                       }
+
+                       if(!stream.CanRead) {
+                               throw new ArgumentException("stream is not readable");
+                       }
+                       
                        Reader = new ResourceReader (stream);
                }
 
                public ResourceSet (String fileName)
                {
+                       if(fileName==null) {
+                               throw new ArgumentNullException("filename is null");
+                       }
+                       
                        Reader = new ResourceReader (fileName);
                }
 
@@ -51,9 +95,13 @@ namespace System.Resources
                protected virtual void Dispose (bool disposing)
                {
                        if (disposing) {
-                               Reader = null;
-                               Table = null;
-                       } 
+                               if(Reader!=null) {
+                                       Reader.Close();
+                               }
+                       }
+
+                       Reader = null;
+                       Table = null;
                }
 
                public virtual Type GetDefaultReader ()
@@ -65,18 +113,37 @@ namespace System.Resources
                        return (typeof (ResourceWriter));
                }
 
+#if (NET_1_1)
+
+               [ComVisible (false)]
+               public virtual IDictionaryEnumerator GetEnumerator ()
+               {
+                       if (Table == null)
+                               ReadResources ();
+                       return Table.GetEnumerator(); 
+               }
+
+               IEnumerator IEnumerable.GetEnumerator ()
+               {
+                       return this.GetEnumerator (); 
+               }
+
+#endif
+
                public virtual object GetObject (string name)
                {
                        if (name == null)
                                throw new ArgumentNullException ("The name parameter is null.");
                        if (Reader == null)
                                throw new InvalidOperationException ("The ResourceSet has been closed.");
-                       if (Table == null) {
+
+                       if (Table == null) { 
                                ReadResources ();
-                               return Table[name];
-                       } else 
-                               return Table[name];
+                       }
+                       
+                       return(Table[name]);
                }
+
                public virtual object GetObject (string name, bool ignoreCase)
                {
                        if (name == null)
@@ -85,10 +152,11 @@ namespace System.Resources
                                throw new InvalidOperationException ("ResourceSet has been closed.");
                        if (Table == null)
                                ReadResources ();
+
                        if (ignoreCase) {
                                foreach (DictionaryEntry de in Table) {
                                        string key = (string) de.Key;
-                                       if (String.Compare (key, name, true) == 0)
+                                       if (String.Compare (key, name, true, CultureInfo.InvariantCulture) == 0)
                                                return de.Value;
                                }
                                return null;
@@ -99,21 +167,28 @@ namespace System.Resources
                public virtual string GetString (string name)
                {
                        Object o = GetObject (name);
+                       if (o == null)
+                               return null;
                        if (o is string)
                                return (string) o;
-                       return null;
+                       throw new InvalidOperationException("Not a string");
                }
 
                public virtual string GetString (string name, bool ignoreCase)
                {
                        Object o = GetObject (name, ignoreCase);
+                       if (o == null)
+                               return null;
                        if (o is string)
                                return (string) o;
-                       return null;
+                       throw new InvalidOperationException("Not a string");
                }
 
                protected virtual void ReadResources ()
                {
+                       if (Reader == null)
+                               throw new InvalidOperationException ("ResourceSet is closed.");
+                       
                        IDictionaryEnumerator i = Reader.GetEnumerator();
 
                        if (Table == null)