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 b499530085ca4c330f1e4019464c8b82196b158e..4bbd50e13fab0aa15b6e6a21397d086bb98cc61d 100644 (file)
--- a/mcs/class/corlib/System.Resources/ResourceSet.cs
+++ b/mcs/class/corlib/System.Resources/ResourceSet.cs
@@ -7,11 +7,33 @@
 //     Andreas Nahr (ClassDevelopment@A-SoftTech.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
 {
@@ -37,6 +59,7 @@ namespace System.Resources
                        Reader = reader;
                }
 
+               [SecurityPermission (SecurityAction.LinkDemand, SerializationFormatter = true)]
                public ResourceSet (Stream stream)
                {
                        if(stream==null) {
@@ -133,7 +156,7 @@ namespace System.Resources
                        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;
@@ -144,6 +167,8 @@ 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;
                        throw new InvalidOperationException("Not a string");
@@ -152,6 +177,8 @@ namespace System.Resources
                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;
                        throw new InvalidOperationException("Not a string");
@@ -159,6 +186,9 @@ namespace System.Resources
 
                protected virtual void ReadResources ()
                {
+                       if (Reader == null)
+                               throw new InvalidOperationException ("ResourceSet is closed.");
+                       
                        IDictionaryEnumerator i = Reader.GetEnumerator();
 
                        if (Table == null)