commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject [commons-cli] branch master updated: Remove trailing white spaces on all lines.
Date Wed, 18 Dec 2019 20:47:55 GMT
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-cli.git


The following commit(s) were added to refs/heads/master by this push:
     new c12260c  Remove trailing white spaces on all lines.
c12260c is described below

commit c12260c05ebcd27558265395df79b8b049534fbd
Author: Gary Gregory <garydgregory@gmail.com>
AuthorDate: Wed Dec 18 15:28:13 2019 -0500

    Remove trailing white spaces on all lines.
---
 .../commons/cli/AmbiguousOptionException.java      |   2 +-
 .../org/apache/commons/cli/CommandLineParser.java  |   4 +-
 .../java/org/apache/commons/cli/DefaultParser.java |  24 +--
 .../java/org/apache/commons/cli/HelpFormatter.java |  60 +++----
 src/main/java/org/apache/commons/cli/Option.java   | 114 ++++++-------
 .../java/org/apache/commons/cli/OptionBuilder.java |   2 +-
 .../java/org/apache/commons/cli/OptionGroup.java   |  18 +-
 .../org/apache/commons/cli/OptionValidator.java    |   2 +-
 src/main/java/org/apache/commons/cli/Options.java  |  10 +-
 src/main/java/org/apache/commons/cli/Parser.java   |  24 +--
 .../apache/commons/cli/PatternOptionBuilder.java   |   8 +-
 .../java/org/apache/commons/cli/PosixParser.java   |   6 +-
 .../java/org/apache/commons/cli/TypeHandler.java   |   2 +-
 src/main/java/org/apache/commons/cli/Util.java     |   2 +-
 .../org/apache/commons/cli/BasicParserTest.java    |   8 +-
 .../org/apache/commons/cli/CommandLineTest.java    |  24 +--
 .../java/org/apache/commons/cli/GnuParserTest.java |   8 +-
 .../org/apache/commons/cli/HelpFormatterTest.java  |  64 ++++----
 .../org/apache/commons/cli/OptionBuilderTest.java  |   6 +-
 .../org/apache/commons/cli/OptionGroupTest.java    |   4 +-
 .../java/org/apache/commons/cli/OptionTest.java    |  10 +-
 .../java/org/apache/commons/cli/OptionsTest.java   |  14 +-
 .../org/apache/commons/cli/ParserTestCase.java     | 182 ++++++++++-----------
 .../commons/cli/PatternOptionBuilderTest.java      |   2 +-
 .../org/apache/commons/cli/PosixParserTest.java    |   4 +-
 .../java/org/apache/commons/cli/ValueTest.java     |  30 ++--
 .../java/org/apache/commons/cli/ValuesTest.java    |   6 +-
 .../org/apache/commons/cli/bug/BugCLI133Test.java  |   2 +-
 .../org/apache/commons/cli/bug/BugCLI13Test.java   |   4 +-
 .../org/apache/commons/cli/bug/BugCLI148Test.java  |   2 +-
 .../org/apache/commons/cli/bug/BugCLI162Test.java  |   4 +-
 .../org/apache/commons/cli/bug/BugCLI71Test.java   |   6 +-
 .../java/org/apache/commons/cli/bug/BugsTest.java  |  26 +--
 33 files changed, 342 insertions(+), 342 deletions(-)

diff --git a/src/main/java/org/apache/commons/cli/AmbiguousOptionException.java b/src/main/java/org/apache/commons/cli/AmbiguousOptionException.java
index 96a5eeb..ef347ee 100644
--- a/src/main/java/org/apache/commons/cli/AmbiguousOptionException.java
+++ b/src/main/java/org/apache/commons/cli/AmbiguousOptionException.java
@@ -58,7 +58,7 @@ public class AmbiguousOptionException extends UnrecognizedOptionException
 
     /**
      * Build the exception message from the specified list of options.
-     * 
+     *
      * @param option
      * @param matchingOptions
      * @return
diff --git a/src/main/java/org/apache/commons/cli/CommandLineParser.java b/src/main/java/org/apache/commons/cli/CommandLineParser.java
index ffdd3b1..8fbe310 100644
--- a/src/main/java/org/apache/commons/cli/CommandLineParser.java
+++ b/src/main/java/org/apache/commons/cli/CommandLineParser.java
@@ -61,7 +61,7 @@ public interface CommandLineParser
      * @param options the specified Options
      * @param arguments the command line arguments
      * @param stopAtNonOption if <code>true</code> an unrecognized argument stops
-     *     the parsing and the remaining arguments are added to the 
+     *     the parsing and the remaining arguments are added to the
      *     {@link CommandLine}s args list. If <code>false</code> an unrecognized
      *     argument triggers a ParseException.
      *
@@ -79,7 +79,7 @@ public interface CommandLineParser
      * @param arguments the command line arguments
      * @param properties command line option name-value pairs
      * @param stopAtNonOption if <code>true</code> an unrecognized argument stops
-     *     the parsing and the remaining arguments are added to the 
+     *     the parsing and the remaining arguments are added to the
      *     {@link CommandLine}s args list. If <code>false</code> an unrecognized
      *     argument triggers a ParseException.
      *
diff --git a/src/main/java/org/apache/commons/cli/DefaultParser.java b/src/main/java/org/apache/commons/cli/DefaultParser.java
index 87e7821..5bf3917 100644
--- a/src/main/java/org/apache/commons/cli/DefaultParser.java
+++ b/src/main/java/org/apache/commons/cli/DefaultParser.java
@@ -31,7 +31,7 @@ public class DefaultParser implements CommandLineParser
 {
     /** The command-line instance. */
     protected CommandLine cmd;
-    
+
     /** The current options. */
     protected Options options;
 
@@ -44,13 +44,13 @@ public class DefaultParser implements CommandLineParser
 
     /** The token currently processed. */
     protected String currentToken;
- 
+
     /** The last option parsed. */
     protected Option currentOption;
- 
+
     /** Flag indicating if tokens should no longer be analyzed and simply added as arguments of the command line. */
     protected boolean skipParsing;
- 
+
     /** The required options and groups expected to be found when parsing the command line. */
     protected List expectedOpts;
 
@@ -134,7 +134,7 @@ public class DefaultParser implements CommandLineParser
      * @param arguments       the command line arguments
      * @param properties      command line option name-value pairs
      * @param stopAtNonOption if <code>true</code> an unrecognized argument stops
-     *     the parsing and the remaining arguments are added to the 
+     *     the parsing and the remaining arguments are added to the
      *     {@link CommandLine}s args list. If <code>false</code> an unrecognized
      *     argument triggers a ParseException.
      *
@@ -339,7 +339,7 @@ public class DefaultParser implements CommandLineParser
 
     /**
      * Tells if the token looks like a short option.
-     * 
+     *
      * @param token
      */
     private boolean isShortOption(final String token)
@@ -391,10 +391,10 @@ public class DefaultParser implements CommandLineParser
     }
 
     /**
-     * Handles an unknown token. If the token starts with a dash an 
-     * UnrecognizedOptionException is thrown. Otherwise the token is added 
-     * to the arguments of the command line. If the stopAtNonOption flag 
-     * is set, this stops the parsing and the remaining tokens are added 
+     * Handles an unknown token. If the token starts with a dash an
+     * UnrecognizedOptionException is thrown. Otherwise the token is added
+     * to the arguments of the command line. If the stopAtNonOption flag
+     * is set, this stops the parsing and the remaining tokens are added
      * as-is in the arguments of the command line.
      *
      * @param token the command line token to handle
@@ -442,7 +442,7 @@ public class DefaultParser implements CommandLineParser
      * -L
      * --l
      * -l
-     * 
+     *
      * @param token the command line token to handle
      */
     private void handleLongOptionWithoutEqual(final String token) throws ParseException
@@ -639,7 +639,7 @@ public class DefaultParser implements CommandLineParser
                 break;
             }
         }
-        
+
         return opt;
     }
 
diff --git a/src/main/java/org/apache/commons/cli/HelpFormatter.java b/src/main/java/org/apache/commons/cli/HelpFormatter.java
index b751b69..4bca3ee 100644
--- a/src/main/java/org/apache/commons/cli/HelpFormatter.java
+++ b/src/main/java/org/apache/commons/cli/HelpFormatter.java
@@ -34,7 +34,7 @@ import java.util.List;
  * A formatter of help messages for command line options.
  *
  * <p>Example:</p>
- * 
+ *
  * <pre>
  * Options options = new Options();
  * options.addOption(OptionBuilder.withLongOpt("file")
@@ -47,24 +47,24 @@ import java.util.List;
  *                                .withDescription("Print the version of the application")
  *                                .create('v'));
  * options.addOption(OptionBuilder.withLongOpt("help").create('h'));
- * 
+ *
  * String header = "Do something useful with an input file\n\n";
  * String footer = "\nPlease report issues at http://example.com/issues";
- * 
+ *
  * HelpFormatter formatter = new HelpFormatter();
  * formatter.printHelp("myapp", header, options, footer, true);
  * </pre>
- * 
+ *
  * This produces the following output:
- * 
+ *
  * <pre>
  * usage: myapp -f &lt;FILE&gt; [-h] [-v]
  * Do something useful with an input file
- * 
+ *
  *  -f,--file &lt;FILE&gt;   The file to be processed
  *  -h,--help
  *  -v,--version       Print the version of the application
- * 
+ *
  * Please report issues at http://example.com/issues
  * </pre>
  */
@@ -90,9 +90,9 @@ public class HelpFormatter
     /** default prefix for long Option */
     public static final String DEFAULT_LONG_OPT_PREFIX = "--";
 
-    /** 
+    /**
      * default separator displayed between a long Option and its value
-     * 
+     *
      * @since 1.3
      **/
     public static final String DEFAULT_LONG_OPT_SEPARATOR = " ";
@@ -177,7 +177,7 @@ public class HelpFormatter
 
     /**
      * Comparator used to sort the options when they output in help text
-     * 
+     *
      * Defaults to case-insensitive alphabetical sorting by option key
      */
     protected Comparator<Option> optionComparator = new OptionComparator();
@@ -329,7 +329,7 @@ public class HelpFormatter
      * Set the separator displayed between a long option and its value.
      * Ensure that the separator specified is supported by the parser used,
      * typically ' ' or '='.
-     * 
+     *
      * @param longOptSeparator the separator, typically ' ' or '='.
      * @since 1.3
      */
@@ -340,7 +340,7 @@ public class HelpFormatter
 
     /**
      * Returns the separator displayed between a long option and its value.
-     * 
+     *
      * @return the separator
      * @since 1.3
      */
