commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roxspr...@apache.org
Subject svn commit: r155293 - in jakarta/commons/proper/cli/trunk/src: java/org/apache/commons/cli/ java/org/apache/commons/cli2/ java/org/apache/commons/cli2/builder/ java/org/apache/commons/cli2/option/ java/org/apache/commons/cli2/util/ java/org/apache/commons/cli2/validation/ test/org/apache/commons/cli2/ test/org/apache/commons/cli2/application/ test/org/apache/commons/cli2/bug/ test/org/apache/commons/cli2/builder/ test/org/apache/commons/cli2/commandline/ test/org/apache/commons/cli2/option/ test/org/apache/commons/cli2/util/ test/org/apache/commons/cli2/validation/ test/org/apache/commons/cli2/validation/protect/
Date Fri, 25 Feb 2005 03:22:08 GMT
Author: roxspring
Date: Thu Feb 24 19:21:58 2005
New Revision: 155293

URL: http://svn.apache.org/viewcvs?view=rev&rev=155293
Log:
Lots of minor refactoring and tidying to avoid compiler warnings

Modified:
    jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/CommandLine.java
    jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/HelpFormatter.java
    jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/OptionBuilder.java
    jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/Options.java
    jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/Parser.java
    jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/PatternOptionBuilder.java
    jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/DisplaySetting.java
    jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/Option.java
    jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/OptionException.java
    jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/builder/DefaultOptionBuilder.java
    jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/builder/SwitchBuilder.java
    jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/ArgumentImpl.java
    jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/util/Comparators.java
    jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/validation/ClassValidator.java
    jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/validation/FileValidator.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/CommandLineTestCase.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/PrecedenceTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/WriteableCommandLineTestCase.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/application/CpTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/Bug28005Test.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/Bug32533Test.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/builder/DefaultOptionBuilderTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/commandline/DefaultingCommandLineTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/ArgumentTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/CommandTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/DefaultOptionTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/GroupTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/NestedGroupTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/PropertyOptionTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/SwitchTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/util/ComparatorsTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/EnumValidatorTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/FileValidatorTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/NumberValidatorTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/UrlValidatorTest.java
    jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/protect/ProtectedClass.java

Modified: jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/CommandLine.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/CommandLine.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/CommandLine.java (original)
+++ jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/CommandLine.java Thu Feb 24 19:21:58 2005
@@ -59,6 +59,7 @@
      */
     CommandLine()
     {
+        // nothing to do
     }
 
     /** 
@@ -149,8 +150,6 @@
      */
     public String[] getOptionValues(String opt)
     {
-        List values = new java.util.ArrayList();
-
         opt = Util.stripLeadingHyphens(opt);
 
         String key = opt;

Modified: jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/HelpFormatter.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/HelpFormatter.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/HelpFormatter.java (original)
+++ jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/HelpFormatter.java Thu Feb 24 19:21:58 2005
@@ -751,10 +751,7 @@
 
             return sb;
         }
-        else
-        {
-            sb.append(rtrim(text.substring(0, pos))).append(defaultNewLine);
-        }
+        sb.append(rtrim(text.substring(0, pos))).append(defaultNewLine);
 
         // all following lines must be padded with nextLineTabStop space 
         // characters
@@ -821,20 +818,18 @@
         {
             return pos;
         }
-        else
-        {
-            // must look for the first whitespace chearacter after startPos 
-            // + width
-            pos = startPos + width;
-
-            while ((pos <= text.length()) && ((c = text.charAt(pos)) != ' ')
-                   && (c != '\n') && (c != '\r'))
-            {
-                ++pos;
-            }
+        
+        // must look for the first whitespace chearacter after startPos 
+        // + width
+        pos = startPos + width;
 
-            return (pos == text.length())        ? (-1) : pos;
+        while ((pos <= text.length()) && ((c = text.charAt(pos)) != ' ')
+               && (c != '\n') && (c != '\r'))
+        {
+            ++pos;
         }
+
+        return (pos == text.length())        ? (-1) : pos;
     }
 
     /**

Modified: jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/OptionBuilder.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/OptionBuilder.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/OptionBuilder.java (original)
+++ jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/OptionBuilder.java Thu Feb 24 19:21:58 2005
@@ -59,6 +59,7 @@
      */
     private OptionBuilder()
     {
+        // hide the constructor
     }
 
     /**
@@ -82,12 +83,12 @@
     /**
      * The next Option created will have the following long option value.
      *
-     * @param longopt the long option value
+     * @param newLongopt the long option value
      * @return the OptionBuilder instance
      */
-    public static OptionBuilder withLongOpt(String longopt)
+    public static OptionBuilder withLongOpt(String newLongopt)
     {
-        instance.longopt = longopt;
+        OptionBuilder.longopt = newLongopt;
 
         return instance;
     }
@@ -99,7 +100,7 @@
      */
     public static OptionBuilder hasArg()
     {
-        instance.numberOfArgs = 1;
+        OptionBuilder.numberOfArgs = 1;
 
         return instance;
     }
@@ -113,7 +114,7 @@
      */
     public static OptionBuilder hasArg(boolean hasArg)
     {
-        instance.numberOfArgs = (hasArg == true) ? 1 : Option.UNINITIALIZED;
+        OptionBuilder.numberOfArgs = (hasArg == true) ? 1 : Option.UNINITIALIZED;
 
         return instance;
     }
@@ -127,7 +128,7 @@
      */
     public static OptionBuilder withArgName(String name)
     {
-        instance.argName = name;
+        OptionBuilder.argName = name;
 
         return instance;
     }
@@ -139,7 +140,7 @@
      */
     public static OptionBuilder isRequired()
     {
-        instance.required = true;
+        OptionBuilder.required = true;
 
         return instance;
     }
@@ -164,7 +165,7 @@
      */
     public static OptionBuilder withValueSeparator(char sep)
     {
-        instance.valuesep = sep;
+        OptionBuilder.valuesep = sep;
 
         return instance;
     }
@@ -187,7 +188,7 @@
      */
     public static OptionBuilder withValueSeparator()
     {
-        instance.valuesep = '=';
+        OptionBuilder.valuesep = '=';
 
         return instance;
     }
@@ -196,12 +197,12 @@
      * The next Option created will be required if <code>required</code>
      * is true.
      *
-     * @param required if true then the Option is required
+     * @param newRequired if true then the Option is required
      * @return the OptionBuilder instance
      */
-    public static OptionBuilder isRequired(boolean required)
+    public static OptionBuilder isRequired(boolean newRequired)
     {
-        instance.required = required;
+        OptionBuilder.required = newRequired;
 
         return instance;
     }
@@ -213,7 +214,7 @@
      */
     public static OptionBuilder hasArgs()
     {
-        instance.numberOfArgs = Option.UNLIMITED_VALUES;
+        OptionBuilder.numberOfArgs = Option.UNLIMITED_VALUES;
 
         return instance;
     }
