Applying Brian Egge's patch to CLI-21 that resurrects the clone() method

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

Author: hen

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

@@ -33,7 +33,7 @@
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  * @version $Revision$
  */
-public class Option {
+public class Option implements Cloneable {
 
     /** constant that specifies the number of argument values has 
         not been specified */
@@ -632,6 +632,12 @@ public int hashCode()
         return result;
     }
 
+    protected Object clone() throws CloneNotSupportedException {
+        Option option = (Option) super.clone();
+        option.values = new ArrayList(values);
+        return option;
+    }
+
     /**
      * <p>Clear the Option values. After a 
      * parse is complete, these are left with data in them 

src/test/org/apache/commons/cli/OptionTest.java

@@ -31,5 +31,42 @@ public void testClear() {
        option.clearValues();
        assertEquals(0, option.getValuesList().size());
    }
-    
+
+    // See http://issues.apache.org/jira/browse/CLI-21
+    public void testClone() throws CloneNotSupportedException {
+        Option a = new Option("a", true, "");
+        Option b = (Option) a.clone();
+        assertEquals(a, b);
+        assertNotSame(a, b);
+        a.setDescription("a");
+        assertEquals("", b.getDescription());
+        b.setArgs(2);
+        b.addValue("b1");
+        b.addValue("b2");
+        assertEquals(1, a.getArgs());
+        assertEquals(0, a.getValuesList().size());
+        assertEquals(2, b.getValues().length);
+    }
+
+    private static class DefaultOption extends Option {
+
+        private final String defaultValue;
+
+        public DefaultOption(String opt, String description, String defaultValue) throws IllegalArgumentException {
+            super(opt, true, description);
+            this.defaultValue = defaultValue;
+        }
+
+        public String getValue() {
+            return super.getValue() != null ? super.getValue() : defaultValue;
+        }
+    }
+
+    public void testSubclass() throws CloneNotSupportedException {
+        Option option = new DefaultOption("f", "file", "myfile.txt");
+        Option clone = (Option) option.clone();
+        assertEquals("myfile.txt", clone.getValue());
+        assertEquals(DefaultOption.class, clone.getClass());
+    }
+
 }