removed unused variables

[mono.git] / mcs / class / corlib / System.IO / FileLoadException.cs

diff --git a/mcs/class/corlib/System.IO/FileLoadException.cs b/mcs/class/corlib/System.IO/FileLoadException.cs
index e2399427ed8f623a79a01c4519fe2dd2d337d24b..74316fb35debb570e67dddde50e05c618ce432df 100755 (executable)
--- a/mcs/class/corlib/System.IO/FileLoadException.cs
+++ b/mcs/class/corlib/System.IO/FileLoadException.cs
@@ -8,6 +8,29 @@
 // (C) 2001 Ximian, Inc.  http://www.ximian.com
 //
 
+//
+// 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;
 using System.IO;
 using System.Runtime.Serialization;
@@ -52,8 +75,8 @@ namespace System.IO {
                public FileLoadException (string message, string fileName, Exception inner)
                        : base (message, inner)
                {
-                       this.msg = message
-                       this.fileName = fileName
+                       this.msg = message;
+                       this.fileName = fileName;
                        this.inner = inner;
                }
 
@@ -69,8 +92,7 @@ namespace System.IO {
                        get {
                                if (fileName != null)
                                        return Locale.GetText (msg + ": " + fileName);
-
-                               if (fileName == null)
+                               else
                                        return msg;
                        }
                }
@@ -93,11 +115,15 @@ namespace System.IO {
                        info.AddValue ("FileLoad_FusionLog", fusionLog);
                }
 
-               [MonoTODO (Add StackTrace into the output)]
                public override string ToString ()
                {
-                       return "System.IO.FileLoadException: " + Message;
+                       string result = GetType ().FullName + ": " + Message;
+                       if (this.InnerException != null)
+                               result +=" ----> " + InnerException;
+                       if (this.StackTrace != null)
+                               result += '\n' + StackTrace;
+
+                       return result;
                }
-               
        }
 }