@@ -227,7 +228,7 @@
      */
     public static OptionBuilder hasArgs(int num)
     {
-        instance.numberOfArgs = num;
+        OptionBuilder.numberOfArgs = num;
 
         return instance;
     }
@@ -239,8 +240,8 @@
      */
     public static OptionBuilder hasOptionalArg()
     {
-        instance.numberOfArgs = 1;
-        instance.optionalArg = true;
+        OptionBuilder.numberOfArgs = 1;
+        OptionBuilder.optionalArg = true;
 
         return instance;
     }
@@ -253,8 +254,8 @@
      */
     public static OptionBuilder hasOptionalArgs()
     {
-        instance.numberOfArgs = Option.UNLIMITED_VALUES;
-        instance.optionalArg = true;
+        OptionBuilder.numberOfArgs = Option.UNLIMITED_VALUES;
+        OptionBuilder.optionalArg = true;
 
         return instance;
     }
@@ -269,8 +270,8 @@
      */
     public static OptionBuilder hasOptionalArgs(int numArgs)
     {
-        instance.numberOfArgs = numArgs;
-        instance.optionalArg = true;
+        OptionBuilder.numberOfArgs = numArgs;
+        OptionBuilder.optionalArg = true;
 
         return instance;
     }
@@ -279,12 +280,12 @@
      * The next Option created will have a value that will be an instance 
      * of <code>type</code>.
      *
-     * @param type the type of the Options argument value
+     * @param newType the type of the Options argument value
      * @return the OptionBuilder instance
      */
-    public static OptionBuilder withType(Object type)
+    public static OptionBuilder withType(Object newType)
     {
-        instance.type = type;
+        OptionBuilder.type = newType;
 
         return instance;
     }
@@ -292,12 +293,12 @@
     /**
      * The next Option created will have the specified description
      *
-     * @param description a description of the Option's purpose
+     * @param newDescription a description of the Option's purpose
      * @return the OptionBuilder instance
      */
-    public static OptionBuilder withDescription(String description)
+    public static OptionBuilder withDescription(String newDescription)
     {
-        instance.description = description;
+        OptionBuilder.description = newDescription;
 
         return instance;
     }
@@ -363,7 +364,7 @@
 
 
         // reset the OptionBuilder properties
-        instance.reset();
+        OptionBuilder.reset();
 
         // return the Option instance
         return option;

Modified: jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/Options.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/Options.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/Options.java (original)
+++ jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/Options.java Thu Feb 24 19:21:58 2005
@@ -57,6 +57,7 @@
      */
     public Options()
     {
+        // nothing to do
     }
 
     /**

Modified: jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/Parser.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/Parser.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/Parser.java (original)
+++ jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/Parser.java Thu Feb 24 19:21:58 2005
@@ -323,24 +323,18 @@
             if (options.hasOption(str) && str.startsWith("-"))
             {
                 iter.previous();
-
                 break;
             }
 
             // found a value
-            else
+            try
             {
-
-                try
-                {
-                    opt.addValue( Util.stripLeadingAndTrailingQuotes(str) );
-                }
-                catch (RuntimeException exp)
-                {
-                    iter.previous();
-
-                    break;
-                }
+                opt.addValue( Util.stripLeadingAndTrailingQuotes(str) );
+            }
+            catch (RuntimeException exp)
+            {
+                iter.previous();
+                break;
             }
         }
 
@@ -366,9 +360,6 @@
     private void processOption(String arg, ListIterator iter)
         throws ParseException
     {
-        // get the option represented by arg
-        Option opt = null;
-
         boolean hasOption = options.hasOption(arg);
 
         // if there is no option throw an UnrecognisedOptionException
@@ -377,10 +368,9 @@
             throw new UnrecognizedOptionException("Unrecognized option: " 
                                                   + arg);
         }
-        else
-        {
-            opt = (Option) options.getOption(arg);
-        }
+        
+        // get the option represented by arg
+        final Option opt = options.getOption(arg);
 
         // if the option is a required option remove the option from
         // the requiredOptions list
@@ -393,7 +383,7 @@
         // option of the group
         if (options.getOptionGroup(opt) != null)
         {
-            OptionGroup group = (OptionGroup) options.getOptionGroup(opt);
+            OptionGroup group = options.getOptionGroup(opt);
 
             if (group.isRequired())
             {

Modified: jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/PatternOptionBuilder.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/PatternOptionBuilder.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/PatternOptionBuilder.java (original)
+++ jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli/PatternOptionBuilder.java Thu Feb 24 19:21:58 2005
@@ -173,11 +173,12 @@
             {
                 if (opt != ' ')
                 {
+                    OptionBuilder.hasArg(type != null);
+                    OptionBuilder.isRequired(required);
+                    OptionBuilder.withType(type);
+                    
                     // we have a previous one to deal with
-                    options.addOption(
-                            OptionBuilder.hasArg(type != null)
-                                         .isRequired(required).withType(type)
-                                         .create(opt));
+                    options.addOption(OptionBuilder.create(opt));
                     required = false;
                     type = null;
                     opt = ' ';
@@ -197,10 +198,12 @@
 
         if (opt != ' ')
         {
+            OptionBuilder.hasArg(type != null);
+            OptionBuilder.isRequired(required);
+            OptionBuilder.withType(type);
+            
             // we have a final one to deal with
-            options.addOption(
-                    OptionBuilder.hasArg(type != null).isRequired(required)
-                                 .withType(type).create(opt));
+            options.addOption(OptionBuilder.create(opt));
         }
 
         return options;

Modified: jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/DisplaySetting.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/DisplaySetting.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/DisplaySetting.java (original)
+++ jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/DisplaySetting.java Thu Feb 24 19:21:58 2005
@@ -145,9 +145,7 @@
         if (that instanceof DisplaySetting) {
             return name.compareTo(that.toString()) == 0;
         }
-        else {
-            return false;
-        }
+        return false;
     }
 
     public String toString() {

Modified: jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/Option.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/Option.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/Option.java (original)
+++ jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/Option.java Thu Feb 24 19:21:58 2005
@@ -20,8 +20,6 @@
 import java.util.ListIterator;
 import java.util.Set;
 
-import org.apache.commons.cli2.util.HelpFormatter;
-
 /**
  * The super type of all options representing a particular element of the
  * command line interface.

Modified: jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/OptionException.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/OptionException.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/OptionException.java (original)
+++ jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/OptionException.java Thu Feb 24 19:21:58 2005
@@ -33,7 +33,7 @@
     public static final Set HELP_SETTINGS = 
         Collections.unmodifiableSet(
             Collections.singleton(
-                DisplaySetting.DISPLAY_PROPERTY_OPTION));;
+                DisplaySetting.DISPLAY_PROPERTY_OPTION));
 
     /** The Option the exception relates to */
     private final Option option;

