Author: atsushi
Date: 2005-11-28 06:24:12 -0500 (Mon, 28 Nov 2005)
New Revision: 53545
Added:
trunk/mcs/class/corlib/System.Text/EncodingInfo.cs
Modified:
trunk/mcs/class/corlib/ChangeLog
trunk/mcs/class/corlib/System.Text/ChangeLog
trunk/mcs/class/corlib/corlib.dll.sources
Log:
2005-11-28 Atsushi Enomoto <[EMAIL PROTECTED]>
* corlib.dll.sources: added EncodingInfo.cs.
* EncodingInfo.cs : new file.
Modified: trunk/mcs/class/corlib/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/ChangeLog 2005-11-28 10:34:41 UTC (rev 53544)
+++ trunk/mcs/class/corlib/ChangeLog 2005-11-28 11:24:12 UTC (rev 53545)
@@ -1,5 +1,9 @@
2005-11-28 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * corlib.dll.sources: added EncodingInfo.cs.
+
+2005-11-28 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* corlib.dll.sources: added UTF32Encoding.cs.
2005-11-17 Zoltan Varga <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/corlib/System.Text/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Text/ChangeLog 2005-11-28 10:34:41 UTC
(rev 53544)
+++ trunk/mcs/class/corlib/System.Text/ChangeLog 2005-11-28 11:24:12 UTC
(rev 53545)
@@ -1,5 +1,9 @@
2005-11-28 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * EncodingInfo.cs : new file.
+
+2005-11-28 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* UTF32Encoding.cs : Sealed. Added the overload which has
throwOnInvalid parameter.
* NormalizationForm.cs : removed [Serializable].
Added: trunk/mcs/class/corlib/System.Text/EncodingInfo.cs
===================================================================
--- trunk/mcs/class/corlib/System.Text/EncodingInfo.cs 2005-11-28 10:34:41 UTC
(rev 53544)
+++ trunk/mcs/class/corlib/System.Text/EncodingInfo.cs 2005-11-28 11:24:12 UTC
(rev 53545)
@@ -0,0 +1,82 @@
+//
+// EncodingInfo.cs
+//
+// Author:
+// Atsushi Enomoto <[EMAIL PROTECTED]>
+//
+
+//
+// Copyright (C) 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.
+//
+
+#if NET_2_0
+
+namespace System.Text
+{
+ [Serializable]
+ public sealed class EncodingInfo
+ {
+ readonly int codepage;
+ readonly string display_name;
+ readonly string name;
+
+ internal EncodingInfo (int cp, string displayName, string name)
+ {
+ codepage = cp;
+ display_name = displayName;
+ this.name = name;
+ }
+
+ public int CodePage {
+ get { return codepage; }
+ }
+
+ public string DisplayName {
+ get { return display_name; }
+ }
+
+ public string Name {
+ get { return name; }
+ }
+
+ public override bool Equals (object other)
+ {
+ EncodingInfo ei = other as EncodingInfo;
+ return ei != null &&
+ ei.codepage == codepage &&
+ ei.name == name &&
+ ei.display_name == display_name;
+ }
+
+ public override int GetHashCode ()
+ {
+ return codepage + (display_name.GetHashCode () ^
name.GetHashCode ()) << 16;
+ }
+
+ public Encoding GetEncoding ()
+ {
+ return Encoding.GetEncoding (codepage);
+ }
+ }
+}
+
+#endif
Property changes on: trunk/mcs/class/corlib/System.Text/EncodingInfo.cs
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/mcs/class/corlib/corlib.dll.sources
===================================================================
--- trunk/mcs/class/corlib/corlib.dll.sources 2005-11-28 10:34:41 UTC (rev
53544)
+++ trunk/mcs/class/corlib/corlib.dll.sources 2005-11-28 11:24:12 UTC (rev
53545)
@@ -1258,6 +1258,7 @@
System.Text/EncoderReplacementFallback.cs
System.Text/EncoderReplacementFallbackBuffer.cs
System.Text/Encoding.cs
+System.Text/EncodingInfo.cs
System.Text/Latin1Encoding.cs
System.Text/NormalizationForm.cs
System.Text/StringBuilder.cs
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