@@ -408,7 +408,7 @@ public class HelpFormatter
 
     /**
      * Print the help for <code>options</code> with the specified
-     * command line syntax.  This method prints help information to 
+     * command line syntax.  This method prints help information to
      * System.out.
      *
      * @param cmdLineSyntax the syntax for this application
@@ -438,7 +438,7 @@ public class HelpFormatter
 
     /**
      * Print the help for <code>options</code> with the specified
-     * command line syntax.  This method prints help information to 
+     * command line syntax.  This method prints help information to
      * System.out.
      *
      * @param cmdLineSyntax the syntax for this application
@@ -479,7 +479,7 @@ public class HelpFormatter
      * @param header the banner to display at the beginning of the help
      * @param options the Options instance
      * @param footer the banner to display at the end of the help
-     * @param autoUsage whether to print an automatically generated 
+     * @param autoUsage whether to print an automatically generated
      * usage statement
      */
     public void printHelp(final int width, final String cmdLineSyntax, final String header,
@@ -508,8 +508,8 @@ public class HelpFormatter
      *
      * @throws IllegalStateException if there is no room to print a line
      */
-    public void printHelp(final PrintWriter pw, final int width, final String cmdLineSyntax, 
-                          final String header, final Options options, final int leftPad, 
+    public void printHelp(final PrintWriter pw, final int width, final String cmdLineSyntax,
+                          final String header, final Options options, final int leftPad,
                           final int descPad, final String footer)
     {
         printHelp(pw, width, cmdLineSyntax, header, options, leftPad, descPad, footer, false);
@@ -569,7 +569,7 @@ public class HelpFormatter
     /**
      * Prints the usage statement for the specified application.
      *
-     * @param pw The PrintWriter to print the usage statement 
+     * @param pw The PrintWriter to print the usage statement
      * @param width The number of characters to display per line
      * @param app The application name
      * @param options The command line Options
@@ -596,7 +596,7 @@ public class HelpFormatter
             // check if the option is part of an OptionGroup
             final OptionGroup group = options.getOptionGroup(option);
 
-            // if the option is part of a group 
+            // if the option is part of a group
             if (group != null)
             {
                 // and if the group has not already been processed
@@ -632,7 +632,7 @@ public class HelpFormatter
     }
 
     /**
-     * Appends the usage clause for an OptionGroup to a StringBuffer.  
+     * Appends the usage clause for an OptionGroup to a StringBuffer.
      * The clause is wrapped in square brackets if the group is required.
      * The display of the options is handled by appendOption
      * @param buff the StringBuffer to append to
@@ -670,7 +670,7 @@ public class HelpFormatter
     }
 
     /**
-     * Appends the usage clause for an Option to a StringBuffer.  
+     * Appends the usage clause for an Option to a StringBuffer.
      *
      * @param buff the StringBuffer to append to
      * @param option the Option to append
@@ -691,14 +691,14 @@ public class HelpFormatter
         {
             buff.append("--").append(option.getLongOpt());
         }
-        
+
         // if the Option has a value and a non blank argname
         if (option.hasArg() && (option.getArgName() == null || option.getArgName().length() != 0))
         {
             buff.append(option.getOpt() == null ? longOptSeparator : " ");
             buff.append("<").append(option.getArgName() != null ? option.getArgName() : getArgName()).append(">");
         }
-        
+
         // if the Option is not a required option
         if (!required)
         {
@@ -722,7 +722,7 @@ public class HelpFormatter
     }
 
     /**
-     * Print the help for the specified Options to the specified writer, 
+     * Print the help for the specified Options to the specified writer,
      * using the specified width, left padding and description padding.
      *
      * @param pw The printWriter to write the help to
@@ -733,7 +733,7 @@ public class HelpFormatter
      * @param descPad the number of characters of padding to be prefixed
      * to each description line
      */
-    public void printOptions(final PrintWriter pw, final int width, final Options options, 
+    public void printOptions(final PrintWriter pw, final int width, final Options options,
                              final int leftPad, final int descPad)
     {
         final StringBuffer sb = new StringBuffer();
@@ -791,9 +791,9 @@ public class HelpFormatter
         final String lpad = createPadding(leftPad);
         final String dpad = createPadding(descPad);
 
-        // first create list containing only <lpad>-a,--aaa where 
-        // -a is opt and --aaa is long opt; in parallel look for 
-        // the longest opt string this list will be then used to 
+        // first create list containing only <lpad>-a,--aaa where
+        // -a is opt and --aaa is long opt; in parallel look for
+        // the longest opt string this list will be then used to
         // sort options ascending
         int max = 0;
         final List<StringBuffer> prefixList = new ArrayList<StringBuffer>();
@@ -885,7 +885,7 @@ public class HelpFormatter
      *
      * @return the StringBuffer with the rendered Options contents.
      */
-    protected StringBuffer renderWrappedText(final StringBuffer sb, final int width, 
+    protected StringBuffer renderWrappedText(final StringBuffer sb, final int width,
                                              int nextLineTabStop, String text)
     {
         int pos = findWrapPos(text, width, 0);
@@ -968,7 +968,7 @@ public class HelpFormatter
     /**
      * Finds the next text wrap position after <code>startPos</code> for the
      * text in <code>text</code> with the column width <code>width</code>.
-     * The wrap point is the last position before startPos+width having a 
+     * The wrap point is the last position before startPos+width having a
      * whitespace character (space, \n, \r). If there is no whitespace character
      * before startPos+width, it will return startPos+width.
      *
diff --git a/src/main/java/org/apache/commons/cli/Option.java b/src/main/java/org/apache/commons/cli/Option.java
index f941788..5770a43 100644
--- a/src/main/java/org/apache/commons/cli/Option.java
+++ b/src/main/java/org/apache/commons/cli/Option.java
@@ -80,7 +80,7 @@ public class Option implements Cloneable, Serializable
 
     /**
      * Private constructor used by the nested Builder class.
-     * 
+     *
      * @param builder builder used to create this option
      */
     private Option(final Builder builder)
@@ -95,7 +95,7 @@ public class Option implements Cloneable, Serializable
         this.type = builder.type;
         this.valuesep = builder.valuesep;
     }
-    
+
     /**
      * Creates an Option using the specified parameters.
      * The option does not take an argument.
@@ -169,7 +169,7 @@ public class Option implements Cloneable, Serializable
 
     /**
      * Returns the 'unique' Option identifier.
-     * 
+     *
      * @return the 'unique' Option identifier
      */
     String getKey()
@@ -178,7 +178,7 @@ public class Option implements Cloneable, Serializable
         return (opt == null) ? longOpt : opt;
     }
 
-    /** 
+    /**
      * Retrieve the name of this Option.
      *
      * It is this String which can be used with
@@ -195,7 +195,7 @@ public class Option implements Cloneable, Serializable
 
     /**
      * Retrieve the type of this Option.
-     * 
+     *
      * @return The type of this option
      */
     public Object getType()
@@ -207,7 +207,7 @@ public class Option implements Cloneable, Serializable
      * Sets the type of this Option.
      * <p>
      * <b>Note:</b> this method is kept for binary compatibility and the
-     * input type is supposed to be a {@link Class} object. 
+     * input type is supposed to be a {@link Class} object.
      *
      * @param type the type of this Option
      * @deprecated since 1.3, use {@link #setType(Class)} instead
@@ -229,7 +229,7 @@ public class Option implements Cloneable, Serializable
         this.type = type;
     }
 
-    /** 
+    /**
      * Retrieve the long name of this Option.
      *
      * @return Long name of this option, or null, if there is no long name
@@ -268,7 +268,7 @@ public class Option implements Cloneable, Serializable
         return optionalArg;
     }
 
-    /** 
+    /**
      * Query to see if this Option has a long name
      *
      * @return boolean flag indicating existence of a long name
@@ -278,7 +278,7 @@ public class Option implements Cloneable, Serializable
         return longOpt != null;
     }
 
-    /** 
+    /**
      * Query to see if this Option requires an argument
      *
      * @return boolean flag indicating if an argument is required
@@ -288,7 +288,7 @@ public class Option implements Cloneable, Serializable
         return numberOfArgs > 0 || numberOfArgs == UNLIMITED_VALUES;
     }
 
-    /** 
+    /**
      * Retrieve the self-documenting description of this Option
      *
      * @return The string description of this option
@@ -309,7 +309,7 @@ public class Option implements Cloneable, Serializable
         this.description = description;
     }
 
-    /** 
+    /**
      * Query to see if this Option is mandatory
      *
      * @return boolean flag indicating whether this Option is mandatory
@@ -359,7 +359,7 @@ public class Option implements Cloneable, Serializable
         return argName != null && argName.length() > 0;
     }
 
-    /** 
+    /**
      * Query to see if this Option can take many values.
      *
      * @return boolean flag indicating if multiple values are allowed
@@ -369,7 +369,7 @@ public class Option implements Cloneable, Serializable
         return numberOfArgs > 1 || numberOfArgs == UNLIMITED_VALUES;
     }
 
-    /** 
+    /**
      * Sets the number of argument values this Option can take.
      *
      * @param num the number of argument values
@@ -402,7 +402,7 @@ public class Option implements Cloneable, Serializable
 
     /**
      * Return whether this Option has specified a value separator.
-     * 
+     *
      * @return whether this Option has specified a value separator.
      * @since 1.1
      */
@@ -411,9 +411,9 @@ public class Option implements Cloneable, Serializable
         return valuesep > 0;
     }
 
-    /** 
+    /**
      * Returns the number of argument values this Option can take.
-     * 
+     *
      * <p>
      * A value equal to the constant {@link #UNINITIALIZED} (= -1) indicates
      * the number of arguments has not been specified.
@@ -432,7 +432,7 @@ public class Option implements Cloneable, Serializable
 
     /**
      * Adds the specified value to this Option.
-     * 
+     *
      * @param value is a/the value of this Option
      */
     void addValueForProcessing(final String value)
@@ -469,7 +469,7 @@ public class Option implements Cloneable, Serializable
             // while there are more value separators
             while (index != -1)
             {
-                // next value to be added 
+                // next value to be added
                 if (values.size() == numberOfArgs - 1)
                 {
                     break;
@@ -511,10 +511,10 @@ public class Option implements Cloneable, Serializable
     }
 
     /**
-     * Returns the specified value of this Option or 
+     * Returns the specified value of this Option or
      * <code>null</code> if there is no value.
      *
-     * @return the value/first value of this Option or 
+     * @return the value/first value of this Option or
      * <code>null</code> if there is no value.
      */
     public String getValue()
@@ -523,12 +523,12 @@ public class Option implements Cloneable, Serializable
     }
 
     /**
-     * Returns the specified value of this Option or 
+     * Returns the specified value of this Option or
      * <code>null</code> if there is no value.
      *
      * @param index The index of the value to be returned.
      *
-     * @return the specified value of this Option or 
+     * @return the specified value of this Option or
      * <code>null</code> if there is no value.
      *
      * @throws IndexOutOfBoundsException if index is less than 1
@@ -540,13 +540,13 @@ public class Option implements Cloneable, Serializable
     }
 
     /**
-     * Returns the value/first value of this Option or the 
+     * Returns the value/first value of this Option or the
      * <code>defaultValue</code> if there is no value.
      *
      * @param defaultValue The value to be returned if there
      * is no value.
      *
-     * @return the value/first value of this Option or the 
+     * @return the value/first value of this Option or the
      * <code>defaultValue</code> if there are no values.
      */
     public String getValue(final String defaultValue)
@@ -557,10 +557,10 @@ public class Option implements Cloneable, Serializable
     }
 
     /**
-     * Return the values of this Option as a String array 
+     * Return the values of this Option as a String array
      * or null if there are no values
      *
-     * @return the values of this Option as a String array 
+     * @return the values of this Option as a String array
      * or null if there are no values
      */
     public String[] getValues()
@@ -577,7 +577,7 @@ public class Option implements Cloneable, Serializable
         return values;
     }
 
-    /** 
+    /**
      * Dump state, suitable for debugging.
      *
      * @return Stringified form of this object
@@ -663,12 +663,12 @@ public class Option implements Cloneable, Serializable
     }
 
     /**
-     * A rather odd clone method - due to incorrect code in 1.0 it is public 
-     * and in 1.1 rather than throwing a CloneNotSupportedException it throws 
-     * a RuntimeException so as to maintain backwards compat at the API level. 
+     * A rather odd clone method - due to incorrect code in 1.0 it is public
+     * and in 1.1 rather than throwing a CloneNotSupportedException it throws
+     * a RuntimeException so as to maintain backwards compat at the API level.
      *
-     * After calling this method, it is very likely you will want to call 
-     * clearValues(). 
+     * After calling this method, it is very likely you will want to call
+     * clearValues().
      *
      * @return a clone of this Option instance
      * @throws RuntimeException if a {@link CloneNotSupportedException} has been thrown
@@ -701,7 +701,7 @@ public class Option implements Cloneable, Serializable
     }
 
     /**
-     * This method is not intended to be used. It was a piece of internal 
+     * This method is not intended to be used. It was a piece of internal
      * API that was made public in 1.0. It currently throws an UnsupportedOperationException.
      *
      * @param value the value to add
@@ -718,7 +718,7 @@ public class Option implements Cloneable, Serializable
 
     /**
      * Tells if the option can accept more arguments.
-     * 
+     *
      * @return false if the maximum number of arguments is reached
      * @since 1.3
      */
@@ -729,7 +729,7 @@ public class Option implements Cloneable, Serializable
 
     /**
      * Tells if the option requires more arguments to be valid.
-     * 
+     *
      * @return false if the option doesn't require more arguments
      * @since 1.3
      */
@@ -745,11 +745,11 @@ public class Option implements Cloneable, Serializable
         }
         return acceptsArg();
     }