Modified: jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/builder/DefaultOptionBuilder.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/builder/DefaultOptionBuilder.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/builder/DefaultOptionBuilder.java (original)
+++ jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/builder/DefaultOptionBuilder.java Thu Feb 24 19:21:58 2005
@@ -66,20 +66,16 @@
         final String shortPrefix,
         final String longPrefix,
         final boolean burstEnabled) throws IllegalArgumentException{
+        
         if (shortPrefix == null || shortPrefix.length() == 0) {
             throw new IllegalArgumentException("shortPrefix should be at least 1 character long");
         }
-        else {
-            this.shortPrefix = shortPrefix;
-        }
-
         if (longPrefix == null || longPrefix.length() == 0) {
             throw new IllegalArgumentException("longPrefix should be at least 1 character long");
         }
-        else {
-            this.longPrefix = longPrefix;
-        }
-
+        
+        this.shortPrefix = shortPrefix;
+        this.longPrefix = longPrefix;
         this.burstEnabled = burstEnabled;
         reset();
     }

Modified: jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/builder/SwitchBuilder.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/builder/SwitchBuilder.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/builder/SwitchBuilder.java (original)
+++ jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/builder/SwitchBuilder.java Thu Feb 24 19:21:58 2005
@@ -183,11 +183,11 @@
     /**
      * Sets the default state for this switch
      * 
-     * @param switchDefault the default state
+     * @param newSwitchDefault the default state
      * @return this SwitchBuilder
      */
-    public final SwitchBuilder withSwitchDefault(final Boolean switchDefault) {
-        this.switchDefault = switchDefault;
+    public final SwitchBuilder withSwitchDefault(final Boolean newSwitchDefault) {
+        this.switchDefault = newSwitchDefault;
         return this;
     }
 }

Modified: jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/ArgumentImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/ArgumentImpl.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/ArgumentImpl.java (original)
+++ jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/ArgumentImpl.java Thu Feb 24 19:21:58 2005
@@ -147,7 +147,6 @@
         final Option option)
         throws OptionException {
         int argumentCount = commandLine.getValues(option,Collections.EMPTY_LIST).size();
-        final int initialCount = argumentCount;
         while (arguments.hasNext() && argumentCount < maximum) {
 
             final String allValues =
@@ -346,17 +345,16 @@
         if (!token.startsWith("\"") || !token.endsWith("\"")) {
             return token;
         }
-        else {
-            if (token.startsWith("\"")) {
-                token = token.substring(1, token.length());
-            }
-
-            if (token.endsWith("\"")) {
-                token = token.substring(0, token.length() - 1);
-            }
+        
+        if (token.startsWith("\"")) {
+            token = token.substring(1, token.length());
+        }
 
-            return token;
+        if (token.endsWith("\"")) {
+            token = token.substring(0, token.length() - 1);
         }
+
+        return token;
     }
     
     public boolean isRequired() {

Modified: jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/util/Comparators.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/util/Comparators.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/util/Comparators.java (original)
+++ jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/util/Comparators.java Thu Feb 24 19:21:58 2005
@@ -30,7 +30,7 @@
 public class Comparators {
 	
 	private Comparators(){
-		;// constructor hiden from potential users
+		// constructor hiden from potential users
 	}
 	
 
@@ -222,13 +222,9 @@
                 if (l) {
                     return -1;
                 }
-                else {
-                    return 1;
-                }
-            }
-            else {
-                return 0;
+                return 1;
             }
+            return 0;
         }
     }
 
@@ -261,13 +257,9 @@
                 if (l) {
                     return -1;
                 }
-                else {
-                    return 1;
-                }
-            }
-            else {
-                return 0;
+                return 1;
             }
+            return 0;
         }
     }
 
@@ -300,13 +292,9 @@
                 if (l) {
                     return -1;
                 }
-                else {
-                    return 1;
-                }
-            }
-            else {
-                return 0;
+                return 1;
             }
+            return 0;
         }
     }
 
@@ -339,13 +327,9 @@
                 if (l) {
                     return -1;
                 }
-                else {
-                    return 1;
-                }
-            }
-            else {
-                return 0;
+                return 1;
             }
+            return 0;
         }
     }
 
@@ -396,13 +380,9 @@
                 if (l) {
                     return -1;
                 }
-                else {
-                    return 1;
-                }
-            }
-            else {
-                return 0;
+                return 1;
             }
+            return 0;
         }
     }
 
@@ -467,13 +447,9 @@
                 if (l) {
                     return -1;
                 }
-                else {
-                    return 1;
-                }
-            }
-            else {
-                return 0;
+                return 1;
             }
+            return 0;
         }
     }
 }

Modified: jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/validation/ClassValidator.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/validation/ClassValidator.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/validation/ClassValidator.java (original)
+++ jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/validation/ClassValidator.java Thu Feb 24 19:21:58 2005
@@ -91,9 +91,7 @@
                 if (!Character.isJavaIdentifierStart(c)) {
                     return false;
                 }
