diff options
Diffstat (limited to 'src/mscorlib/src/System/Resources/FileBasedResourceGroveler.cs')
| -rw-r--r-- | src/mscorlib/src/System/Resources/FileBasedResourceGroveler.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/mscorlib/src/System/Resources/FileBasedResourceGroveler.cs b/src/mscorlib/src/System/Resources/FileBasedResourceGroveler.cs index c5e92165f1..e1bbd2814a 100644 --- a/src/mscorlib/src/System/Resources/FileBasedResourceGroveler.cs +++ b/src/mscorlib/src/System/Resources/FileBasedResourceGroveler.cs @@ -13,7 +13,9 @@ ** ** ===========================================================*/ -namespace System.Resources { + +namespace System.Resources +{ using System; using System.Collections; using System.Collections.Generic; @@ -39,7 +41,7 @@ namespace System.Resources { // Consider modifying IResourceGroveler interface (hence this method signature) when we figure out // serialization compat story for moving ResourceManager members to either file-based or // manifest-based classes. Want to continue tightening the design to get rid of unused params. - public ResourceSet GrovelForResourceSet(CultureInfo culture, Dictionary<String, ResourceSet> localResourceSets, bool tryParents, bool createIfNotExists, ref StackCrawlMark stackMark) + public ResourceSet GrovelForResourceSet(CultureInfo culture, Dictionary<String, ResourceSet> localResourceSets, bool tryParents, bool createIfNotExists, ref StackCrawlMark stackMark) { Debug.Assert(culture != null, "culture shouldn't be null; check caller"); @@ -60,7 +62,7 @@ namespace System.Resources { { // We really don't think this should happen - we always // expect the neutral locale's resources to be present. - throw new MissingManifestResourceException(Environment.GetResourceString("MissingManifestResource_NoNeutralDisk") + Environment.NewLine + "baseName: " + _mediator.BaseNameField + " locationInfo: " + (_mediator.LocationInfo == null ? "<null>" : _mediator.LocationInfo.FullName) + " fileName: " + _mediator.GetResourceFileName(culture)); + throw new MissingManifestResourceException(SR.MissingManifestResource_NoNeutralDisk + Environment.NewLine + "baseName: " + _mediator.BaseNameField + " locationInfo: " + (_mediator.LocationInfo == null ? "<null>" : _mediator.LocationInfo.FullName) + " fileName: " + _mediator.GetResourceFileName(culture)); } } } @@ -90,7 +92,7 @@ namespace System.Resources { { #if _DEBUG if (ResourceManager.DEBUG >= 3) - BCLDebug.Log("FindResourceFile: checking module dir: \""+_mediator.ModuleDir+'\"'); + BCLDebug.Log("FindResourceFile: checking module dir: \"" + _mediator.ModuleDir + '\"'); #endif String path = Path.Combine(_mediator.ModuleDir, fileName); @@ -98,7 +100,7 @@ namespace System.Resources { { #if _DEBUG if (ResourceManager.DEBUG >= 3) - BCLDebug.Log("Found resource file in module dir! "+path); + BCLDebug.Log("Found resource file in module dir! " + path); #endif return path; } @@ -106,7 +108,7 @@ namespace System.Resources { #if _DEBUG if (ResourceManager.DEBUG >= 3) - BCLDebug.Log("Couldn't find resource file in module dir, checking .\\"+fileName); + BCLDebug.Log("Couldn't find resource file in module dir, checking .\\" + fileName); #endif // look in . @@ -140,7 +142,7 @@ namespace System.Resources { } catch (MissingMethodException e) { - throw new InvalidOperationException(Environment.GetResourceString("InvalidOperation_ResMgrBadResSet_Type", _mediator.UserResourceSet.AssemblyQualifiedName), e); + throw new InvalidOperationException(SR.Format(SR.InvalidOperation_ResMgrBadResSet_Type, _mediator.UserResourceSet.AssemblyQualifiedName), e); } } } |