-    
+
     /**
      * Returns a {@link Builder} to create an {@link Option} using descriptive
-     * methods.  
-     * 
+     * methods.
+     *
      * @return a new {@link Builder} instance
      * @since 1.3
      */
@@ -757,10 +757,10 @@ public class Option implements Cloneable, Serializable
     {
         return builder(null);
     }
-    
+
     /**
      * Returns a {@link Builder} to create an {@link Option} using descriptive
-     * methods.  
+     * methods.
      *
      * @param opt short representation of the option
      * @return a new {@link Builder} instance
@@ -771,7 +771,7 @@ public class Option implements Cloneable, Serializable
     {
         return new Builder(opt);
     }
-    
+
     /**
      * A nested builder class to create <code>Option</code> instances
      * using descriptive methods.
@@ -783,10 +783,10 @@ public class Option implements Cloneable, Serializable
      *     .longOpt("arg-name")
      *     .build();
      * </pre>
-     * 
+     *
      * @since 1.3
      */
-    public static final class Builder 
+    public static final class Builder
     {
         /** the name of the option */
         private final String opt;
@@ -818,7 +818,7 @@ public class Option implements Cloneable, Serializable
         /**
          * Constructs a new <code>Builder</code> with the minimum
          * required parameters for an <code>Option</code> instance.
-         * 
+         *
          * @param opt short representation of the option
          * @throws IllegalArgumentException if there are any non valid Option characters in {@code opt}
          */
@@ -827,7 +827,7 @@ public class Option implements Cloneable, Serializable
             OptionValidator.validateOption(opt);
             this.opt = opt;
         }
-        
+
         /**
          * Sets the display name for the argument value.
          *
@@ -857,25 +857,25 @@ public class Option implements Cloneable, Serializable
          *
          * @param longOpt the long name of the Option
          * @return this builder, to allow method chaining
-         */        
+         */
         public Builder longOpt(final String longOpt)
         {
             this.longOpt = longOpt;
             return this;
         }
-        
-        /** 
+
+        /**
          * Sets the number of argument values the Option can take.
          *
          * @param numberOfArgs the number of argument values
          * @return this builder, to allow method chaining
-         */        
+         */
         public Builder numberOfArgs(final int numberOfArgs)
         {
             this.numberOfArgs = numberOfArgs;
             return this;
         }
-        
+
         /**
          * Sets whether the Option can have an optional argument.
          *
@@ -888,7 +888,7 @@ public class Option implements Cloneable, Serializable
             this.optionalArg = isOptional;
             return this;
         }
-        
+
         /**
          * Marks this Option as required.
          *
@@ -910,7 +910,7 @@ public class Option implements Cloneable, Serializable
             this.required = required;
             return this;
         }
-        
+
         /**
          * Sets the type of the Option.
          *
@@ -959,10 +959,10 @@ public class Option implements Cloneable, Serializable
             valuesep = sep;
             return this;
         }
-        
+
         /**
          * Indicates that the Option will require an argument.
-         * 
+         *
          * @return this builder, to allow method chaining
          */
         public Builder hasArg()
@@ -972,7 +972,7 @@ public class Option implements Cloneable, Serializable
 
         /**
          * Indicates if the Option has an argument or not.
-         * 
+         *
          * @param hasArg specifies whether the Option takes an argument or not
          * @return this builder, to allow method chaining
          */
@@ -985,7 +985,7 @@ public class Option implements Cloneable, Serializable
 
         /**
          * Indicates that the Option can have unlimited argument values.
-         * 
+         *
          * @return this builder, to allow method chaining
          */
         public Builder hasArgs()
@@ -996,7 +996,7 @@ public class Option implements Cloneable, Serializable
 
         /**
          * Constructs an Option with the values declared by this {@link Builder}.
-         * 
+         *
          * @return the new {@link Option}
          * @throws IllegalArgumentException if neither {@code opt} or {@code longOpt} has been set
          */
diff --git a/src/main/java/org/apache/commons/cli/OptionBuilder.java b/src/main/java/org/apache/commons/cli/OptionBuilder.java
index 2548dbe..96b9bc8 100644
--- a/src/main/java/org/apache/commons/cli/OptionBuilder.java
+++ b/src/main/java/org/apache/commons/cli/OptionBuilder.java
@@ -285,7 +285,7 @@ public final class OptionBuilder
      * of <code>type</code>.
      * <p>
      * <b>Note:</b> this method is kept for binary compatibility and the
-     * input type is supposed to be a {@link Class} object. 
+     * input type is supposed to be a {@link Class} object.
      *
      * @param newType the type of the Options argument value
      * @return the OptionBuilder instance
diff --git a/src/main/java/org/apache/commons/cli/OptionGroup.java b/src/main/java/org/apache/commons/cli/OptionGroup.java
index 68cf2c5..ad21f19 100644
--- a/src/main/java/org/apache/commons/cli/OptionGroup.java
+++ b/src/main/java/org/apache/commons/cli/OptionGroup.java
@@ -30,7 +30,7 @@ public class OptionGroup implements Serializable
 {
     /** The serial version UID. */
     private static final long serialVersionUID = 1L;
-    
+
     /** hold the options */
     private final Map<String, Option> optionMap = new LinkedHashMap<String, Option>();
 
@@ -56,7 +56,7 @@ public class OptionGroup implements Serializable
     }
 
     /**
-     * @return the names of the options in this group as a 
+     * @return the names of the options in this group as a
      * <code>Collection</code>
      */
     public Collection<String> getNames()
@@ -78,7 +78,7 @@ public class OptionGroup implements Serializable
      * Set the selected option of this group to <code>name</code>.
      *
      * @param option the option that is selected
-     * @throws AlreadySelectedException if an option from this group has 
+     * @throws AlreadySelectedException if an option from this group has
      * already been selected.
      */
     public void setSelected(final Option option) throws AlreadySelectedException
@@ -89,8 +89,8 @@ public class OptionGroup implements Serializable
             selected = null;
             return;
         }
-        
-        // if no option has already been selected or the 
+
+        // if no option has already been selected or the
         // same option is being reselected then set the
         // selected member variable
         if (selected == null || selected.equals(option.getKey()))
@@ -131,14 +131,14 @@ public class OptionGroup implements Serializable
 
     /**
      * Returns the stringified version of this OptionGroup.
-     * 
+     *
      * @return the stringified representation of this group
      */
     @Override
     public String toString()
     {
         final StringBuilder buff = new StringBuilder();
-        
+
         final Iterator<Option> iter = getOptions().iterator();
 
         buff.append("[");
@@ -157,13 +157,13 @@ public class OptionGroup implements Serializable
                 buff.append("--");
                 buff.append(option.getLongOpt());
             }
-            
+
             if (option.getDescription() != null)
             {
                 buff.append(" ");
                 buff.append(option.getDescription());
             }
