Added patch to CLI-141 that makes Option Serializable - Thanks to Henning and Bjorn

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/branches/cli-1.x@596140 13f79535-47bb-0310-9956-ffa450edef68

Author: hen

src/java/org/apache/commons/cli/Option.java

@@ -16,6 +16,7 @@
  */
 package org.apache.commons.cli;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 
 /** <p>Describes a single command-line option.  It maintains
@@ -33,7 +34,9 @@
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  * @version $Revision$
  */
-public class Option implements Cloneable {
+public class Option implements Cloneable, Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /** constant that specifies the number of argument values has 
         not been specified */
@@ -48,9 +51,6 @@ public class Option implements Cloneable {
     /** longOpt is the long representation of the option */
     private String longOpt;
 
-    /** hasArg specifies whether this option has an associated argument */
-    private boolean hasArg;
-
     /** argName specifies the name of the argument for this option */
     private String argName = "arg";
 
@@ -136,7 +136,6 @@ public Option(String opt, String longOpt, boolean hasArg,
             this.numberOfArgs = 1;
         }
 
-        this.hasArg = hasArg;
         this.description = description;
     }
 
@@ -571,9 +570,11 @@ public String toString()
 
         buf.append(" ");
 
-        if (hasArg)
+        if (hasArgs())
         {
-            buf.append("+ARG");
+            buf.append("[ARG...]");
+        } else if (hasArg()) {
+            buf.append(" [ARG]");
         }
 
         buf.append(" :: ").append(this.description);