This commit was manufactured by cvs2svn to create branch 'mono-1-0'.

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

diff --git a/mcs/class/corlib/System/ArgumentOutOfRangeException.cs b/mcs/class/corlib/System/ArgumentOutOfRangeException.cs
index 5e3462cf64a353c43ed1a05e83ef94abc6146c50..826dd38eb6bd6ec3e0f5ccdf261ec1a7eb3ed3bc 100644 (file)
--- a/mcs/class/corlib/System/ArgumentOutOfRangeException.cs
+++ b/mcs/class/corlib/System/ArgumentOutOfRangeException.cs
@@ -1,41 +1,72 @@
 //
 // System.ArgumentOutOfRangeException.cs
 //
-// Author:
+// Authors:
 //   Joe Shaw (joe@ximian.com)
 //   Duncan Mak (duncan@ximian.com)
+//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
 //
 // (C) 2001 Ximian, Inc.  http://www.ximian.com
 //
 
-using System.Globalization;
+//
+// 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.Runtime.Serialization;
 
-namespace System {
+namespace System
+{
+       [Serializable]
+       public class ArgumentOutOfRangeException : ArgumentException
+       {
+               const int Result = unchecked ((int)0x80131502);
 
-       public class ArgumentOutOfRangeException : ArgumentException {
                private object actual_value;
 
                // Constructors
                public ArgumentOutOfRangeException ()
-                       : base (Locale.GetText ("Argument is out of range"))
+                       : base (Locale.GetText ("Argument is out of range."))
                {
+                       HResult = Result;
                }
 
-               public ArgumentOutOfRangeException (string param_name)
-                       : base (Locale.GetText ("Argument is out of range"), param_name)
+               public ArgumentOutOfRangeException (string paramName)
+                       : base (Locale.GetText ("Argument is out of range."), paramName)
                {
+                       HResult = Result;
                }
 
-               public ArgumentOutOfRangeException (string param_name, string message)
-                       : base (message, param_name)
+               public ArgumentOutOfRangeException (string paramName, string message)
+                       : base (message, paramName)
                {
+                       HResult = Result;
                }
 
-               public ArgumentOutOfRangeException (string param_name, object actual_value, string message)
-                       : base (message, param_name)
+               public ArgumentOutOfRangeException (string paramName, object actualValue, string message)
+                       : base (message, paramName)
                {
-                       this.actual_value = actual_value;
+                       this.actual_value = actualValue;
+                       HResult = Result;
                }
 
                protected ArgumentOutOfRangeException (SerializationInfo info, StreamingContext context)
@@ -43,7 +74,7 @@ namespace System {
                {
                        actual_value = info.GetString ("ActualValue");
                }
- 
+
                // Properties
                public virtual object ActualValue {
                        get {
@@ -51,12 +82,20 @@ namespace System {
                        }
                }
 
+               public override string Message {
+                       get {
+                               string basemsg = base.Message;
+                               if (actual_value == null)
+                                       return basemsg;
+                               return basemsg + Environment.NewLine + actual_value;
+                       }
+               }
+
                // Methods
                public override void GetObjectData (SerializationInfo info, StreamingContext context)
                {
                        base.GetObjectData (info, context);
                        info.AddValue ("ActualValue", actual_value);
                }
-               
        }
 }