-            
+
             if (iter.hasNext())
             {
                 buff.append(", ");
diff --git a/src/main/java/org/apache/commons/cli/OptionValidator.java b/src/main/java/org/apache/commons/cli/OptionValidator.java
index 11a39d4..6f65d27 100644
--- a/src/main/java/org/apache/commons/cli/OptionValidator.java
+++ b/src/main/java/org/apache/commons/cli/OptionValidator.java
@@ -48,7 +48,7 @@ final class OptionValidator
         {
             return;
         }
-        
+
         // handle the single character opt
         if (opt.length() == 1)
         {
diff --git a/src/main/java/org/apache/commons/cli/Options.java b/src/main/java/org/apache/commons/cli/Options.java
index 00fa414..1d07dee 100644
--- a/src/main/java/org/apache/commons/cli/Options.java
+++ b/src/main/java/org/apache/commons/cli/Options.java
@@ -96,7 +96,7 @@ public class Options implements Serializable
 
     /**
      * Add an option that only contains a short name.
-     * 
+     *
      * <p>
      * The option does not take an argument.
      * </p>
@@ -151,7 +151,7 @@ public class Options implements Serializable
 
     /**
      * Add an option that contains a short-name and a long-name.
-     * 
+     *
      * <p>
      * The added option is set as required. It may be specified as requiring an argument. This method is a shortcut for:
      * </p>
@@ -264,7 +264,7 @@ public class Options implements Serializable
 
     /**
      * Returns the options with a long name starting with the name specified.
-     * 
+     *
      * @param opt the partial name of the option
      * @return the options matching the partial name specified, or an empty list if none matches
      * @since 1.3
@@ -272,7 +272,7 @@ public class Options implements Serializable
     public List<String> getMatchingOptions(String opt)
     {
         opt = Util.stripLeadingHyphens(opt);
-        
+
         final List<String> matchingOpts = new ArrayList<String>();
 
         // for a perfect match return the single option only
@@ -288,7 +288,7 @@ public class Options implements Serializable
                 matchingOpts.add(longOpt);
             }
         }
-        
+
         return matchingOpts;
     }
 
diff --git a/src/main/java/org/apache/commons/cli/Parser.java b/src/main/java/org/apache/commons/cli/Parser.java
index 77f8fc9..1f00e14 100644
--- a/src/main/java/org/apache/commons/cli/Parser.java
+++ b/src/main/java/org/apache/commons/cli/Parser.java
@@ -111,7 +111,7 @@ public abstract class Parser implements CommandLineParser
      * @param options         the <code>Options</code>
      * @param arguments       the <code>arguments</code>
      * @param stopAtNonOption if <code>true</code> an unrecognized argument stops
-     *     the parsing and the remaining arguments are added to the 
+     *     the parsing and the remaining arguments are added to the
      *     {@link CommandLine}s args list. If <code>false</code> an unrecognized
      *     argument triggers a ParseException.
      * @return the <code>CommandLine</code>
@@ -130,7 +130,7 @@ public abstract class Parser implements CommandLineParser
      * @param arguments the command line arguments
      * @param properties command line option name-value pairs
      * @param stopAtNonOption if <code>true</code> an unrecognized argument stops
-     *     the parsing and the remaining arguments are added to the 
+     *     the parsing and the remaining arguments are added to the
      *     {@link CommandLine}s args list. If <code>false</code> an unrecognized
      *     argument triggers a ParseException.
      *
@@ -149,12 +149,12 @@ public abstract class Parser implements CommandLineParser
         {
             opt.clearValues();
         }
-        
+
         // clear the data from the groups
         for (final OptionGroup group : options.getOptionGroups())
         {
             group.setSelected(null);
-        }        
+        }
 
         // initialise members
         setOptions(options);
@@ -260,17 +260,17 @@ public abstract class Parser implements CommandLineParser
         for (final Enumeration<?> e = properties.propertyNames(); e.hasMoreElements();)
         {
             final String option = e.nextElement().toString();
-            
+
             final Option opt = options.getOption(option);
             if (opt == null)
             {
                 throw new UnrecognizedOptionException("Default option wasn't defined", option);
             }
-            
+
             // if the option is part of a group, check if another option of the group has been selected
             final OptionGroup group = options.getOptionGroup(opt);
             final boolean selected = group != null && group.getSelected() != null;
-            
+
             if (!cmd.hasOption(option) && !selected)
             {
                 // get the value from the properties instance
@@ -337,7 +337,7 @@ public abstract class Parser implements CommandLineParser
         while (iter.hasNext())
         {
             final String str = iter.next();
-            
+
             // found an Option, not an argument
             if (getOptions().hasOption(str) && str.startsWith("-"))
             {
@@ -384,23 +384,23 @@ public abstract class Parser implements CommandLineParser
 
         // get the option represented by arg
         final Option opt = (Option) getOptions().getOption(arg).clone();
-        
+
         // update the required options and groups
         updateRequiredOptions(opt);
-        
+
         // if the option takes an argument value
         if (opt.hasArg())
         {
             processArgs(opt, iter);
         }
-        
+
         // set the option on the command line
         cmd.addOption(opt);
     }
 
     /**
      * Removes the option or its group from the list of expected elements.
-     * 
+     *
      * @param opt
      */
     private void updateRequiredOptions(final Option opt) throws ParseException
diff --git a/src/main/java/org/apache/commons/cli/PatternOptionBuilder.java b/src/main/java/org/apache/commons/cli/PatternOptionBuilder.java
index de8f5da..bd824ef 100644
--- a/src/main/java/org/apache/commons/cli/PatternOptionBuilder.java
+++ b/src/main/java/org/apache/commons/cli/PatternOptionBuilder.java
@@ -27,7 +27,7 @@ import java.util.Date;
  * The pattern contains various single character flags and via
  * an optional punctuation character, their expected type.
  * </p>
- * 
+ *
  * <table border="1">
  *   <caption>Overview of PatternOptionBuilder patterns</caption>
  *   <tr><td>a</td><td>-a flag</td></tr>
@@ -38,7 +38,7 @@ import java.util.Date;
  *   <tr><td>f/</td><td>-f [url]</td></tr>
  *   <tr><td>g:</td><td>-g [string]</td></tr>
  * </table>
- * 
+ *
  * <p>
  * For example, the following allows command line flags of '-v -p string-value -f /dir/file'.
  * The exclamation mark precede a mandatory option.
@@ -168,7 +168,7 @@ public class PatternOptionBuilder
                         .required(required)
                         .type(type)
                         .build();
-                    
+
                     // we have a previous one to deal with
                     options.addOption(option);
                     required = false;
@@ -195,7 +195,7 @@ public class PatternOptionBuilder
                 .required(required)
                 .type(type)
                 .build();
-            
+
             // we have a final one to deal with
             options.addOption(option);
         }
diff --git a/src/main/java/org/apache/commons/cli/PosixParser.java b/src/main/java/org/apache/commons/cli/PosixParser.java
index 80e583a..094ea0c 100644
--- a/src/main/java/org/apache/commons/cli/PosixParser.java
+++ b/src/main/java/org/apache/commons/cli/PosixParser.java
@@ -111,13 +111,13 @@ public class PosixParser extends Parser
             {
                 tokens.add(token);
             }
-            
+
             // handle long option --foo or --foo=bar
             else if (token.startsWith("--"))
             {
                 final int pos = token.indexOf('=');
                 final String opt = pos == -1 ? token : token.substring(0, pos); // --foo
-                
+
                 final List<String> matchingOpts = options.getMatchingOptions(opt);
 
                 if (matchingOpts.isEmpty())
@@ -131,7 +131,7 @@ public class PosixParser extends Parser
                 else
                 {
                     currentOption = options.getOption(matchingOpts.get(0));
-                    
+
                     tokens.add("--" + currentOption.getLongOpt());
                     if (pos != -1)
                     {
diff --git a/src/main/java/org/apache/commons/cli/TypeHandler.java b/src/main/java/org/apache/commons/cli/TypeHandler.java
index 6c43ccd..3afdc3b 100644
--- a/src/main/java/org/apache/commons/cli/TypeHandler.java
+++ b/src/main/java/org/apache/commons/cli/TypeHandler.java
@@ -124,7 +124,7 @@ public class TypeHandler
         {
             throw new ParseException("Unable to find the class: " + classname);
         }
-        
+
         try
         {
             return cl.newInstance();
diff --git a/src/main/java/org/apache/commons/cli/Util.java b/src/main/java/org/apache/commons/cli/Util.java
index e3f6d43..48ab718 100644
--- a/src/main/java/org/apache/commons/cli/Util.java
+++ b/src/main/java/org/apache/commons/cli/Util.java
@@ -64,7 +64,7 @@ final class Util
         {
             str = str.substring(1, length - 1);
         }
-        
+
         return str;
     }
 }
diff --git a/src/test/java/org/apache/commons/cli/BasicParserTest.java b/src/test/java/org/apache/commons/cli/BasicParserTest.java
index 10e5830..c6c2137 100644
--- a/src/test/java/org/apache/commons/cli/BasicParserTest.java
+++ b/src/test/java/org/apache/commons/cli/BasicParserTest.java
@@ -40,12 +40,12 @@ public class BasicParserTest extends ParserTestCase
     public void testLongWithoutEqualSingleDash() throws Exception
     {
     }
-    
+
     @Override @Test @Ignore("not supported by the BasicParser")
     public void testAmbiguousLongWithoutEqualSingleDash() throws Exception
     {
     }
-    
+
     @Override @Test @Ignore("not supported by the BasicParser (CLI-184)")
     public void testNegativeOption() throws Exception
     {
@@ -59,7 +59,7 @@ public class BasicParserTest extends ParserTestCase
     @Override @Test @Ignore("not supported by the BasicParser")
     public void testPropertiesOption2() throws Exception
     {
-    }    
+    }
 
     @Override @Test @Ignore("not supported by the BasicParser")
     public void testShortWithEqual() throws Exception
@@ -80,7 +80,7 @@ public class BasicParserTest extends ParserTestCase
     public void testLongWithEqualSingleDash() throws Exception
     {
     }
-    
+
     @Override @Test @Ignore("not supported by the BasicParser")
     public void testUnambiguousPartialLongOption1() throws Exception
     {
diff --git a/src/test/java/org/apache/commons/cli/CommandLineTest.java b/src/test/java/org/apache/commons/cli/CommandLineTest.java
index cf22712..e22fe59 100644
--- a/src/test/java/org/apache/commons/cli/CommandLineTest.java
+++ b/src/test/java/org/apache/commons/cli/CommandLineTest.java
@@ -50,7 +50,7 @@ public class CommandLineTest
 
         assertEquals("property with long format", "bar", cl.getOptionProperties("property").getProperty("foo"));
     }
-    
+
     @Test
     public void testGetOptionPropertiesWithOption() throws Exception
     {
@@ -82,11 +82,11 @@ public class CommandLineTest
         final CommandLine cmd = new CommandLine();
         assertNotNull(cmd.getOptions());
         assertEquals(0, cmd.getOptions().length);
-        
+
         cmd.addOption(new Option("a", null));
         cmd.addOption(new Option("b", null));
         cmd.addOption(new Option("c", null));
-        
+
         assertEquals(3, cmd.getOptions().length);
     }
 
@@ -95,27 +95,27 @@ public class CommandLineTest
         final Options options = new Options();
         options.addOption(OptionBuilder.hasArg().withType(Number.class).create("i"));
         options.addOption(OptionBuilder.hasArg().create("f"));
-        
+
         final CommandLineParser parser = new DefaultParser();
         final CommandLine cmd = parser.parse(options, new String[] { "-i", "123", "-f", "foo" });
-        
+
         assertEquals(123, ((Number) cmd.getParsedOptionValue("i")).intValue());
         assertEquals("foo", cmd.getParsedOptionValue("f"));
     }
-    
+
     @Test
     public void testGetParsedOptionValueWithChar() throws Exception {
         final Options options = new Options();
         options.addOption(Option.builder("i").hasArg().type(Number.class).build());
         options.addOption(Option.builder("f").hasArg().build());
-        
+
         final CommandLineParser parser = new DefaultParser();
         final CommandLine cmd = parser.parse(options, new String[] { "-i", "123", "-f", "foo" });
-        
+
         assertEquals(123, ((Number) cmd.getParsedOptionValue('i')).intValue());
         assertEquals("foo", cmd.getParsedOptionValue('f'));
     }
-    
+
     @Test
     public void testGetParsedOptionValueWithOption() throws Exception {
         final Options options = new Options();
@@ -123,14 +123,14 @@ public class CommandLineTest
         final Option opt_f = Option.builder("f").hasArg().build();
         options.addOption(opt_i);
         options.addOption(opt_f);
-        
+
         final CommandLineParser parser = new DefaultParser();
         final CommandLine cmd = parser.parse(options, new String[] { "-i", "123", "-f", "foo" });
-        
+
         assertEquals(123, ((Number) cmd.getParsedOptionValue(opt_i)).intValue());
         assertEquals("foo", cmd.getParsedOptionValue(opt_f));
     }
-    
+
     @Test
     public void testNullhOption() throws Exception {
         final Options options = new Options();
diff --git a/src/test/java/org/apache/commons/cli/GnuParserTest.java b/src/test/java/org/apache/commons/cli/GnuParserTest.java
index 0b1c282..7842db3 100644
--- a/src/test/java/org/apache/commons/cli/GnuParserTest.java
+++ b/src/test/java/org/apache/commons/cli/GnuParserTest.java
@@ -35,7 +35,7 @@ public class GnuParserTest extends ParserTestCase
     public void testDoubleDash2() throws Exception
     {
     }
-    
+
     @Override @Test @Ignore("not supported by the GnuParser")
     public void testLongWithoutEqualSingleDash() throws Exception
     {
@@ -52,17 +52,17 @@ public class GnuParserTest extends ParserTestCase
     }
 
     @Override @Test @Ignore("not supported by the GnuParser")
-    public void testLongWithUnexpectedArgument1() throws Exception 
+    public void testLongWithUnexpectedArgument1() throws Exception
     {
     }
 
     @Override @Test @Ignore("not supported by the GnuParser")
-    public void testLongWithUnexpectedArgument2() throws Exception 
+    public void testLongWithUnexpectedArgument2() throws Exception
     {
     }
 
     @Override @Test @Ignore("not supported by the GnuParser")
-    public void testShortWithUnexpectedArgument() throws Exception 
+    public void testShortWithUnexpectedArgument() throws Exception
     {
     }
 
diff --git a/src/test/java/org/apache/commons/cli/HelpFormatterTest.java b/src/test/java/org/apache/commons/cli/HelpFormatterTest.java
index 0df8d62..a712007 100644
--- a/src/test/java/org/apache/commons/cli/HelpFormatterTest.java
+++ b/src/test/java/org/apache/commons/cli/HelpFormatterTest.java
@@ -27,7 +27,7 @@ import java.util.Comparator;
 
 import org.junit.Test;
 
-/** 
+/**
  * Test case for the HelpFormatter class.
  */
 public class HelpFormatterTest
@@ -42,22 +42,22 @@ public class HelpFormatterTest
         String text = "This is a test.";
         // text width should be max 8; the wrap position is 7
         assertEquals("wrap position", 7, hf.findWrapPos(text, 8, 0));
-        
+
         // starting from 8 must give -1 - the wrap pos is after end
         assertEquals("wrap position 2", -1, hf.findWrapPos(text, 8, 8));
-        
+
         // words longer than the width are cut
         text = "aaaa aa";
         assertEquals("wrap position 3", 3, hf.findWrapPos(text, 3, 0));
-        
+
         // last word length is equal to the width
         text = "aaaaaa aaaaaa";
         assertEquals("wrap position 4", 6, hf.findWrapPos(text, 6, 0));
         assertEquals("wrap position 4", -1, hf.findWrapPos(text, 6, 7));
-        
+
         text = "aaaaaa\n aaaaaa";
         assertEquals("wrap position 5", 7, hf.findWrapPos(text, 6, 0));
-        
+
         text = "aaaaaa\t aaaaaa";
         assertEquals("wrap position 6", 7, hf.findWrapPos(text, 6, 0));
     }
@@ -68,9 +68,9 @@ public class HelpFormatterTest
         final int width = 7;
         final int padding = 0;
         final String text = "Thisisatest.";
-        final String expected = "Thisisa" + EOL + 
+        final String expected = "Thisisa" + EOL +
                           "test.";
-        
+
         final StringBuffer sb = new StringBuffer();
         new HelpFormatter().renderWrappedText(sb, width, padding, text);
         assertEquals("cut and wrap", expected, sb.toString());
@@ -83,9 +83,9 @@ public class HelpFormatterTest
         final int width = 12;
         final int padding = 0;
         final String text = "This is a test.";
-        final String expected = "This is a" + EOL + 
+        final String expected = "This is a" + EOL +
                           "test.";
-        
+
         final StringBuffer sb = new StringBuffer();
         new HelpFormatter().renderWrappedText(sb, width, padding, text);
         assertEquals("single line text", expected, sb.toString());
@@ -98,9 +98,9 @@ public class HelpFormatterTest
         final int width = 12;
         final int padding = 4;
         final String text = "This is a test.";
-        final String expected = "This is a" + EOL + 
+        final String expected = "This is a" + EOL +
                           "    test.";
-        
+
         final StringBuffer sb = new StringBuffer();
         new HelpFormatter().renderWrappedText(sb, width, padding, text);
         assertEquals("single line padded text", expected, sb.toString());
@@ -117,7 +117,7 @@ public class HelpFormatterTest
         final String expected = "  -p,--period <PERIOD>  PERIOD is time duration of" + EOL +
                           "                        form DATE[-DATE] where DATE" + EOL +
                           "                        has form YYYY[MM[DD]]";
-        
+
         final StringBuffer sb = new StringBuffer();
         new HelpFormatter().renderWrappedText(sb, width, padding, text);
         assertEquals("single line padded text 2", expected, sb.toString());
@@ -150,7 +150,7 @@ public class HelpFormatterTest
         final String expected = "aaaa aaaa aaaa" + EOL +
                           "    aaaaaa" + EOL +
                           "    aaaaa";
-        
+
         final StringBuffer sb = new StringBuffer();
         new HelpFormatter().renderWrappedText(sb, width, padding, text);
         assertEquals("multi-line padded text", expected, sb.toString());
@@ -378,10 +378,10 @@ public class HelpFormatterTest
     public void testDefaultArgName()
     {
         final Option option = Option.builder("f").hasArg().required(true).build();
-        
+
         final Options options = new Options();
         options.addOption(option);
-        
+
         final StringWriter out = new StringWriter();
 
         final HelpFormatter formatter = new HelpFormatter();
@@ -430,7 +430,7 @@ public class HelpFormatterTest
         formatter.setWidth(80);
         assertEquals("width", 80, formatter.getWidth());
     }
-    
+
     @Test
     public void testHeaderStartingWithLineSeparator()
     {
@@ -490,7 +490,7 @@ public class HelpFormatterTest
                 "  -c        ccccccc" + EOL
                 , out.toString());
     }
-    
+
     @Test
     public void testOptionWithoutShortFormat2()
     {
@@ -499,38 +499,38 @@ public class HelpFormatterTest
         final Option version = new Option("v", "version", false, "print version information");
         final Option newRun = new Option("n", "new", false, "Create NLT cache entries only for new items");
         final Option trackerRun = new Option("t", "tracker", false, "Create NLT cache entries only for tracker items");
-        
+
         final Option timeLimit = Option.builder("l")
                                  .longOpt("limit")
                                  .hasArg()
                                  .valueSeparator()
                                  .desc("Set time limit for execution, in mintues")
                                  .build();
-        
+
         final Option age = Option.builder("a").longOpt("age")
                                         .hasArg()
                                         .valueSeparator()
                                         .desc("Age (in days) of cache item before being recomputed")
                                         .build();
-        
+
         final Option server = Option.builder("s").longOpt("server")
                                            .hasArg()
                                            .valueSeparator()
                                            .desc("The NLT server address")
                                            .build();
-        
+
         final Option numResults = Option.builder("r").longOpt("results")
                                                .hasArg()
                                                .valueSeparator()
                                                .desc("Number of results per item")
                                                .build();
-        
+
         final Option configFile = Option.builder().longOpt("config")
                                             .hasArg()
                                             .valueSeparator()
                                             .desc("Use the specified configuration file")
                                             .build();
-        
+
         final Options mOptions = new Options();
         mOptions.addOption(help);
         mOptions.addOption(version);
@@ -541,7 +541,7 @@ public class HelpFormatterTest
         mOptions.addOption(server);
         mOptions.addOption(numResults);
         mOptions.addOption(configFile);
-        
+
         final HelpFormatter formatter = new HelpFormatter();
         final String EOL = System.getProperty("line.separator");
         final StringWriter out = new StringWriter();
@@ -562,7 +562,7 @@ public class HelpFormatterTest
                 "footer"+EOL
                 ,out.toString());
     }
