2005-01-31 Gonzalo Paniagua Javier <gonzalo@ximian.com>

[mono.git] / mcs / class / corlib / System.Globalization / RegionInfo.cs

diff --git a/mcs/class/corlib/System.Globalization/RegionInfo.cs b/mcs/class/corlib/System.Globalization/RegionInfo.cs
index b95e869941af084169f939bb026f4a9612cab326..47fe0aaf1333fa5c40b5c5266170329ca861c870 100644 (file)
--- a/mcs/class/corlib/System.Globalization/RegionInfo.cs
+++ b/mcs/class/corlib/System.Globalization/RegionInfo.cs
@@ -1,3 +1,26 @@
+
+//
+// Copyright (C) 2004 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.Globalization;
 
 namespace System.Globalization {
@@ -7,12 +30,7 @@ namespace System.Globalization {
                int NLS_id;
 
                public RegionInfo (int culture) {
-
-                       if (CultureInfo.IsIDNeutralCulture (culture))
-                               throw new ArgumentException ("Culture ID " + culture
-                                                        + " (0x" + culture.ToString ("X4")
-                                                        + ") is a neutral culture. A region can not be created from it.");
-
+                       
                        switch (culture) {
                        case 0x0401: // ar-SA Arabic (Saudi Arabia)
                                NLS_id = 682;
@@ -404,16 +422,21 @@ namespace System.Globalization {
                        case 0x0465: // div-MV Divehi (Maldives)
                                NLS_id = 462;
                                break;
-                       case 0x007F: //  Invariant Language (Invariant Country)
+                       case 0x007F: //  Invariant Language (Invariant Country)
                                throw new ArgumentException ("There is no region associated with the Invariant Culture (Culture ID: 0x7F).");
                        default:
+                               if (CultureInfo.IsIDNeutralCulture (culture))
+                                       throw new ArgumentException ("Culture ID " + culture
+                                                        + " (0x" + culture.ToString ("X4")
+                                                        + ") is a neutral culture. A region can not be created from it.");
+
                                throw new ArgumentException ("Culture ID " + culture + " (0x" + culture.ToString ("X4")
                                                         + ") is not a supported culture.");
                        }
                }
 
                public RegionInfo (string name) {
-                       switch (name.ToUpper ()) {
+                       switch (name.ToUpperInvariant ()) {
                        case "AF": // Afghanistan
                                NLS_id = 004;
                                break;
@@ -1136,7 +1159,7 @@ namespace System.Globalization {
                        }
                }
 
-                public virtual string CurrencySymbol {
+               public virtual string CurrencySymbol {
                        get {
                                switch (NLS_id) {
                                default:
@@ -1709,11 +1732,11 @@ namespace System.Globalization {
                //
                // methods
 
-                public override bool Equals(object value) {
+               public override bool Equals(object value) {
                        return value == this;
                }
 
-                public override int GetHashCode () {
+               public override int GetHashCode () {
                        return NLS_id.GetHashCode ();
                }