diff options
Diffstat (limited to 'src/mscorlib/src/System/Resources/ResourceSet.cs')
| -rw-r--r-- | src/mscorlib/src/System/Resources/ResourceSet.cs | 62 |
1 files changed, 36 insertions, 26 deletions
diff --git a/src/mscorlib/src/System/Resources/ResourceSet.cs b/src/mscorlib/src/System/Resources/ResourceSet.cs index 8fd9346f91..8775f6411a 100644 --- a/src/mscorlib/src/System/Resources/ResourceSet.cs +++ b/src/mscorlib/src/System/Resources/ResourceSet.cs @@ -12,7 +12,9 @@ ** ** ===========================================================*/ -namespace System.Resources { + +namespace System.Resources +{ using System; using System.Collections; using System.IO; @@ -75,7 +77,7 @@ namespace System.Resources { ReadResources(); } #endif // LOOSELY_LINKED_RESOURCE_REFERENCE - + // Creates a ResourceSet using the system default ResourceReader // implementation. Use this constructor to read from an open stream // of data. @@ -119,7 +121,7 @@ namespace System.Resources { ReadResources(); } #endif // LOOSELY_LINKED_RESOURCE_REFERENCE - + private void CommonInit() { Table = new Hashtable(); @@ -133,10 +135,11 @@ namespace System.Resources { { Dispose(true); } - + protected virtual void Dispose(bool disposing) { - if (disposing) { + if (disposing) + { // Close the Reader in a thread-safe way. IResourceReader copyOfReader = Reader; Reader = null; @@ -169,7 +172,7 @@ namespace System.Resources { { return typeof(ResourceReader); } - + // Returns the preferred IResourceWriter class for this kind of ResourceSet. // Subclasses of ResourceSet using their own Readers &; should override // GetDefaultReader and GetDefaultWriter. @@ -183,7 +186,6 @@ namespace System.Resources { return GetEnumeratorHelper(); } - /// <internalonly/> IEnumerator IEnumerable.GetEnumerator() { return GetEnumeratorHelper(); @@ -193,7 +195,7 @@ namespace System.Resources { { Hashtable copyOfTable = Table; // Avoid a race with Dispose if (copyOfTable == null) - throw new ObjectDisposedException(null, Environment.GetResourceString("ObjectDisposed_ResourceSet")); + throw new ObjectDisposedException(null, SR.ObjectDisposed_ResourceSet); return copyOfTable.GetEnumerator(); } @@ -202,11 +204,13 @@ namespace System.Resources { public virtual String GetString(String name) { Object obj = GetObjectInternal(name); - try { + try + { return (String)obj; } - catch (InvalidCastException) { - throw new InvalidOperationException(Environment.GetResourceString("InvalidOperation_ResourceNotString_Name", name)); + catch (InvalidCastException) + { + throw new InvalidOperationException(SR.Format(SR.InvalidOperation_ResourceNotString_Name, name)); } } @@ -217,28 +221,33 @@ namespace System.Resources { // Case-sensitive lookup obj = GetObjectInternal(name); - try { + try + { s = (String)obj; } - catch (InvalidCastException) { - throw new InvalidOperationException(Environment.GetResourceString("InvalidOperation_ResourceNotString_Name", name)); + catch (InvalidCastException) + { + throw new InvalidOperationException(SR.Format(SR.InvalidOperation_ResourceNotString_Name, name)); } // case-sensitive lookup succeeded - if (s != null || !ignoreCase) { + if (s != null || !ignoreCase) + { return s; - } + } // Try doing a case-insensitive lookup obj = GetCaseInsensitiveObjectInternal(name); - try { + try + { return (String)obj; } - catch (InvalidCastException) { - throw new InvalidOperationException(Environment.GetResourceString("InvalidOperation_ResourceNotString_Name", name)); + catch (InvalidCastException) + { + throw new InvalidOperationException(SR.Format(SR.InvalidOperation_ResourceNotString_Name, name)); } } - + // Look up an object value for a resource given its name. // public virtual Object GetObject(String name) @@ -249,17 +258,18 @@ namespace System.Resources { public virtual Object GetObject(String name, bool ignoreCase) { Object obj = GetObjectInternal(name); - + if (obj != null || !ignoreCase) return obj; return GetCaseInsensitiveObjectInternal(name); } - + protected virtual void ReadResources() { IDictionaryEnumerator en = Reader.GetEnumerator(); - while (en.MoveNext()) { + while (en.MoveNext()) + { Object value = en.Value; #if LOOSELY_LINKED_RESOURCE_REFERENCE if (Assembly != null && value is LooselyLinkedResourceReference) { @@ -282,7 +292,7 @@ namespace System.Resources { Hashtable copyOfTable = Table; // Avoid a race with Dispose if (copyOfTable == null) - throw new ObjectDisposedException(null, Environment.GetResourceString("ObjectDisposed_ResourceSet")); + throw new ObjectDisposedException(null, SR.ObjectDisposed_ResourceSet); return copyOfTable[name]; } @@ -292,7 +302,7 @@ namespace System.Resources { Hashtable copyOfTable = Table; // Avoid a race with Dispose if (copyOfTable == null) - throw new ObjectDisposedException(null, Environment.GetResourceString("ObjectDisposed_ResourceSet")); + throw new ObjectDisposedException(null, SR.ObjectDisposed_ResourceSet); Hashtable caseTable = _caseInsensitiveTable; // Avoid a race condition with Close if (caseTable == null) @@ -300,7 +310,7 @@ namespace System.Resources { caseTable = new Hashtable(StringComparer.OrdinalIgnoreCase); #if _DEBUG //Console.WriteLine("ResourceSet::GetObject loading up case-insensitive data"); - BCLDebug.Perf(false, "Using case-insensitive lookups is bad perf-wise. Consider capitalizing "+name+" correctly in your source"); + BCLDebug.Perf(false, "Using case-insensitive lookups is bad perf-wise. Consider capitalizing " + name + " correctly in your source"); #endif IDictionaryEnumerator en = copyOfTable.GetEnumerator(); |