-    
+
     @Test
     public void testHelpWithLongOptSeparator() throws Exception
     {
@@ -570,12 +570,12 @@ public class HelpFormatterTest
         options.addOption( "f", true, "the file" );
         options.addOption(Option.builder("s").longOpt("size").desc("the size").hasArg().argName("SIZE").build());
         options.addOption(Option.builder().longOpt("age").desc("the age").hasArg().build());
-        
+
         final HelpFormatter formatter = new HelpFormatter();
         assertEquals(HelpFormatter.DEFAULT_LONG_OPT_SEPARATOR, formatter.getLongOptSeparator());
         formatter.setLongOptSeparator("=");
         assertEquals("=", formatter.getLongOptSeparator());
-        
+
         final StringWriter out = new StringWriter();
 
         formatter.printHelp(new PrintWriter(out), 80, "create", "header", options, 2, 2, "footer");
@@ -597,14 +597,14 @@ public class HelpFormatterTest
         options.addOption( "f", true, "the file" );
         options.addOption(Option.builder("s").longOpt("size").desc("the size").hasArg().argName("SIZE").build());
         options.addOption(Option.builder().longOpt("age").desc("the age").hasArg().build());
-        
+
         final HelpFormatter formatter = new HelpFormatter();
         formatter.setLongOptSeparator("=");
-        
+
         final StringWriter out = new StringWriter();
-        
+
         formatter.printUsage(new PrintWriter(out), 80, "create", options);
-        
+
         assertEquals("usage: create [--age=<arg>] [-f <arg>] [-s <SIZE>]", out.toString().trim());
     }
 }
diff --git a/src/test/java/org/apache/commons/cli/OptionBuilderTest.java b/src/test/java/org/apache/commons/cli/OptionBuilderTest.java
index e187c1c..f2973a3 100644
--- a/src/test/java/org/apache/commons/cli/OptionBuilderTest.java
+++ b/src/test/java/org/apache/commons/cli/OptionBuilderTest.java
@@ -108,7 +108,7 @@ public class OptionBuilderTest
         // '@'
         final Option opt2 = OptionBuilder.withDescription("read from stdin").create('@');
         assertEquals("@", opt2.getOpt());
-        
+
         // ' '
         try {
             OptionBuilder.create(' ');
@@ -147,7 +147,7 @@ public class OptionBuilderTest
             // success
         }
 
