2004-04-30 Ben Maurer <bmaurer@users.sourceforge.net>

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

diff --git a/mcs/class/corlib/System.IO/CheckArgument.cs b/mcs/class/corlib/System.IO/CheckArgument.cs
index 803991695f0dec691550293f648cd02d18646d61..4b38a9f9439d046a93a0dff084226c7469e4c32a 100644 (file)
--- a/mcs/class/corlib/System.IO/CheckArgument.cs
+++ b/mcs/class/corlib/System.IO/CheckArgument.cs
@@ -15,25 +15,24 @@
 using System;
 using System.IO;
 
-namespace System.IO.Private
+namespace System.IO
 {
        /// <summary>
        /// A utility class to assist with various argument validations in System.IO
        /// </summary>
-       public sealed class CheckArgument
+       internal sealed class CheckArgument
        {
                /// <summary>
                /// Generates and exception if arg contains whitepace only
                /// </summary>
-               public static void WhitespaceOnly(string arg, string desc)
+               public static void WhitespaceOnly (string arg, string desc)
                {
-                       if(arg != null && arg.Length > 0)
+                       if (arg != null && arg.Length > 0)
                        {
-                               string temp = arg;
-                               temp.Trim();
-                               if(temp.Length == 0)
+                               string temp = arg.Trim ();
+                               if (temp.Length == 0)
                                {
-                                       throw new ArgumentException(desc);
+                                       throw new ArgumentException (desc);
                                }
                        }
                }
@@ -41,62 +40,62 @@ namespace System.IO.Private
                /// <summary>
                /// Generates and exception if arg contains whitepace only
                /// </summary>
-               public static void WhitespaceOnly(string arg)
+               public static void WhitespaceOnly (string arg)
                {
-                       WhitespaceOnly(arg, "Argument string consists of whitespace characters only.");
+                       WhitespaceOnly (arg, "Argument string consists of whitespace characters only.");
                }
                
                /// <summary>
                /// Generates and exception if arg is empty
                /// </summary>
-               public static void Empty(string arg, string desc)
+               public static void Empty (string arg, string desc)
                {
-                       if(arg != null && arg.Length == 0)
+                       if (arg != null && arg.Length == 0)
                        {
-                               throw new ArgumentException(desc);
+                               throw new ArgumentException (desc);
                        }
                }
                
                /// <summary>
                /// Generates and exception if arg is empty
                /// </summary>
-               public static void Empty(string arg)
+               public static void Empty (string arg)
                {
-                       Empty(arg, "Argument string is empty.");
+                       Empty (arg, "Argument string is empty.");
                }
                
                /// <summary>
                /// Generates and exception if arg is null
                /// </summary>
-               public static void Null(Object arg, string desc)
+               public static void Null (Object arg, string desc)
                {
-                       if(arg == null)
+                       if (arg == null)
                        {
-                               throw new ArgumentNullException(desc);
+                               throw new ArgumentNullException (desc);
                        }
                }
                
                /// <summary>
                /// Generates and exception if arg is null
                /// </summary>
-               public static void Null(Object arg)
+               public static void Null (Object arg)
                {
-                       if(arg == null)
+                       if (arg == null)
                        {
-                               throw new ArgumentNullException();
+                               throw new ArgumentNullException ();
                        }
                }
                
                /// <summary>
                /// Generates and exception if path contains invalid path characters
                /// </summary>
-               public static void PathChars(string path, string desc)
+               public static void PathChars (string path, string desc)
                {
-                       if(path != null)
+                       if (path != null)
                        {
-                               if(path.IndexOfAny(System.IO.Path.InvalidPathChars) > -1)
+                               if (path.IndexOfAny (System.IO.Path.InvalidPathChars) > -1)
                                {
-                                       throw new ArgumentException(desc);
+                                       throw new ArgumentException (desc);
                                }
                        }
                }
@@ -104,15 +103,16 @@ namespace System.IO.Private
                /// <summary>
                /// Generates and exception if path contains invalid path characters
                /// </summary>
-               public static void PathChars(string path)
+               public static void PathChars (string path)
                {
-                       PathChars(path, "Path contains invalid characters");
+                       PathChars (path, "Path contains invalid characters");
                }
                
                /// <summary>
                /// Generates and exception if path too long
                /// </summary>
-               public static void PathLength(string path, string desc)
+               [MonoTODO]
+               public static void PathLength (string path, string desc)
                {
                        //TODO: find out how long is too long
                }
@@ -120,47 +120,47 @@ namespace System.IO.Private
                /// <summary>
                /// Generates and exception if path too long
                /// </summary>
-               public static void PathLength(string path)
+               public static void PathLength (string path)
                {
-                       PathLength(path);
+                       PathLength (path, "Path is too long");
                }
                
                /// <summary>
                /// Generates and exception if path is illegal
                /// </summary>
-               public static void Path(string path, bool bAllowNull, bool bLength)
+               public static void Path (string path, bool bAllowNull, bool bLength)
                {
-                       if(path != null) //allow null
+                       if (path != null) //allow null
                        {
-                               Empty(path, "Path cannot be the empty string"); // path can't be empty
-                               WhitespaceOnly(path, "Path cannot be all whitespace");  // path can't be all whitespace
-                               PathChars(path);        // path can't contain invalid characters
-                               if(bLength)
+                               Empty (path, "Path cannot be the empty string");        // path can't be empty
+                               WhitespaceOnly (path, "Path cannot be all whitespace"); // path can't be all whitespace
+                               PathChars (path);       // path can't contain invalid characters
+                               if (bLength)
                                {
-                                       PathLength("Path too long");
+                                       PathLength ("Path too long");
                                }
                        }
-                       else if(!bAllowNull)
+                       else if (!bAllowNull)
                        {
-                               throw new ArgumentNullException("Parameter name: path");
+                               throw new ArgumentNullException ("Parameter name: path");
                        }
                }
                
                /// <summary>
                /// Generates and exception if path is illegal
                /// </summary>
-               public static void Path(string path, bool bAllowNull)
+               public static void Path (string path, bool bAllowNull)
                {
-                       Path(path, bAllowNull, false);
+                       Path (path, bAllowNull, false);
                }
                
                /// <summary>
                /// Generates and exception if path is illegal
                /// </summary>
-               public static void Path(string path)
+               public static void Path (string path)
                {
-                       Path(path, true, false);
+                       Path (path, false, false);
                }
 
        }
-}      // namespace System.IO.Private
\ No newline at end of file
+}      // namespace System.IO.Private