String.Split(char[],int,StringSplitOptions) should remove empty entries while

[mono.git] / mcs / class / corlib / System / TypeLoadException.cs

diff --git a/mcs/class/corlib/System/TypeLoadException.cs b/mcs/class/corlib/System/TypeLoadException.cs
index d498d2b661c2e7d41aaa6d8af39f22f56cea05e5..fb47a8d77014d5551aa33d5e51a5d4be52a64eaf 100644 (file)
--- a/mcs/class/corlib/System/TypeLoadException.cs
+++ b/mcs/class/corlib/System/TypeLoadException.cs
@@ -1,65 +1,121 @@
 //
-// System.TypeLoadException
+// System.TypeLoadException.cs
 //
-// Author:
+// Authors:
 //   Sean MacIsaac (macisaac@ximian.com)
 //   Duncan Mak  (duncan@ximian.com)
 //
 // (C) 2001 Ximian, Inc.  http://www.ximian.com
 //
 
-using System.Globalization;
-using System.Runtime.Serialization;
+//
+// 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.
+//
 
-namespace System {
+using System.Runtime.Serialization;
+using System.Runtime.InteropServices;
 
+namespace System
+{
        [Serializable]
-       public class TypeLoadException : SystemException {
-
-               // Fields
-               private string msg;
-               private string type;
+#if NET_2_0
+       [ComVisible (true)]
+#endif
+       public class TypeLoadException : SystemException
+       {
+               const int Result = unchecked ((int)0x80131522);
                
-                // Constructors
+               // Fields
+               private string className, assemblyName;
+
+               // Constructors
                public TypeLoadException ()
                        : base (Locale.GetText ("A type load exception has occurred."))
                {
+                       HResult = Result;
                }
 
                public TypeLoadException (string message)
                        : base (message)
                {
+                       HResult = Result;
                }
 
                public TypeLoadException (string message, Exception inner)
                        : base (message, inner)
                {
+                       HResult = Result;
                }
 
-               public TypeLoadException (SerializationInfo info,
-                                         StreamingContext context)
-                       : base (info, context)
+               internal TypeLoadException (string className, string assemblyName) : this ()
                {
+                       this.className = className;
+                       this.assemblyName = assemblyName;
                }
 
-               // Methods
-               [MonoTODO]
-               public override void GetObjectData (SerializationInfo info,
-                                                   StreamingContext context)
+               protected TypeLoadException (SerializationInfo info, StreamingContext context)
+                       : base (info, context)
                {
+                       if (info == null)
+                               throw new ArgumentNullException ("info");
+
+                       className = info.GetString ("TypeLoadClassName");
+                       assemblyName = info.GetString ("TypeLoadAssemblyName");
                }
 
                // Properties
-               [MonoTODO]
-               public override string Message
-               {
-                       get { return null; }
+               public override string Message {
+                       get {
+                               if (className != null) {
+                                       if ((assemblyName != null) && (assemblyName != String.Empty))
+                                               return String.Format ("Could not load type '{0}' from assembly '{1}'.", className, assemblyName);
+                                       else
+                                               return String.Format ("Could not load type '{0}'.", className);
+                               }
+                               else
+                                       return base.Message;
+                       }
                }
 
-               [MonoTODO]
-               public string TypeName
+               public string TypeName {
+                       get { 
+                               if (className == null)
+                                       return String.Empty;
+                               else
+                                       return className;
+                       }
+               }
+
+               // Methods
+               public override void GetObjectData (SerializationInfo info, StreamingContext context)
                {
-                       get { return null; }
+                       if (info == null)
+                               throw new ArgumentNullException ("info");
+
+                       base.GetObjectData (info, context);
+                       info.AddValue ("TypeLoadClassName", className, typeof (string)); 
+                       info.AddValue ("TypeLoadAssemblyName", assemblyName, typeof (string)); 
+                       info.AddValue ("TypeLoadMessageArg", "", typeof (string)); 
+                       info.AddValue ("TypeLoadResourceID", 0, typeof (int)); 
                }
        }
 }