-                else {
-                    expectingStart = false;
-                }
+                expectingStart = false;
             }
             else {
                 if (c == '.') {

Modified: jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/validation/FileValidator.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/validation/FileValidator.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/validation/FileValidator.java (original)
+++ jakarta/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/validation/FileValidator.java Thu Feb 24 19:21:58 2005
@@ -74,9 +74,8 @@
 
                 throw new InvalidArgumentException(name);
             }
-            else {
-                i.set(f);
-            }
+            
+            i.set(f);
         }
     }
 

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/CommandLineTestCase.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/CommandLineTestCase.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/CommandLineTestCase.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/CommandLineTestCase.java Thu Feb 24 19:21:58 2005
@@ -239,75 +239,75 @@
 
     public final void testProperties() {
         final Option option = new PropertyOption();
-        final List args = OptionTestCase.list();
-        final WriteableCommandLine commandLine =
+        final List args = CLITestCase.list();
+        final WriteableCommandLine writeable =
             OptionTestCase.commandLine(option, args);
 
-        assertTrue(commandLine.getProperties().isEmpty());
+        assertTrue(writeable.getProperties().isEmpty());
 
-        commandLine.addProperty("myprop", "myval");
-        assertEquals(1, commandLine.getProperties().size());
-        assertEquals("myval", commandLine.getProperty("myprop"));
+        writeable.addProperty("myprop", "myval");
+        assertEquals(1, writeable.getProperties().size());
+        assertEquals("myval", writeable.getProperty("myprop"));
 
-        commandLine.addProperty("myprop", "myval2");
-        assertEquals(1, commandLine.getProperties().size());
-        assertEquals("myval2", commandLine.getProperty("myprop"));
+        writeable.addProperty("myprop", "myval2");
+        assertEquals(1, writeable.getProperties().size());
+        assertEquals("myval2", writeable.getProperty("myprop"));
 
-        commandLine.addProperty("myprop2", "myval3");
-        assertEquals(2, commandLine.getProperties().size());
-        assertEquals("myval3", commandLine.getProperty("myprop2"));
+        writeable.addProperty("myprop2", "myval3");
+        assertEquals(2, writeable.getProperties().size());
+        assertEquals("myval3", writeable.getProperty("myprop2"));
     }
 
     public final void testOptions() {
         final Option option = new PropertyOption();
-        final List args = OptionTestCase.list();
-        final WriteableCommandLine commandLine =
+        final List args = CLITestCase.list();
+        final WriteableCommandLine writeable =
             OptionTestCase.commandLine(option, args);
 
         final Option start = CommandTest.buildStartCommand();
 
-        assertFalse(commandLine.hasOption(start));
-        assertFalse(commandLine.hasOption("start"));
-        assertFalse(commandLine.hasOption("go"));
-
-        commandLine.addOption(start);
-
-        assertTrue(commandLine.hasOption(start));
-        assertTrue(commandLine.hasOption("start"));
-        assertTrue(commandLine.hasOption("go"));
+        assertFalse(writeable.hasOption(start));
+        assertFalse(writeable.hasOption("start"));
+        assertFalse(writeable.hasOption("go"));
+
+        writeable.addOption(start);
+
+        assertTrue(writeable.hasOption(start));
+        assertTrue(writeable.hasOption("start"));
+        assertTrue(writeable.hasOption("go"));
     }
 
     public final void testValues() {
         final Option option = new PropertyOption();
-        final List args = OptionTestCase.list();
-        final WriteableCommandLine commandLine =
+        final List args = CLITestCase.list();
+        final WriteableCommandLine writeable =
             OptionTestCase.commandLine(option, args);
 
         final Option start = CommandTest.buildStartCommand();
 
-        assertNull(commandLine.getValue(start));
-        assertTrue(commandLine.getValues(start).isEmpty());
+        assertNull(writeable.getValue(start));
+        assertTrue(writeable.getValues(start).isEmpty());
 
-        commandLine.addOption(start);
+        writeable.addOption(start);
 
-        assertTrue(commandLine.getValues(start).isEmpty());
+        assertTrue(writeable.getValues(start).isEmpty());
 
-        commandLine.addValue(start, "file1");
+        writeable.addValue(start, "file1");
 
-        assertEquals("file1", commandLine.getValue(start));
-        assertEquals("file1", commandLine.getValue("start"));
-        assertEquals("file1", commandLine.getValue("go"));
-        assertEquals(1, commandLine.getValues(start).size());
-        assertEquals(1, commandLine.getValues("start").size());
-        assertEquals(1, commandLine.getValues("go").size());
-        assertTrue(commandLine.getValues(start).contains("file1"));
-        assertTrue(commandLine.getValues("start").contains("file1"));
-        assertTrue(commandLine.getValues("go").contains("file1"));
+        assertEquals("file1", writeable.getValue(start));
+        assertEquals("file1", writeable.getValue("start"));
+        assertEquals("file1", writeable.getValue("go"));
+        assertEquals(1, writeable.getValues(start).size());
+        assertEquals(1, writeable.getValues("start").size());
+        assertEquals(1, writeable.getValues("go").size());
+        assertTrue(writeable.getValues(start).contains("file1"));
+        assertTrue(writeable.getValues("start").contains("file1"));
+        assertTrue(writeable.getValues("go").contains("file1"));
 
-        commandLine.addValue(start, "file2");
+        writeable.addValue(start, "file2");
 
         try {
-            commandLine.getValue(start);
+            writeable.getValue(start);
             fail("Cannot get single value if multiple are present");
         }
         catch (IllegalStateException ise) {
@@ -315,31 +315,31 @@
         }
 
         try {
-            commandLine.getValue("start");
+            writeable.getValue("start");
             fail("Cannot get single value if multiple are present");
         }
         catch (IllegalStateException ise) {
             assertEquals("More than one value was supplied", ise.getMessage());
         }
 
-        commandLine.getValues(start).add("file3");
+        writeable.getValues(start).add("file3");
     }
 
     public final void testSwitches() {
         final Option option = new PropertyOption();
-        final List args = OptionTestCase.list();
-        final WriteableCommandLine commandLine =
+        final List args = CLITestCase.list();
+        final WriteableCommandLine writeable =
             OptionTestCase.commandLine(option, args);
 
         final Option start = CommandTest.buildStartCommand();
 
-        assertNull(commandLine.getSwitch(start));
-        assertNull(commandLine.getSwitch("start"));
-        assertNull(commandLine.getSwitch("go"));
+        assertNull(writeable.getSwitch(start));
+        assertNull(writeable.getSwitch("start"));
+        assertNull(writeable.getSwitch("go"));
 
-        commandLine.addSwitch(start, true);
+        writeable.addSwitch(start, true);
         try {
-            commandLine.addSwitch(start, false);
+            writeable.addSwitch(start, false);
             fail("Switch cannot be changed");
         }
         catch (IllegalStateException ise) {
@@ -349,26 +349,26 @@
 
     public final void testSwitches_True() {
         final Option option = new PropertyOption();
-        final List args = OptionTestCase.list();
-        final WriteableCommandLine commandLine =
+        final List args = CLITestCase.list();
+        final WriteableCommandLine writeable =
             OptionTestCase.commandLine(option, args);
 
         final Option start = CommandTest.buildStartCommand();
 
-        commandLine.addSwitch(start, true);
-        assertSame(Boolean.TRUE, commandLine.getSwitch(start));
+        writeable.addSwitch(start, true);
+        assertSame(Boolean.TRUE, writeable.getSwitch(start));
     }
 
     public final void testSwitches_False() {
         final Option option = new PropertyOption();
-        final List args = OptionTestCase.list();
-        final WriteableCommandLine commandLine =
+        final List args = CLITestCase.list();
+        final WriteableCommandLine writeable =
             OptionTestCase.commandLine(option, args);
 
         final Option start = CommandTest.buildStartCommand();
 
-        commandLine.addSwitch(start, false);
-        assertSame(Boolean.FALSE, commandLine.getSwitch(start));
+        writeable.addSwitch(start, false);
+        assertSame(Boolean.FALSE, writeable.getSwitch(start));
     }
 
 //    public final void testLooksLikeOption() {
@@ -487,13 +487,13 @@
     }
 
     public final void testOptionAsArgument() throws OptionException {
-    	final Option bool = new DefaultOptionBuilder().withShortName("p").create();
+    	final Option p = new DefaultOptionBuilder().withShortName("p").create();
     	final Argument argument = new ArgumentBuilder().create();
     	final Option withArgument = new DefaultOptionBuilder().withShortName("attr").withArgument(argument).create();
 
     	final Group group =
             new GroupBuilder()
-                .withOption(bool)
+                .withOption(p)
                 .withOption(withArgument)
                 .create();
 

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/PrecedenceTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/PrecedenceTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/PrecedenceTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/PrecedenceTest.java Thu Feb 24 19:21:58 2005
@@ -397,11 +397,11 @@
         assertEquals(new String[] { "-f" }, cl);
     }
 
-    public CommandLine buildCommandLine(final Group group, final String[] args)
+    public CommandLine buildCommandLine(final Group group, final String[] arguments)
         throws OptionException {
         Parser p = new Parser();
         p.setGroup(group);
-        return p.parse(args);
+        return p.parse(arguments);
     }
 
     public void assertEquals(final String options[], final CommandLine line) {

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/WriteableCommandLineTestCase.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/WriteableCommandLineTestCase.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/WriteableCommandLineTestCase.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/WriteableCommandLineTestCase.java Thu Feb 24 19:21:58 2005
@@ -33,16 +33,16 @@
 	 * @see org.apache.commons.cli2.CommandLineTest#createCommandLine()
 	 */
 	protected final CommandLine createCommandLine() {
-		final WriteableCommandLine writeable = createWriteableCommandLine();
-		writeable.addOption(present);
-		writeable.addProperty("present","present property");
-		writeable.addSwitch(bool,true);
-		writeable.addValue(present,"present value");
-		writeable.addOption(multiple);
-		writeable.addValue(multiple,"value 1");
-		writeable.addValue(multiple,"value 2");
-		writeable.addValue(multiple,"value 3");
-		return writeable;
+		final WriteableCommandLine cl = createWriteableCommandLine();
+		cl.addOption(present);
+		cl.addProperty("present","present property");
+		cl.addSwitch(bool,true);
+		cl.addValue(present,"present value");
+		cl.addOption(multiple);
+		cl.addValue(multiple,"value 1");
+		cl.addValue(multiple,"value 2");
+		cl.addValue(multiple,"value 3");
+		return cl;
 	}
 	
 	/*

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/application/CpTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/application/CpTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/application/CpTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/application/CpTest.java Thu Feb 24 19:21:58 2005
@@ -334,7 +334,7 @@
                 .create();
     }
 
-    public void testNoSource() throws OptionException {
+    public void testNoSource() {
         Parser parser = new Parser();
         parser.setGroup(options);
         try {

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/Bug28005Test.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/Bug28005Test.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/Bug28005Test.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/Bug28005Test.java Thu Feb 24 19:21:58 2005
@@ -24,7 +24,6 @@
 import org.apache.commons.cli2.builder.DefaultOptionBuilder;
 import org.apache.commons.cli2.builder.GroupBuilder;
 import org.apache.commons.cli2.commandline.Parser;
-import org.apache.commons.cli2.option.Command;
 import junit.framework.TestCase;
 
 public class Bug28005Test extends TestCase {

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/Bug32533Test.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/Bug32533Test.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/Bug32533Test.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/Bug32533Test.java Thu Feb 24 19:21:58 2005
@@ -15,11 +15,9 @@
  */
 package org.apache.commons.cli2.bug;
 
-import org.apache.commons.cli2.Argument;
 import org.apache.commons.cli2.Group;
 import org.apache.commons.cli2.Option;
 import org.apache.commons.cli2.OptionException;
-import org.apache.commons.cli2.builder.ArgumentBuilder;
 import org.apache.commons.cli2.builder.DefaultOptionBuilder;
 import org.apache.commons.cli2.builder.GroupBuilder;
 import org.apache.commons.cli2.commandline.Parser;

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/builder/DefaultOptionBuilderTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/builder/DefaultOptionBuilderTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/builder/DefaultOptionBuilderTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/builder/DefaultOptionBuilderTest.java Thu Feb 24 19:21:58 2005
@@ -36,45 +36,56 @@
     /*
      * Class to test for void DefaultOptionBuilder(String, String, boolean)
      */
-    public void testCtor() {
-        {
-            try {
-                DefaultOptionBuilder builder = new DefaultOptionBuilder(null, null,
-                        false);
-                fail("null short prefix is not permitted");
-            }
-            catch(IllegalArgumentException exp) {
-            }
+    public void testNew_NullShortPrefix() {
+        try {
+            new DefaultOptionBuilder(null, null,
+                    false);
+            fail("null short prefix is not permitted");
+        }
+        catch(IllegalArgumentException e) {
+            assertEquals("shortPrefix should be at least 1 character long",e.getMessage());
         }
+    }
 
-        {
-            try {
-                DefaultOptionBuilder builder = new DefaultOptionBuilder("", null,
-                        false);
-                fail("empty short prefix is not permitted");
-            }
-            catch(IllegalArgumentException exp) {
-            }
+    /*
+     * Class to test for void DefaultOptionBuilder(String, String, boolean)
+     */
+    public void testNew_EmptyShortPrefix() {
+        try {
+            new DefaultOptionBuilder("", null,
+                    false);
+            fail("empty short prefix is not permitted");
         }
-        
-        {
-            try {
-                DefaultOptionBuilder builder = new DefaultOptionBuilder("-", null,
-                        false);
-                fail("null long prefix is not permitted");
-            }
-            catch(IllegalArgumentException exp) {
-            }
+        catch(IllegalArgumentException e) {
+            assertEquals("shortPrefix should be at least 1 character long",e.getMessage());
         }
+    }
 
-        {
-            try {
-                DefaultOptionBuilder builder = new DefaultOptionBuilder("-", "",
-                        false);
-                fail("empty long prefix is not permitted");
-            }
-            catch(IllegalArgumentException exp) {
-            }
+    /*
+     * Class to test for void DefaultOptionBuilder(String, String, boolean)
+     */
+    public void testNew_NullLongPrefix() {
+        try {
+            new DefaultOptionBuilder("-", null,
+                    false);
+            fail("null long prefix is not permitted");
+        }
+        catch(IllegalArgumentException e) {
+            assertEquals("longPrefix should be at least 1 character long",e.getMessage());
+        }
+    }
+
+    /*
+     * Class to test for void DefaultOptionBuilder(String, String, boolean)
+     */
+    public void testNew_EmptyLongPrefix() {
+        try {
+            new DefaultOptionBuilder("-", "",
+                    false);
+            fail("empty long prefix is not permitted");
+        }
+        catch(IllegalArgumentException e) {
+            assertEquals("longPrefix should be at least 1 character long",e.getMessage());
         }
     }
 
@@ -83,7 +94,8 @@
             this.defaultOptionBuilder.create();
             fail("options must have a name");
         }
-        catch (IllegalStateException exp) {
+        catch (IllegalStateException e) {
+            assertEquals("Options must have at least one name",e.getMessage());
         }
         
         {
@@ -100,9 +112,6 @@
             DefaultOptionBuilder builder = new DefaultOptionBuilder("-", "--",
                     true);
             builder.withShortName("mx");
-        }
-        
-        {
         }
     }
 

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/commandline/DefaultingCommandLineTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/commandline/DefaultingCommandLineTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/commandline/DefaultingCommandLineTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/commandline/DefaultingCommandLineTest.java Thu Feb 24 19:21:58 2005
@@ -32,8 +32,6 @@
  */
 public class DefaultingCommandLineTest extends CommandLineTestCase {
 	
-	private DefaultingCommandLine defaults;
-	
 	private CommandLine first;
 	private CommandLine second;
 	

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/ArgumentTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/ArgumentTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/ArgumentTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/ArgumentTest.java Thu Feb 24 19:21:58 2005
@@ -185,7 +185,7 @@
             List defaults = new ArrayList();
             
             try {
-                ArgumentImpl arg = new ArgumentImpl(
+                new ArgumentImpl(
                     null,
                     "the last acceptable date",
                     1,
@@ -210,7 +210,7 @@
                 defaults.add("1");
                 defaults.add("2");
             
-                ArgumentImpl arg = new ArgumentImpl(
+                new ArgumentImpl(
                     null,
                     "the last acceptable date",
                     1,
@@ -261,7 +261,7 @@
         assertEquals("rob", commandLine.getValue(option));
     }
 
-    public void testProcessValues_Optional() throws OptionException {
+    public void testProcessValues_Optional() {
         final Argument option = buildTargetsArgument();
         final List args = list();
         final WriteableCommandLine commandLine = commandLine(option, args);
@@ -312,7 +312,7 @@
             commandLine.getValues(option));
     }
 
-    public void testProcessValues_ContractedTooFew() throws OptionException {
+    public void testProcessValues_ContractedTooFew() {
         final Argument option = buildHostArgument();
         final List args = list("box1");
         final WriteableCommandLine commandLine = commandLine(option, args);
@@ -391,7 +391,7 @@
         option.validate(commandLine);
     }
 
-    public void testValidate_Minimum() throws OptionException {
+    public void testValidate_Minimum() {
         final Argument option = buildUsernameArgument();
         final WriteableCommandLine commandLine = commandLine(option, list());
 
@@ -404,7 +404,7 @@
         }
     }
 
-    public void testValidate_Maximum() throws OptionException {
+    public void testValidate_Maximum() {
         final Argument option = buildUsernameArgument();
         final WriteableCommandLine commandLine = commandLine(option, list());
 
@@ -542,7 +542,7 @@
         assertFalse(iterator.hasNext());
     }
 
-    public void testProcess_ConsumeNothing() throws OptionException {
+    public void testProcess_ConsumeNothing() {
         final Option option = buildPathArgument();
         final List args = list("--");
         final WriteableCommandLine commandLine = commandLine(option, args);

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/CommandTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/CommandTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/CommandTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/CommandTest.java Thu Feb 24 19:21:58 2005
@@ -162,7 +162,7 @@
      * 
      * @see org.apache.commons.cli2.OptionTestCase#testValidate()
      */
-    public void testValidate() throws OptionException {
+    public void testValidate() {
         final Parent option = buildCommitCommand();
         final WriteableCommandLine commandLine = commandLine(option, list());
 

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/DefaultOptionTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/DefaultOptionTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/DefaultOptionTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/DefaultOptionTest.java Thu Feb 24 19:21:58 2005
@@ -149,7 +149,7 @@
      * 
      * @see org.apache.commons.cli2.OptionTestCase#testValidate()
      */
-    public void testValidate() throws OptionException {
+    public void testValidate() {
         final Parent option = buildXOption();
         final WriteableCommandLine commandLine = commandLine(option, list());
 

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/GroupTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/GroupTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/GroupTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/GroupTest.java Thu Feb 24 19:21:58 2005
@@ -220,7 +220,7 @@
         option.validate(commandLine);
     }
 
-    public void testValidate_UnexpectedOption() throws OptionException {
+    public void testValidate_UnexpectedOption() {
         final Group option = buildApacheCommandGroup();
         final WriteableCommandLine commandLine = commandLine(option, list());
 
@@ -236,7 +236,7 @@
         }
     }
 
-    public void testValidate_MissingOption() throws OptionException {
+    public void testValidate_MissingOption() {
         final Group option = buildApacheCommandGroup();
         final WriteableCommandLine commandLine = commandLine(option, list());
 

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/NestedGroupTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/NestedGroupTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/NestedGroupTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/NestedGroupTest.java Thu Feb 24 19:21:58 2005
@@ -119,21 +119,13 @@
 
         CommandLine commandLine = parser.parse(args);
 
-        assertTrue("/tmp/filename.txt".equals(
-                (String) commandLine.getValue("-f")));
+        assertTrue("/tmp/filename.txt".equals(commandLine.getValue("-f")));
         assertTrue(commandLine.hasOption("-e"));
         assertTrue(commandLine.hasOption("-b"));
         assertFalse(commandLine.hasOption("-d"));
     }
 
-    public void testNestedGroupHelp()
-        throws OptionException {
-        final String[] args = {
-                "-eb",
-                "--file",
-                "/tmp/filename.txt"
-            };
-
+    public void testNestedGroupHelp() {
         Group[] nestedGroups = {
                 buildActionGroup(),
                 buildAlgorithmGroup(),

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/PropertyOptionTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/PropertyOptionTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/PropertyOptionTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/PropertyOptionTest.java Thu Feb 24 19:21:58 2005
@@ -84,8 +84,7 @@
         assertEquals(1, commandLine.getProperties().size());
     }
 
-    public void testProcess_UnexpectedOptionException()
-        throws OptionException {
+    public void testProcess_UnexpectedOptionException() {
         final Option option = new PropertyOption();
         final List args = list("--help");
         final WriteableCommandLine commandLine = commandLine(option, args);

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/SwitchTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/SwitchTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/SwitchTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/option/SwitchTest.java Thu Feb 24 19:21:58 2005
@@ -138,7 +138,7 @@
      * 
      * @see org.apache.commons.cli2.OptionTestCase#testValidate()
      */
-    public void testValidate() throws OptionException {
+    public void testValidate() {
         final Parent option = buildDisplaySwitch();
         final WriteableCommandLine commandLine = commandLine(option, list());
 

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/util/ComparatorsTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/util/ComparatorsTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/util/ComparatorsTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/util/ComparatorsTest.java Thu Feb 24 19:21:58 2005
@@ -16,17 +16,15 @@
 package org.apache.commons.cli2.util;
 
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.apache.commons.cli2.CLITestCase;
 import org.apache.commons.cli2.Option;
-import org.apache.commons.cli2.builder.SwitchBuilder;
 import org.apache.commons.cli2.option.CommandTest;
 import org.apache.commons.cli2.option.DefaultOptionTest;
 import org.apache.commons.cli2.option.GroupTest;
-import org.apache.commons.cli2.option.OptionTestCase;
 import org.apache.commons.cli2.option.ParentTest;
 import org.apache.commons.cli2.option.SwitchTest;
 
@@ -37,169 +35,169 @@
     public void testGroupFirst() {
         final Option o1 = GroupTest.buildAntGroup();
         final Option o2 = ParentTest.buildLibParent();
-        final List list = OptionTestCase.list(o1, o2);
+        final List list = CLITestCase.list(o1, o2);
 
         Collections.sort(list, Comparators.groupFirst());
 
-        OptionTestCase.assertListContentsEqual(
-            OptionTestCase.list(o1, o2),
+        CLITestCase.assertListContentsEqual(
+            CLITestCase.list(o1, o2),
             list);
     }
 
     public void testGroupLast() {
         final Option o1 = GroupTest.buildAntGroup();
         final Option o2 = ParentTest.buildLibParent();
-        final List list = OptionTestCase.list(o1, o2);
+        final List list = CLITestCase.list(o1, o2);
 
         Collections.sort(list, Comparators.groupLast());
 
-        OptionTestCase.assertListContentsEqual(
-            OptionTestCase.list(o2, o1),
+        CLITestCase.assertListContentsEqual(
+            CLITestCase.list(o2, o1),
             list);
     }
 
     public void testSwitchFirst() {
         final Option o1 = SwitchTest.buildDisplaySwitch();
         final Option o2 = ParentTest.buildLibParent();
-        final List list = OptionTestCase.list(o1, o2);
+        final List list = CLITestCase.list(o1, o2);
 
         Collections.sort(list, Comparators.switchFirst());
 
-        OptionTestCase.assertListContentsEqual(
-            OptionTestCase.list(o1, o2),
+        CLITestCase.assertListContentsEqual(
+            CLITestCase.list(o1, o2),
             list);
     }
 
     public void testSwitchLast() {
         final Option o1 = SwitchTest.buildDisplaySwitch();
         final Option o2 = ParentTest.buildLibParent();
-        final Option o3 = new SwitchBuilder().withName("hidden").create();
-        final List list = OptionTestCase.list(o1, o2);
+        //final Option o3 = new SwitchBuilder().withName("hidden").create();
+        final List list = CLITestCase.list(o1, o2);
 
         Collections.sort(list, Comparators.switchLast());
 
-        OptionTestCase.assertListContentsEqual(
-            OptionTestCase.list(o2, o1),
+        CLITestCase.assertListContentsEqual(
+            CLITestCase.list(o2, o1),
             list);
     }
 
     public void testCommandFirst() {
         final Option o1 = CommandTest.buildCommitCommand();
         final Option o2 = ParentTest.buildLibParent();
-        final List list = OptionTestCase.list(o1, o2);
+        final List list = CLITestCase.list(o1, o2);
 
         Collections.sort(list, Comparators.commandFirst());
 
-        OptionTestCase.assertListContentsEqual(
-            OptionTestCase.list(o1, o2),
+        CLITestCase.assertListContentsEqual(
+            CLITestCase.list(o1, o2),
             list);
     }
 
     public void testCommandLast() {
         final Option o1 = CommandTest.buildCommitCommand();
         final Option o2 = ParentTest.buildLibParent();
-        final List list = OptionTestCase.list(o1, o2);
+        final List list = CLITestCase.list(o1, o2);
 
         Collections.sort(list, Comparators.commandLast());
 
-        OptionTestCase.assertListContentsEqual(
-            OptionTestCase.list(o2, o1),
+        CLITestCase.assertListContentsEqual(
+            CLITestCase.list(o2, o1),
             list);
     }
 
     public void testDefaultOptionFirst() {
         final Option o1 = DefaultOptionTest.buildHelpOption();
         final Option o2 = CommandTest.buildCommitCommand();
-        final List list = OptionTestCase.list(o1, o2);
+        final List list = CLITestCase.list(o1, o2);
 
         Collections.sort(list, Comparators.defaultOptionFirst());
 
-        OptionTestCase.assertListContentsEqual(
-            OptionTestCase.list(o1, o2),
+        CLITestCase.assertListContentsEqual(
+            CLITestCase.list(o1, o2),
             list);
     }
 
     public void testDefaultOptionLast() {
         final Option o1 = DefaultOptionTest.buildHelpOption();
         final Option o2 = CommandTest.buildCommitCommand();
-        final List list = OptionTestCase.list(o1, o2);
+        final List list = CLITestCase.list(o1, o2);
 
         Collections.sort(list, Comparators.defaultOptionLast());
 
-        OptionTestCase.assertListContentsEqual(
-            OptionTestCase.list(o2, o1),
+        CLITestCase.assertListContentsEqual(
+            CLITestCase.list(o2, o1),
             list);
     }
 
     public void testNamedFirst() {
         final Option o1 = DefaultOptionTest.buildHelpOption();
         final Option o2 = ParentTest.buildLibParent();
-        final List list = OptionTestCase.list(o1, o2);
+        final List list = CLITestCase.list(o1, o2);
 
         Collections.sort(list, Comparators.namedFirst("--help"));
 
-        OptionTestCase.assertListContentsEqual(
-            OptionTestCase.list(o1, o2),
+        CLITestCase.assertListContentsEqual(
+            CLITestCase.list(o1, o2),
             list);
     }
 
     public void testNamedLast() {
         final Option o1 = DefaultOptionTest.buildHelpOption();
         final Option o2 = ParentTest.buildLibParent();
-        final List list = OptionTestCase.list(o1, o2);
+        final List list = CLITestCase.list(o1, o2);
 
         Collections.sort(list, Comparators.namedLast("--help"));
 
-        OptionTestCase.assertListContentsEqual(
-            OptionTestCase.list(o2, o1),
+        CLITestCase.assertListContentsEqual(
+            CLITestCase.list(o2, o1),
             list);
     }
 
     public void testPreferredNameFirst() {
         final Option o1 = DefaultOptionTest.buildHelpOption();
         final Option o2 = ParentTest.buildLibParent();
-        final List list = OptionTestCase.list(o1, o2);
+        final List list = CLITestCase.list(o1, o2);
 
         Collections.sort(list, Comparators.preferredNameFirst());
 
-        OptionTestCase.assertListContentsEqual(
-            OptionTestCase.list(o1, o2),
+        CLITestCase.assertListContentsEqual(
+            CLITestCase.list(o1, o2),
             list);
     }
 
     public void testPreferredNameLast() {
         final Option o1 = DefaultOptionTest.buildHelpOption();
         final Option o2 = ParentTest.buildLibParent();
-        final List list = OptionTestCase.list(o1, o2);
+        final List list = CLITestCase.list(o1, o2);
 
         Collections.sort(list, Comparators.preferredNameLast());
 
-        OptionTestCase.assertListContentsEqual(
-            OptionTestCase.list(o2, o1),
+        CLITestCase.assertListContentsEqual(
+            CLITestCase.list(o2, o1),
             list);
     }
 
     public void testRequiredFirst() {
         final Option o1 = DefaultOptionTest.buildHelpOption();
         final Option o2 = DefaultOptionTest.buildXOption();
-        final List list = OptionTestCase.list(o1, o2);
+        final List list = CLITestCase.list(o1, o2);
 
         Collections.sort(list, Comparators.requiredFirst());
 
-        OptionTestCase.assertListContentsEqual(
-            OptionTestCase.list(o2, o1),
+        CLITestCase.assertListContentsEqual(
+            CLITestCase.list(o2, o1),
             list);
     }
 
     public void testRequiredLast() {
         final Option o1 = DefaultOptionTest.buildHelpOption();
         final Option o2 = DefaultOptionTest.buildXOption();
-        final List list = OptionTestCase.list(o1, o2);
+        final List list = CLITestCase.list(o1, o2);
 
         Collections.sort(list, Comparators.requiredLast());
 
-        OptionTestCase.assertListContentsEqual(
-            OptionTestCase.list(o1, o2),
+        CLITestCase.assertListContentsEqual(
+            CLITestCase.list(o1, o2),
             list);
     }
     
@@ -207,7 +205,7 @@
         final Option o1 = CommandTest.buildCommitCommand();
         final Option o2 = SwitchTest.buildDisplaySwitch();
         final Option o3 = DefaultOptionTest.buildHelpOption();
-        final List list = OptionTestCase.list(o1, o2, o3);
+        final List list = CLITestCase.list(o1, o2, o3);
         
         Collections.sort(
             list, 
@@ -215,8 +213,8 @@
                 Comparators.namedFirst("--help"),
                 Comparators.commandFirst()));
 
-        OptionTestCase.assertListContentsEqual(
-            OptionTestCase.list(o3, o1, o2),
+        CLITestCase.assertListContentsEqual(
+            CLITestCase.list(o3, o1, o2),
             list);
     }
 }

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java Thu Feb 24 19:21:58 2005
@@ -117,7 +117,7 @@
         }
     }
 
-    public void testLoadable() throws InvalidArgumentException {
+    public void testLoadable() {
         assertFalse("Validator is loadable", validator.isLoadable());
         validator.setLoadable(true);
         assertTrue("Validator is NOT loadable", validator.isLoadable());
@@ -163,7 +163,7 @@
         }
     }
 
-    public void testInstantiate() throws InvalidArgumentException {
+    public void testInstantiate() {
         assertFalse("Validator creates instances", validator.isInstance());
         validator.setInstance(true);
         assertTrue(
@@ -185,7 +185,7 @@
             list.get(0) instanceof java.util.Vector);
     }
 
-    public void testCreateInterfaceInstance() throws InvalidArgumentException {
+    public void testCreateInterfaceInstance() {
         final String className = "java.util.Map";
         final Object[] array = new Object[] { className };
         final List list = Arrays.asList(array);
@@ -205,7 +205,7 @@
         }
     }
 
-    public void testCreateProtectedInstance() throws InvalidArgumentException {
+    public void testCreateProtectedInstance() {
         final String className = "org.apache.commons.cli2.validation.protect.ProtectedClass";
         final Object[] array = new Object[] { className };
         final List list = Arrays.asList(array);
@@ -229,7 +229,7 @@
         }
     }
     
-    public void testClassloader() throws InvalidArgumentException {
+    public void testClassloader() {
         assertEquals(
             "Wrong classloader found",
             validator.getClass().getClassLoader(),

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/EnumValidatorTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/EnumValidatorTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/EnumValidatorTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/EnumValidatorTest.java Thu Feb 24 19:21:58 2005
@@ -16,7 +16,6 @@
 package org.apache.commons.cli2.validation;
 
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -25,14 +24,14 @@
 import junit.framework.TestCase;
 
 public class EnumValidatorTest extends TestCase {
-    private final Set enum = new TreeSet(
+    private final Set enumSet = new TreeSet(
             Arrays.asList(
                     new Object[]{"red", "green", "blue"}));
     
     public void testValidate() throws InvalidArgumentException {
         final Object[] array = new Object[] { "red", "green"};
         final List list = Arrays.asList(array);
-        final Validator validator = new EnumValidator(enum);
+        final Validator validator = new EnumValidator(enumSet);
 
         validator.validate(list);
 
@@ -42,10 +41,10 @@
         assertFalse(i.hasNext());
     }
     
-    public void testNonMember() throws InvalidArgumentException {
+    public void testNonMember() {
         final Object[] array = new Object[] { "red", "pink"};
         final List list = Arrays.asList(array);
-        final Validator validator = new EnumValidator(enum);
+        final Validator validator = new EnumValidator(enumSet);
 
         try{
             validator.validate(list);

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/FileValidatorTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/FileValidatorTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/FileValidatorTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/FileValidatorTest.java Thu Feb 24 19:21:58 2005
@@ -38,7 +38,7 @@
         assertFalse(i.hasNext());
     }
     
-    public void testValidate_Directory() throws InvalidArgumentException {
+    public void testValidate_Directory() {
         final Object[] array = new Object[] { "src", "project.xml"};
         final List list = Arrays.asList(array);
         final Validator validator = FileValidator.getExistingDirectoryInstance();
@@ -52,7 +52,7 @@
         }
     }
     
-    public void testValidate_File() throws InvalidArgumentException {
+    public void testValidate_File() {
         final Object[] array = new Object[] { "project.xml", "src"};
         final List list = Arrays.asList(array);
         final Validator validator = FileValidator.getExistingFileInstance();
@@ -66,7 +66,7 @@
         }
     }
     
-    public void testValidate_Existing() throws InvalidArgumentException {
+    public void testValidate_Existing() {
         final Object[] array = new Object[] { "project.xml", "veryunlikelyfilename"};
         final List list = Arrays.asList(array);
         final Validator validator = FileValidator.getExistingInstance();

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/NumberValidatorTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/NumberValidatorTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/NumberValidatorTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/NumberValidatorTest.java Thu Feb 24 19:21:58 2005
@@ -100,7 +100,7 @@
         assertFalse(i.hasNext());
     }
 
-    public void testValidate_ExcessChars() throws InvalidArgumentException {
+    public void testValidate_ExcessChars() {
         final Object[] array = new Object[] { "10DowningStreet"};
         final List list = Arrays.asList(array);
         final Validator validator = NumberValidator.getIntegerInstance();

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/UrlValidatorTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/UrlValidatorTest.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/UrlValidatorTest.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/UrlValidatorTest.java Thu Feb 24 19:21:58 2005
@@ -38,7 +38,7 @@
         assertFalse(i.hasNext());
     }
     
-    public void testBadProtocol() throws InvalidArgumentException, MalformedURLException {
+    public void testBadProtocol() {
         final Object[] array = new Object[] { "http://www.apache.org/", "file:///etc"};
         final List list = Arrays.asList(array);
         final UrlValidator validator = new UrlValidator();

Modified: jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/protect/ProtectedClass.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/protect/ProtectedClass.java?view=diff&r1=155292&r2=155293
==============================================================================
--- jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/protect/ProtectedClass.java (original)
+++ jakarta/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/validation/protect/ProtectedClass.java Thu Feb 24 19:21:58 2005
@@ -17,5 +17,6 @@
 
 class ProtectedClass {
     protected ProtectedClass() {
+        // used to test something???
     }
-};
+}



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message