-        // valid option 
+        // valid option
         try {
             OptionBuilder.create( "opt" );
             // success
@@ -167,7 +167,7 @@ public class OptionBuilderTest
         catch (final IllegalArgumentException e)
         {
             // expected
-            
+
             // implicitly reset the builder
             OptionBuilder.create( "opt" );
         }
diff --git a/src/test/java/org/apache/commons/cli/OptionGroupTest.java b/src/test/java/org/apache/commons/cli/OptionGroupTest.java
index 46267da..24e783f 100644
--- a/src/test/java/org/apache/commons/cli/OptionGroupTest.java
+++ b/src/test/java/org/apache/commons/cli/OptionGroupTest.java
@@ -205,10 +205,10 @@ public class OptionGroupTest
     public void testTwoOptionsFromGroupWithProperties() throws Exception
     {
         final String[] args = new String[] { "-f" };
-        
+
         final Properties properties = new Properties();
         properties.put("d", "true");
-        
+
         final CommandLine cl = parser.parse( _options, args, properties);
         assertTrue(cl.hasOption("f"));
         assertTrue(!cl.hasOption("d"));
diff --git a/src/test/java/org/apache/commons/cli/OptionTest.java b/src/test/java/org/apache/commons/cli/OptionTest.java
index bca773b..324048b 100644
--- a/src/test/java/org/apache/commons/cli/OptionTest.java
+++ b/src/test/java/org/apache/commons/cli/OptionTest.java
@@ -72,7 +72,7 @@ public class OptionTest
         assertEquals(0, a.getValuesList().size());
         assertEquals(2, b.getValues().length);
     }
-    
+
     @Test
     public void testHashCode() {
         assertNotEquals(Option.builder("test").build().hashCode(), Option.builder("test2").build().hashCode()) ;
@@ -154,12 +154,12 @@ public class OptionTest
         assertEquals(null, option.getValue(0));
 
         option.addValueForProcessing("foo");
-        
+
         assertEquals("foo", option.getValue());
         assertEquals("foo", option.getValue(0));
         assertEquals("foo", option.getValue("default"));
     }
-    
+
     @Test
     public void testBuilderMethods()
     {
@@ -195,7 +195,7 @@ public class OptionTest
         checkOption(Option.builder("a").desc("desc").type(Integer.class).build(),
             "a", "desc", null, Option.UNINITIALIZED, null, false, false, defaultSeparator, Integer.class);
     }
-    
+
     @Test(expected=IllegalArgumentException.class)
     public void testBuilderInsufficientParams1()
     {
@@ -223,5 +223,5 @@ public class OptionTest
         assertEquals(valueSeparator, option.getValueSeparator());
         assertEquals(cls,  option.getType());
     }
-    
+
 }
diff --git a/src/test/java/org/apache/commons/cli/OptionsTest.java b/src/test/java/org/apache/commons/cli/OptionsTest.java
index f5a7dcb..bb594cb 100644
--- a/src/test/java/org/apache/commons/cli/OptionsTest.java
+++ b/src/test/java/org/apache/commons/cli/OptionsTest.java
@@ -82,7 +82,7 @@ public class OptionsTest
         final Option shortOnly2 = OptionBuilder.create("2");
         final Option bothA = OptionBuilder.withLongOpt("bothA").create("a");
         final Option bothB = OptionBuilder.withLongOpt("bothB").create("b");
-        
+
         final Options options = new Options();
         options.addOption(longOnly1);
         options.addOption(longOnly2);
@@ -90,7 +90,7 @@ public class OptionsTest
         options.addOption(shortOnly2);
         options.addOption(bothA);
         options.addOption(bothB);
-        
+
         final Collection<Option> allOptions = new ArrayList<Option>();
         allOptions.add(longOnly1);
         allOptions.add(longOnly2);
@@ -98,11 +98,11 @@ public class OptionsTest
         allOptions.add(shortOnly2);
         allOptions.add(bothA);
         allOptions.add(bothB);
-        
+
         final Collection<Option> helpOptions = options.helpOptions();
-        
+
         assertTrue("Everything in all should be in help", helpOptions.containsAll(allOptions));
-        assertTrue("Everything in help should be in all", allOptions.containsAll(helpOptions));        
+        assertTrue("Everything in help should be in all", allOptions.containsAll(helpOptions));
     }
 
     @Test
@@ -170,14 +170,14 @@ public class OptionsTest
         assertNotNull(options.getOptionGroups());
         assertEquals(2, options.getOptionGroups().size());
     }
-    
+
     @Test
     public void testGetMatchingOpts()
     {
         final Options options = new Options();
         options.addOption(OptionBuilder.withLongOpt("version").create());
         options.addOption(OptionBuilder.withLongOpt("verbose").create());
-        
+
         assertTrue(options.getMatchingOptions("foo").isEmpty());
         assertEquals(1, options.getMatchingOptions("version").size());
         assertEquals(2, options.getMatchingOptions("ver").size());
diff --git a/src/test/java/org/apache/commons/cli/ParserTestCase.java b/src/test/java/org/apache/commons/cli/ParserTestCase.java
index 8755e0b..2067e40 100644
--- a/src/test/java/org/apache/commons/cli/ParserTestCase.java
+++ b/src/test/java/org/apache/commons/cli/ParserTestCase.java
@@ -187,7 +187,7 @@ public abstract class ParserTestCase
             assertEquals("n", e.getOption().getOpt());
         }
     }
-    
+
     @Test
     public void testSingleDash() throws Exception
     {
@@ -269,13 +269,13 @@ public abstract class ParserTestCase
     public void testNegativeOption() throws Exception
     {
         final String[] args = new String[] { "-b", "-1"} ;
-        
+
         options.addOption("1", false, null);
 
         final CommandLine cl = parser.parse(options, args);
         assertEquals("-1", cl.getOptionValue("b"));
     }
-    
+
     @Test
     public void testArgumentStartingWithHyphen() throws Exception
     {
@@ -349,7 +349,7 @@ public abstract class ParserTestCase
 
         assertEquals("bar", cl.getOptionValue("foo"));
     }
-    
+
     @Test
     public void testAmbiguousLongWithoutEqualSingleDash() throws Exception
     {
@@ -441,7 +441,7 @@ public abstract class ParserTestCase
 
         fail("UnrecognizedOptionException not thrown");
     }
-    
+
     @Test
     public void testPropertiesOption1() throws Exception
     {
@@ -459,7 +459,7 @@ public abstract class ParserTestCase
         assertEquals("value 2", "1.5", values.get(1));
         assertEquals("value 3", "target", values.get(2));
         assertEquals("value 4", "1.5", values.get(3));
-        
+
         final List<?> argsleft = cl.getArgList();
         assertEquals("Should be 1 arg left", 1, argsleft.size());
         assertEquals("Expecting foo", "foo", argsleft.get(0));
@@ -474,13 +474,13 @@ public abstract class ParserTestCase
         options.addOption(OptionBuilder.withValueSeparator().hasOptionalArgs(2).create('D'));
 
         final CommandLine cl = parser.parse(options, args);
-        
+
         final Properties props = cl.getOptionProperties("D");
         assertNotNull("null properties", props);
         assertEquals("number of properties in " + props, 2, props.size());
         assertEquals("property 1", "true", props.getProperty("param1"));
         assertEquals("property 2", "value2", props.getProperty("param2"));
-        
+
         final List<?> argsleft = cl.getArgList();
         assertEquals("Should be no arg left", 0, argsleft.size());
     }
@@ -489,13 +489,13 @@ public abstract class ParserTestCase
     public void testUnambiguousPartialLongOption1() throws Exception
     {
         final String[] args = new String[] { "--ver" };
-        
+
         final Options options = new Options();
         options.addOption(OptionBuilder.withLongOpt("version").create());
         options.addOption(OptionBuilder.withLongOpt("help").create());
-        
+
         final CommandLine cl = parser.parse(options, args);
-        
+
         assertTrue("Confirm --version is set", cl.hasOption("version"));
     }
 
@@ -503,13 +503,13 @@ public abstract class ParserTestCase
     public void testUnambiguousPartialLongOption2() throws Exception
     {
         final String[] args = new String[] { "-ver" };
-        
+
         final Options options = new Options();
         options.addOption(OptionBuilder.withLongOpt("version").create());
         options.addOption(OptionBuilder.withLongOpt("help").create());
-        
+
         final CommandLine cl = parser.parse(options, args);
-        
+
         assertTrue("Confirm --version is set", cl.hasOption("version"));
     }
 
@@ -517,13 +517,13 @@ public abstract class ParserTestCase
     public void testUnambiguousPartialLongOption3() throws Exception
     {
         final String[] args = new String[] { "--ver=1" };
-        
+
         final Options options = new Options();
         options.addOption(OptionBuilder.withLongOpt("verbose").hasOptionalArg().create());
         options.addOption(OptionBuilder.withLongOpt("help").create());
-        
+
         final CommandLine cl = parser.parse(options, args);
-        
+
         assertTrue("Confirm --verbose is set", cl.hasOption("verbose"));
         assertEquals("1", cl.getOptionValue("verbose"));
     }
@@ -532,66 +532,66 @@ public abstract class ParserTestCase
     public void testUnambiguousPartialLongOption4() throws Exception
     {
         final String[] args = new String[] { "-ver=1" };
-        
+
         final Options options = new Options();
         options.addOption(OptionBuilder.withLongOpt("verbose").hasOptionalArg().create());
         options.addOption(OptionBuilder.withLongOpt("help").create());
-        
+
         final CommandLine cl = parser.parse(options, args);
-        
+
         assertTrue("Confirm --verbose is set", cl.hasOption("verbose"));
         assertEquals("1", cl.getOptionValue("verbose"));
     }
-    
+
     @Test
     public void testAmbiguousPartialLongOption1() throws Exception
     {
         final String[] args = new String[] { "--ver" };
-        
+
         final Options options = new Options();
         options.addOption(OptionBuilder.withLongOpt("version").create());
         options.addOption(OptionBuilder.withLongOpt("verbose").create());
-        
+
         boolean caught = false;
-        
-        try 
+
+        try
         {
             parser.parse(options, args);
         }
-        catch (final AmbiguousOptionException e) 
+        catch (final AmbiguousOptionException e)
         {
             caught = true;
             assertEquals("Partial option", "--ver", e.getOption());
             assertNotNull("Matching options null", e.getMatchingOptions());
             assertEquals("Matching options size", 2, e.getMatchingOptions().size());
         }
-        
+
         assertTrue( "Confirm MissingArgumentException caught", caught );
     }
-    
+
     @Test
     public void testAmbiguousPartialLongOption2() throws Exception
     {
         final String[] args = new String[] { "-ver" };
-        
+
         final Options options = new Options();
         options.addOption(OptionBuilder.withLongOpt("version").create());
         options.addOption(OptionBuilder.withLongOpt("verbose").create());
-        
+
         boolean caught = false;
-        
-        try 
+
+        try
         {
             parser.parse(options, args);
         }
-        catch (final AmbiguousOptionException e) 
+        catch (final AmbiguousOptionException e)
         {
             caught = true;
             assertEquals("Partial option", "-ver", e.getOption());
             assertNotNull("Matching options null", e.getMatchingOptions());
             assertEquals("Matching options size", 2, e.getMatchingOptions().size());
         }
-        
+
         assertTrue( "Confirm MissingArgumentException caught", caught );
     }
 
@@ -599,25 +599,25 @@ public abstract class ParserTestCase
     public void testAmbiguousPartialLongOption3() throws Exception
     {
         final String[] args = new String[] { "--ver=1" };
-        
+
         final Options options = new Options();
         options.addOption(OptionBuilder.withLongOpt("version").create());
         options.addOption(OptionBuilder.withLongOpt("verbose").hasOptionalArg().create());
-        
+
         boolean caught = false;
-        
-        try 
+
+        try
         {
             parser.parse(options, args);
         }
-        catch (final AmbiguousOptionException e) 
+        catch (final AmbiguousOptionException e)
         {
             caught = true;
             assertEquals("Partial option", "--ver", e.getOption());
             assertNotNull("Matching options null", e.getMatchingOptions());
             assertEquals("Matching options size", 2, e.getMatchingOptions().size());
         }
-        
+
         assertTrue( "Confirm MissingArgumentException caught", caught );
     }
 
@@ -625,39 +625,39 @@ public abstract class ParserTestCase
     public void testAmbiguousPartialLongOption4() throws Exception
     {
         final String[] args = new String[] { "-ver=1" };
-        
+
         final Options options = new Options();
         options.addOption(OptionBuilder.withLongOpt("version").create());
         options.addOption(OptionBuilder.withLongOpt("verbose").hasOptionalArg().create());
-        
+
         boolean caught = false;
-        
-        try 
+
+        try
         {
             parser.parse(options, args);
         }
-        catch (final AmbiguousOptionException e) 
+        catch (final AmbiguousOptionException e)
         {
             caught = true;
             assertEquals("Partial option", "-ver", e.getOption());
             assertNotNull("Matching options null", e.getMatchingOptions());
             assertEquals("Matching options size", 2, e.getMatchingOptions().size());
         }
-        
+
         assertTrue( "Confirm MissingArgumentException caught", caught );
     }
-    
+
     @Test
     public void testPartialLongOptionSingleDash() throws Exception
     {
         final String[] args = new String[] { "-ver" };
-        
+
         final Options options = new Options();
         options.addOption(OptionBuilder.withLongOpt("version").create());
         options.addOption(OptionBuilder.hasArg().create('v'));
-        
+
         final CommandLine cl = parser.parse(options, args);
-        
+
         assertTrue("Confirm --version is set", cl.hasOption("version"));
         assertTrue("Confirm -v is not set", !cl.hasOption("v"));
     }
@@ -666,7 +666,7 @@ public abstract class ParserTestCase
     public void testWithRequiredOption() throws Exception
     {
         final String[] args = new String[] { "-b", "file" };
-        
+
         final Options options = new Options();
         options.addOption("a", "enable-a", false, null);
         options.addOption(OptionBuilder.withLongOpt("bfile").hasArg().isRequired().create('b'));
@@ -683,7 +683,7 @@ public abstract class ParserTestCase
     public void testOptionAndRequiredOption() throws Exception
     {
         final String[] args = new String[] { "-a", "-b", "file" };
-        
+
         final Options options = new Options();
         options.addOption("a", "enable-a", false, null);
         options.addOption(OptionBuilder.withLongOpt("bfile").hasArg().isRequired().create('b'));
@@ -700,7 +700,7 @@ public abstract class ParserTestCase
     public void testMissingRequiredOption()
     {
         final String[] args = new String[] { "-a" };
-        
+
         final Options options = new Options();
         options.addOption("a", "enable-a", false, null);
         options.addOption(OptionBuilder.withLongOpt("bfile").hasArg().isRequired().create('b'));
@@ -747,7 +747,7 @@ public abstract class ParserTestCase
             fail("expected to catch MissingOptionException");
         }
     }
-    
+
     @Test
     public void testMissingRequiredGroup() throws Exception
     {
@@ -775,19 +775,19 @@ public abstract class ParserTestCase
             fail("Expected to catch MissingOptionException");
         }
     }
-    
+
     @Test
     public void testOptionGroup() throws Exception
     {
         final OptionGroup group = new OptionGroup();
         group.addOption(OptionBuilder.create("a"));
         group.addOption(OptionBuilder.create("b"));
-        
+
         final Options options = new Options();
         options.addOptionGroup(group);
-        
+
         parser.parse(options, new String[] { "-b" });
-        
+
         assertEquals("selected option", "b", group.getSelected());
     }
 
@@ -797,16 +797,16 @@ public abstract class ParserTestCase
         final OptionGroup group = new OptionGroup();
         group.addOption(OptionBuilder.withLongOpt("foo").create());
         group.addOption(OptionBuilder.withLongOpt("bar").create());
-        
+
         final Options options = new Options();
         options.addOptionGroup(group);
-        
+
         final CommandLine cl = parser.parse(options, new String[] { "--bar" });
-        
+
         assertTrue(cl.hasOption("bar"));
         assertEquals("selected option", "bar", group.getSelected());
     }
