Moved various classes from IceUtil to IceUtilInternal

1 files changed, 25 insertions, 25 deletions

diff --git a/java/test/IceUtil/inputUtil/Client.java b/java/test/IceUtil/inputUtil/Client.java
index bf8db9dc3b1..358920a2bac 100644
--- a/java/test/IceUtil/inputUtil/Client.java
+++ b/java/test/IceUtil/inputUtil/Client.java
@@ -27,59 +27,59 @@ public class Client
 
         try
         {
-            test(IceUtil.Options.split("").length == 0);
+            test(IceUtilInternal.Options.split("").length == 0);
             
-            args = IceUtil.Options.split("\"\"");
+            args = IceUtilInternal.Options.split("\"\"");
             test(args.length == 1 && args[0].equals(""));
-            args = IceUtil.Options.split("''");
+            args = IceUtilInternal.Options.split("''");
             test(args.length == 1 && args[0].equals(""));
-            args = IceUtil.Options.split("$''");
+            args = IceUtilInternal.Options.split("$''");
             test(args.length == 1 && args[0].equals(""));
 
-            args = IceUtil.Options.split("-a -b -c");
+            args = IceUtilInternal.Options.split("-a -b -c");
             test(args.length == 3 && args[0].equals("-a") && args[1].equals("-b") && args[2].equals("-c"));
-            args = IceUtil.Options.split("\"-a\" '-b' $'-c'");
+            args = IceUtilInternal.Options.split("\"-a\" '-b' $'-c'");
             test(args.length == 3 && args[0].equals("-a") && args[1].equals("-b") && args[2].equals("-c"));
-            args = IceUtil.Options.split("  '-b' \"-a\" $'-c' ");
+            args = IceUtilInternal.Options.split("  '-b' \"-a\" $'-c' ");
             test(args.length == 3 && args[0].equals("-b") && args[1].equals("-a") && args[2].equals("-c"));
-            args = IceUtil.Options.split(" $'-c' '-b' \"-a\"  ");
+            args = IceUtilInternal.Options.split(" $'-c' '-b' \"-a\"  ");
             test(args.length == 3 && args[0].equals("-c") && args[1].equals("-b") && args[2].equals("-a"));
 
             // Testing single quote
-            args = IceUtil.Options.split("-Dir='C:\\\\test\\\\file'"); // -Dir='C:\\test\\file'
+            args = IceUtilInternal.Options.split("-Dir='C:\\\\test\\\\file'"); // -Dir='C:\\test\\file'
             test(args.length == 1 && args[0].equals("-Dir=C:\\\\test\\\\file")); // -Dir=C:\\test\\file
-            args = IceUtil.Options.split("-Dir='C:\\test\\file'"); // -Dir='C:\test\file'
+            args = IceUtilInternal.Options.split("-Dir='C:\\test\\file'"); // -Dir='C:\test\file'
             test(args.length == 1 && args[0].equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file
-            args = IceUtil.Options.split("-Dir='C:\\test\\filewith\"quote'"); // -Dir='C:\test\filewith"quote'
+            args = IceUtilInternal.Options.split("-Dir='C:\\test\\filewith\"quote'"); // -Dir='C:\test\filewith"quote'
             test(args.length == 1 && args[0].equals("-Dir=C:\\test\\filewith\"quote")); // -Dir=C:\test\filewith"quote
 
             // Testing double quote
-            args = IceUtil.Options.split("-Dir=\"C:\\\\test\\\\file\""); // -Dir="C:\\test\\file"
+            args = IceUtilInternal.Options.split("-Dir=\"C:\\\\test\\\\file\""); // -Dir="C:\\test\\file"
             test(args.length == 1 && args[0].equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file
-                 args = IceUtil.Options.split("-Dir=\"C:\\test\\file\""); // -Dir="C:\test\file"
+                 args = IceUtilInternal.Options.split("-Dir=\"C:\\test\\file\""); // -Dir="C:\test\file"
                  test(args.length == 1 && args[0].equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file
-            args = IceUtil.Options.split("-Dir=\"C:\\test\\filewith\\\"quote\""); // -Dir="C:\test\filewith\"quote"
+            args = IceUtilInternal.Options.split("-Dir=\"C:\\test\\filewith\\\"quote\""); // -Dir="C:\test\filewith\"quote"
             test(args.length == 1 && args[0].equals("-Dir=C:\\test\\filewith\"quote")); // -Dir=C:\test\filewith"quote
 
             // Testing ANSI quote
-            args = IceUtil.Options.split("-Dir=$'C:\\\\test\\\\file'"); // -Dir=$'C:\\test\\file'
+            args = IceUtilInternal.Options.split("-Dir=$'C:\\\\test\\\\file'"); // -Dir=$'C:\\test\\file'
             test(args.length == 1 && args[0].equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file
-            args = IceUtil.Options.split("-Dir=$'C:\\oest\\oile'"); // -Dir='C:\oest\oile'
+            args = IceUtilInternal.Options.split("-Dir=$'C:\\oest\\oile'"); // -Dir='C:\oest\oile'
             test(args.length == 1 && args[0].equals("-Dir=C:\\oest\\oile")); // -Dir=C:\oest\oile
-            args = IceUtil.Options.split("-Dir=$'C:\\oest\\oilewith\"quote'"); // -Dir=$'C:\oest\oilewith"quote'
+            args = IceUtilInternal.Options.split("-Dir=$'C:\\oest\\oilewith\"quote'"); // -Dir=$'C:\oest\oilewith"quote'
             test(args.length == 1 && args[0].equals("-Dir=C:\\oest\\oilewith\"quote")); // -Dir=C:\oest\oilewith"quote
-            args = IceUtil.Options.split("-Dir=$'\\103\\072\\134\\164\\145\\163\\164\\134\\146\\151\\154\\145'");
+            args = IceUtilInternal.Options.split("-Dir=$'\\103\\072\\134\\164\\145\\163\\164\\134\\146\\151\\154\\145'");
             test(args.length == 1 && args[0].equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file
-            args = IceUtil.Options.split("-Dir=$'\\x43\\x3A\\x5C\\x74\\x65\\x73\\x74\\x5C\\x66\\x69\\x6C\\x65'");
+            args = IceUtilInternal.Options.split("-Dir=$'\\x43\\x3A\\x5C\\x74\\x65\\x73\\x74\\x5C\\x66\\x69\\x6C\\x65'");
             test(args.length == 1 && args[0].equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file
-            args = IceUtil.Options.split("-Dir=$'\\cM\\c_'"); // Control characters
+            args = IceUtilInternal.Options.split("-Dir=$'\\cM\\c_'"); // Control characters
             test(args.length == 1 && args[0].equals("-Dir=\015\037"));
-            args = IceUtil.Options.split("-Dir=$'C:\\\\\\146\\x66\\cMi'"); // -Dir=$'C:\\\146\x66i\cMi'
+            args = IceUtilInternal.Options.split("-Dir=$'C:\\\\\\146\\x66\\cMi'"); // -Dir=$'C:\\\146\x66i\cMi'
             test(args.length == 1 && args[0].equals("-Dir=C:\\ff\015i"));
-            args = IceUtil.Options.split("-Dir=$'C:\\\\\\cM\\x66\\146i'"); // -Dir=$'C:\\\cM\x66\146i'
+            args = IceUtilInternal.Options.split("-Dir=$'C:\\\\\\cM\\x66\\146i'"); // -Dir=$'C:\\\cM\x66\146i'
             test(args.length == 1 && args[0].equals("-Dir=C:\\\015ffi"));
         }
-        catch(IceUtil.Options.BadQuote ex)
+        catch(IceUtilInternal.Options.BadQuote ex)
         {
             test(false);
         }
@@ -95,10 +95,10 @@ public class Client
         {
             try
             {
-                IceUtil.Options.split(badQuoteCommands[i]);
+                IceUtilInternal.Options.split(badQuoteCommands[i]);
                 test(false);
             }
-            catch(IceUtil.Options.BadQuote ex)
+            catch(IceUtilInternal.Options.BadQuote ex)
             {
             }
         }