Update VS project files

[mono.git] / mcs / class / corlib / System.Text / EncodingInfo.cs

diff --git a/mcs/class/corlib/System.Text/EncodingInfo.cs b/mcs/class/corlib/System.Text/EncodingInfo.cs
index 0556dcf3da2aa251697bfb25021338312c0d18bd..fd2b7a19de3c7d31391c0d5512d429dd5d00d74c 100644 (file)
--- a/mcs/class/corlib/System.Text/EncodingInfo.cs
+++ b/mcs/class/corlib/System.Text/EncodingInfo.cs
@@ -1,12 +1,12 @@
 //
-// EncodingInfo.cs
+// System.Text.EncodingInfo.cs
 //
 // Author:
 //     Atsushi Enomoto <atsushi@ximian.com>
 //
 
 //
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2006 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
@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 namespace System.Text
 {
@@ -36,40 +35,40 @@ namespace System.Text
        public sealed class EncodingInfo
        {
                readonly int codepage;
-               readonly string display_name;
-               readonly string name;
+               Encoding encoding;
 
-               internal EncodingInfo (int cp, string displayName, string name)
+               internal EncodingInfo (int cp)
                {
                        codepage = cp;
-                       display_name = displayName;
-                       this.name = name;
                }
 
                public int CodePage {
                        get { return codepage; }
                }
 
+               [MonoTODO]
                public string DisplayName {
-                       get { return display_name; }
+                       get { return Name; }
                }
 
                public string Name {
-                       get { return name; }
+                       get {
+                               if (encoding == null)
+                                       encoding = GetEncoding ();
+                               return encoding.WebName;
+                       }
                }
 
-               public override bool Equals (object other)
+               public override bool Equals (object value)
                {
-                       EncodingInfo ei = other as EncodingInfo;
+                       EncodingInfo ei = value as EncodingInfo;
                        return ei != null &&
-                               ei.codepage == codepage &&
-                               ei.name == name &&
-                               ei.display_name == display_name;
+                               ei.codepage == codepage;
                }
 
                public override int GetHashCode ()
                {
-                       return codepage + (display_name.GetHashCode () ^ name.GetHashCode ()) << 16;
+                       return codepage;
                }
 
                public Encoding GetEncoding ()
@@ -78,5 +77,3 @@ namespace System.Text
                }
        }
 }
-
-#endif