-    
+
     @Test
     public void testReuseOptionsTwice() throws Exception
     {
@@ -941,8 +941,8 @@ public abstract class ParserTestCase
     public void testPropertyOptionSingularValue() throws Exception
     {
         final Options opts = new Options();
-        opts.addOption(OptionBuilder.hasOptionalArgs(2).withLongOpt("hide").create());        
-        
+        opts.addOption(OptionBuilder.hasOptionalArgs(2).withLongOpt("hide").create());
+
         final Properties properties = new Properties();
         properties.setProperty( "hide", "seek" );
 
@@ -959,65 +959,65 @@ public abstract class ParserTestCase
         opts.addOption("a", false, "toggle -a");
         opts.addOption("c", "c", false, "toggle -c");
         opts.addOption(OptionBuilder.hasOptionalArg().create('e'));
-        
+
         Properties properties = new Properties();
         properties.setProperty("a", "true");
         properties.setProperty("c", "yes");
         properties.setProperty("e", "1");
-        
+
         CommandLine cmd = parse(parser, opts, null, properties);
         assertTrue(cmd.hasOption("a"));
         assertTrue(cmd.hasOption("c"));
         assertTrue(cmd.hasOption("e"));
-        
-        
+
+
         properties = new Properties();
         properties.setProperty("a", "false");
         properties.setProperty("c", "no");
         properties.setProperty("e", "0");
-        
+
         cmd = parse(parser, opts, null, properties);
         assertTrue(!cmd.hasOption("a"));
         assertTrue(!cmd.hasOption("c"));
         assertTrue(cmd.hasOption("e")); // this option accepts an argument
-        
-        
+
+
         properties = new Properties();
         properties.setProperty("a", "TRUE");
         properties.setProperty("c", "nO");
         properties.setProperty("e", "TrUe");
-        
+
         cmd = parse(parser, opts, null, properties);
         assertTrue(cmd.hasOption("a"));
         assertTrue(!cmd.hasOption("c"));
         assertTrue(cmd.hasOption("e"));
-        
-        
+
+
         properties = new Properties();
         properties.setProperty("a", "just a string");
         properties.setProperty("e", "");
-        
+
         cmd = parse(parser, opts, null, properties);
         assertTrue(!cmd.hasOption("a"));
         assertTrue(!cmd.hasOption("c"));
         assertTrue(cmd.hasOption("e"));
-        
-        
+
+
         properties = new Properties();
         properties.setProperty("a", "0");
         properties.setProperty("c", "1");
-        
+
         cmd = parse(parser, opts, null, properties);
         assertTrue(!cmd.hasOption("a"));
         assertTrue(cmd.hasOption("c"));
-    } 
+    }
 
     @Test
     public void testPropertyOptionMultipleValues() throws Exception
     {
         final Options opts = new Options();
         opts.addOption(OptionBuilder.hasArgs().withValueSeparator(',').create('k'));
-        
+
         final Properties properties = new Properties();
         properties.setProperty( "k", "one,two" );
 
@@ -1034,7 +1034,7 @@ public abstract class ParserTestCase
         final Options opts = new Options();
         opts.addOption(OptionBuilder.hasOptionalArgs(2).create('i'));
         opts.addOption(OptionBuilder.hasOptionalArgs().create('j'));
-        
+
         final String[] args = new String[] { "-j", "found", "-i", "ink" };
 
         final Properties properties = new Properties();
@@ -1053,10 +1053,10 @@ public abstract class ParserTestCase
     {
         final Options opts = new Options();
         opts.addOption(OptionBuilder.isRequired().create("f"));
-        
+
         final Properties properties = new Properties();
         properties.setProperty("f", "true");
-        
+
         final CommandLine cmd = parse(parser, opts, null, properties);
         assertTrue(cmd.hasOption("f"));
     }
@@ -1065,10 +1065,10 @@ public abstract class ParserTestCase
     public void testPropertyOptionUnexpected() throws Exception
     {
         final Options opts = new Options();
-        
+
         final Properties properties = new Properties();
         properties.setProperty("f", "true");
-        
+
         try {
             parse(parser, opts, null, properties);
             fail("UnrecognizedOptionException expected");
@@ -1081,25 +1081,25 @@ public abstract class ParserTestCase
     public void testPropertyOptionGroup() throws Exception
     {
         final Options opts = new Options();
-        
+
         final OptionGroup group1 = new OptionGroup();
         group1.addOption(new Option("a", null));
         group1.addOption(new Option("b", null));
         opts.addOptionGroup(group1);
-        
+
         final OptionGroup group2 = new OptionGroup();
         group2.addOption(new Option("x", null));
         group2.addOption(new Option("y", null));
         opts.addOptionGroup(group2);
-        
+
         final String[] args = new String[] { "-a" };
-        
+
         final Properties properties = new Properties();
         properties.put("b", "true");
         properties.put("x", "true");
-        
+
         final CommandLine cmd = parse(parser, opts, args, properties);
-        
+
         assertTrue(cmd.hasOption("a"));
         assertFalse(cmd.hasOption("b"));
         assertTrue(cmd.hasOption("x"));
diff --git a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
index bd85430..5bbb6da 100644
--- a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
+++ b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
@@ -33,7 +33,7 @@ import java.util.Vector;
 
 import org.junit.Test;
 
-/** 
+/**
  * Test case for the PatternOptionBuilder class.
  */
 @SuppressWarnings("deprecation") // tests some deprecated classes
diff --git a/src/test/java/org/apache/commons/cli/PosixParserTest.java b/src/test/java/org/apache/commons/cli/PosixParserTest.java
index 2a8961a..14d8e2b 100644
--- a/src/test/java/org/apache/commons/cli/PosixParserTest.java
+++ b/src/test/java/org/apache/commons/cli/PosixParserTest.java
@@ -38,7 +38,7 @@ public class PosixParserTest extends ParserTestCase
     public void testDoubleDash2() throws Exception
     {
     }
-    
+
     @Override @Test @Ignore("not supported by the PosixParser")
     public void testLongWithoutEqualSingleDash() throws Exception
     {
@@ -48,7 +48,7 @@ public class PosixParserTest extends ParserTestCase
     public void testAmbiguousLongWithoutEqualSingleDash() throws Exception
     {
     }
-    
+
     @Override @Test @Ignore("not supported by the PosixParser (CLI-184)")
     public void testNegativeOption() throws Exception
     {
diff --git a/src/test/java/org/apache/commons/cli/ValueTest.java b/src/test/java/org/apache/commons/cli/ValueTest.java
index 819f677..a892b98 100644
--- a/src/test/java/org/apache/commons/cli/ValueTest.java
+++ b/src/test/java/org/apache/commons/cli/ValueTest.java
@@ -49,7 +49,7 @@ public class ValueTest
         final String[] args = new String[] { "-a",
             "-b", "foo",
             "--c",
-            "--d", "bar" 
+            "--d", "bar"
         };
 
         final Parser parser = new PosixParser();
@@ -62,7 +62,7 @@ public class ValueTest
         assertTrue( _cl.hasOption("a") );
         assertNull( _cl.getOptionValue("a") );
     }
-    
+
     @Test
     public void testShortNoArgWithOption()
     {
@@ -77,7 +77,7 @@ public class ValueTest
         assertNotNull( _cl.getOptionValue("b") );
         assertEquals( _cl.getOptionValue("b"), "foo");
     }
-    
+
     @Test
     public void testShortWithArgWithOption()
     {
@@ -92,7 +92,7 @@ public class ValueTest
         assertTrue( _cl.hasOption("c") );
         assertNull( _cl.getOptionValue("c") );
     }
-    
+
     @Test
     public void testLongNoArgWithOption()
     {
@@ -107,7 +107,7 @@ public class ValueTest
         assertNotNull( _cl.getOptionValue("d") );
         assertEquals( _cl.getOptionValue("d"), "bar");
     }
-    
+
     @Test
     public void testLongWithArgWithOption()
     {
@@ -126,7 +126,7 @@ public class ValueTest
         assertTrue( cmd.hasOption("e") );
         assertNull( cmd.getOptionValue("e") );
     }
-    
+
     @Test
     public void testShortOptionalArgNoValueWithOption() throws Exception
     {
@@ -148,7 +148,7 @@ public class ValueTest
         assertTrue( cmd.hasOption("e") );
         assertEquals( "everything", cmd.getOptionValue("e") );
     }
-    
+
     @Test
     public void testShortOptionalArgValueWithOption() throws Exception
     {
@@ -170,7 +170,7 @@ public class ValueTest
         assertTrue( cmd.hasOption("fish") );
         assertNull( cmd.getOptionValue("fish") );
     }
-    
+
     @Test
     public void testLongOptionalNoValueWithOption() throws Exception
     {
@@ -192,7 +192,7 @@ public class ValueTest
         assertTrue( cmd.hasOption("fish") );
         assertEquals( "face", cmd.getOptionValue("fish") );
     }
-    
+
     @Test
     public void testLongOptionalArgValueWithOption() throws Exception
     {
@@ -217,7 +217,7 @@ public class ValueTest
         assertEquals( "idea", cmd.getOptionValues("j")[1] );
         assertEquals( cmd.getArgs().length, 0 );
     }
-    
+
     @Test
     public void testShortOptionalArgValuesWithOption() throws Exception
     {
@@ -245,7 +245,7 @@ public class ValueTest
         assertEquals( "garden", cmd.getOptionValues("gravy")[1] );
         assertEquals( cmd.getArgs().length, 0 );
     }
-    
+
     @Test
     public void testLongOptionalArgValuesWithOption() throws Exception
     {
@@ -275,7 +275,7 @@ public class ValueTest
         assertEquals( "isotope", cmd.getArgs()[0] );
         assertEquals( "ice", cmd.getArgs()[1] );
     }
-    
+
     @Test
     public void testShortOptionalNArgValuesWithOption() throws Exception
     {
@@ -295,7 +295,7 @@ public class ValueTest
     @Test
     public void testLongOptionalNArgValues() throws Exception
     {
-        final String[] args = new String[] { 
+        final String[] args = new String[] {
             "--hide", "house", "hair", "head"
         };
 
@@ -309,11 +309,11 @@ public class ValueTest
         assertEquals( cmd.getArgs().length, 1 );
         assertEquals( "head", cmd.getArgs()[0] );
     }
-    
+
     @Test
     public void testLongOptionalNArgValuesWithOption() throws Exception
     {
-        final String[] args = new String[] { 
+        final String[] args = new String[] {
             "--hide", "house", "hair", "head"
         };
 
diff --git a/src/test/java/org/apache/commons/cli/ValuesTest.java b/src/test/java/org/apache/commons/cli/ValuesTest.java
index ad38cfd..78ed390 100644
--- a/src/test/java/org/apache/commons/cli/ValuesTest.java
+++ b/src/test/java/org/apache/commons/cli/ValuesTest.java
@@ -61,7 +61,7 @@ public class ValuesTest
                                        "-h", "val2",
                                        "-jkey=value",
                                        "-j", "key=value",
-                                       "-kkey1=value1", 
+                                       "-kkey1=value1",
                                        "-kkey2=value2",
                                        "-mkey=value"};
 
@@ -142,7 +142,7 @@ public class ValuesTest
 
     /**
      * jkeyes - commented out this test as the new architecture
-     * breaks this type of functionality.  I have left the test 
+     * breaks this type of functionality.  I have left the test
      * here in case I get a brainwave on how to resolve this.
      */
     /*
@@ -159,7 +159,7 @@ public class ValuesTest
             fail( "IndexOutOfBounds not caught" );
         }
         catch( IndexOutOfBoundsException exp ) {
-            
+
         }
 
         try {
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI133Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI133Test.java
index 90c6795..3d96714 100644
--- a/src/test/java/org/apache/commons/cli/bug/BugCLI133Test.java
+++ b/src/test/java/org/apache/commons/cli/bug/BugCLI133Test.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 
 @SuppressWarnings("deprecation") // tests some deprecated classes
 public class BugCLI133Test
-{    
+{
     @Test
     public void testOrder() throws ParseException {
         final Option optionA = new Option("a", "first");
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI13Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI13Test.java
index a79ed8a..0ef2228 100644
--- a/src/test/java/org/apache/commons/cli/bug/BugCLI13Test.java
+++ b/src/test/java/org/apache/commons/cli/bug/BugCLI13Test.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI148Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI148Test.java
index 9078f51..5b4947e 100644
--- a/src/test/java/org/apache/commons/cli/bug/BugCLI148Test.java
+++ b/src/test/java/org/apache/commons/cli/bug/BugCLI148Test.java
@@ -32,7 +32,7 @@ import org.junit.Test;
  */
 @SuppressWarnings("deprecation") // tests some deprecated classes
 public class BugCLI148Test
-{    
+{
     private Options options;
 
     @Before
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI162Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI162Test.java
index 8cfd031..ce443d3 100644
--- a/src/test/java/org/apache/commons/cli/bug/BugCLI162Test.java
+++ b/src/test/java/org/apache/commons/cli/bug/BugCLI162Test.java
@@ -35,7 +35,7 @@ public class BugCLI162Test
 {
     /** Constant for the line separator.*/
     private static final String CR = System.getProperty("line.separator");
-    
+
     private HelpFormatter formatter;
     private StringWriter sw;
 
@@ -317,7 +317,7 @@ public class BugCLI162Test
                                      "This description has ReallyLongValuesThatAreLongerThanTheWidthOfTheColumns " +
                                      "and also other ReallyLongValuesThatAreHugerAndBiggerThanTheWidthOfTheColumnsBob, " +
                                      "yes. ");
-        
+
         formatter.printHelp(new PrintWriter(sw), 35, this.getClass().getName(), "Header", options, 0, 5, "Footer");
         final String expected = "usage:" + CR +
                           "       org.apache.commons.cli.bug.B" + CR +
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI71Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI71Test.java
index 56c9d8d..fda260d 100644
--- a/src/test/java/org/apache/commons/cli/bug/BugCLI71Test.java
+++ b/src/test/java/org/apache/commons/cli/bug/BugCLI71Test.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -84,7 +84,7 @@ public class BugCLI71Test
         final String[] args = new String[] { "-k", "-a", "Caesar" };
         options.getOption("k").setOptionalArg(true);
         final CommandLine line = parser.parse( options, args);
-        
+
         assertEquals( "Caesar", line.getOptionValue("a") );
         assertEquals( "a", line.getOptionValue('k', "a") );
     }
diff --git a/src/test/java/org/apache/commons/cli/bug/BugsTest.java b/src/test/java/org/apache/commons/cli/bug/BugsTest.java
index c995ceb..b27a50d 100644
--- a/src/test/java/org/apache/commons/cli/bug/BugsTest.java
+++ b/src/test/java/org/apache/commons/cli/bug/BugsTest.java
@@ -120,7 +120,7 @@ public class BugsTest
     @Test
     public void test11456() throws Exception
     {
-        // Posix 
+        // Posix
         Options options = new Options();
         options.addOption( OptionBuilder.hasOptionalArg().create( 'a' ) );
         options.addOption( OptionBuilder.hasArg().create( 'b' ) );
@@ -213,10 +213,10 @@ public class BugsTest
             .hasArg()
             .create( 'n' );
 
-        final String[] args = { 
-            "-o", 
-            "-n", 
-            "newpassword" 
+        final String[] args = {
+            "-o",
+            "-n",
+            "newpassword"
         };
 
         options.addOption( oldpass );
@@ -237,18 +237,18 @@ public class BugsTest
         final Options options = new Options();
         final Option dir = OptionBuilder.withDescription( "dir" ).hasArg().create( 'd' );
         options.addOption( dir );
-        
+
         final PrintStream oldSystemOut = System.out;
         try
         {
             final ByteArrayOutputStream bytes = new ByteArrayOutputStream();
             final PrintStream print = new PrintStream(bytes);
-            
+
             // capture this platform's eol symbol
             print.println();
             final String eol = bytes.toString();
             bytes.reset();
-            
+
             System.setOut(new PrintStream(bytes));
 
             final HelpFormatter formatter = new HelpFormatter();
@@ -335,7 +335,7 @@ public class BugsTest
         options.addOption(new Option("z", "timezone", true, "affected option"));
 
         parser.parse(options, CLI_ARGS);
-        
+
         //now add conflicting option
         options.addOption("c", "conflict", true, "conflict option");
         final CommandLine line = parser.parse(options, CLI_ARGS);
@@ -354,22 +354,22 @@ public class BugsTest
         final CommandLine line = parser.parse( options, args );
         assertEquals( "Two Words", line.getOptionValue( "m" ) );
     }
-    
+
     @Test
     public void test31148() throws ParseException
     {
         final Option multiArgOption = new Option("o","option with multiple args");
         multiArgOption.setArgs(1);
-        
+
         final Options options = new Options();
         options.addOption(multiArgOption);
-        
+
         final Parser parser = new PosixParser();
         final String[] args = new String[]{};
         final Properties props = new Properties();
         props.setProperty("o","ovalue");
         final CommandLine cl = parser.parse(options,args,props);
-        
+
         assertTrue(cl.hasOption('o'));
         assertEquals("ovalue",cl.getOptionValue('o'));
     }


Mime
View raw message