Added setter for Builder.option apache#33.

- Rename new method
- Add missing @SInCE tag to new method.
- Sort new members.

Author: garydgregory

src/changes/changes.xml

@@ -60,6 +60,9 @@
       <action type="add" dev="ggregory" due-to="Alex Nordlund" issue="CLI-282">
         TypeHandler should throw ParseException for an unsupported class.
       </action>
+      <action type="add" dev="ggregory" due-to="waso, Gary Gregory">
+        Added setter for Builder.option #33.
+      </action>
       <!-- UPDATE -->
       <action type="update" dev="ggregory" issue="CLI-294">
         Update Java from version 5 to 7.

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

@@ -87,18 +87,6 @@ private Builder(final String option) throws IllegalArgumentException {
             this.option = OptionValidator.validate(option);
         }
 
-        /**
-         * Sets the name of the Option.
-         *
-         * @param opt the name of the Option
-         * @return this builder, to allow method chaining
-         * @throws IllegalArgumentException if there are any non valid Option characters in {@code opt}
-         */
-        public Builder opt(String opt) throws IllegalArgumentException {
-            this.option = OptionValidator.validate(opt);
-            return this;
-        }
-
         /**
          * Sets the display name for the argument value.
          *
@@ -187,6 +175,19 @@ public Builder numberOfArgs(final int numberOfArgs) {
             return this;
         }
 
+        /**
+         * Sets the name of the Option.
+         *
+         * @param option the name of the Option
+         * @return this builder, to allow method chaining
+         * @throws IllegalArgumentException if there are any non valid Option characters in {@code opt}
+         * @since 1.5
+         */
+        public Builder option(String option) throws IllegalArgumentException {
+            this.option = OptionValidator.validate(option);
+            return this;
+        }
+
         /**
          * Sets whether the Option can have an optional argument.
          *

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

@@ -109,7 +109,7 @@ public void testBuilderMethods() {
             String.class);
         checkOption(Option.builder("a").desc("desc").type(Integer.class).build(), "a", "desc", null, Option.UNINITIALIZED, null, false, false, defaultSeparator,
             Integer.class);
-        checkOption(Option.builder().opt("a").desc("desc").type(Integer.class).build(), "a", "desc", null, Option.UNINITIALIZED, null, false, false,
+        checkOption(Option.builder().option("a").desc("desc").type(Integer.class).build(), "a", "desc", null, Option.UNINITIALIZED, null, false, false,
                 defaultSeparator, Integer.class);
     }