Sort members

Author: garydgregory

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

@@ -400,46 +400,32 @@ public <T> T getParsedOptionValue(final char opt) throws ParseException {
     /**
      * Gets a version of this {@code Option} converted to a particular type.
      *
-     * @param option the name of the option.
+     * @param opt the name of the option.
+     * @param defaultValue the default value to return if opt is not set.
      * @param <T> The return type for the method.
      * @return the value parsed into a particular object.
      * @throws ParseException if there are problems turning the option value into the desired type
      * @see PatternOptionBuilder
-     * @since 1.5.0
+     * @since 1.7.0
      */
-    public <T> T getParsedOptionValue(final Option option) throws ParseException {
-        return  getParsedOptionValue(option, null);
+    public <T> T getParsedOptionValue(final char opt, final T defaultValue) throws ParseException {
+        return getParsedOptionValue(String.valueOf(opt), defaultValue);
     }
 
     /**
      * Gets a version of this {@code Option} converted to a particular type.
      *
-     * @param opt the name of the option.
+     * @param option the name of the option.
      * @param <T> The return type for the method.
      * @return the value parsed into a particular object.
      * @throws ParseException if there are problems turning the option value into the desired type
      * @see PatternOptionBuilder
-     * @since 1.2
+     * @since 1.5.0
      */
-    public <T> T getParsedOptionValue(final String opt) throws ParseException {
-        return getParsedOptionValue(resolveOption(opt));
+    public <T> T getParsedOptionValue(final Option option) throws ParseException {
+        return  getParsedOptionValue(option, null);
     }
 
-    /**
-     * Gets a version of this {@code Option} converted to a particular type.
-     *
-     * @param opt the name of the option.
-     * @param defaultValue the default value to return if opt is not set.
-     * @param <T> The return type for the method.
-     * @return the value parsed into a particular object.
-     * @throws ParseException if there are problems turning the option value into the desired type
-     * @see PatternOptionBuilder
-     * @since 1.7.0
-     */
-    public <T> T getParsedOptionValue(final char opt, final T defaultValue) throws ParseException {
-        return getParsedOptionValue(String.valueOf(opt), defaultValue);
-    }
-
     /**
      * Gets a version of this {@code Option} converted to a particular type.
      *
@@ -465,6 +451,20 @@ public <T> T getParsedOptionValue(final Option option, final T defaultValue) thr
         }
     }
 
+    /**
+     * Gets a version of this {@code Option} converted to a particular type.
+     *
+     * @param opt the name of the option.
+     * @param <T> The return type for the method.
+     * @return the value parsed into a particular object.
+     * @throws ParseException if there are problems turning the option value into the desired type
+     * @see PatternOptionBuilder
+     * @since 1.2
+     */
+    public <T> T getParsedOptionValue(final String opt) throws ParseException {
+        return getParsedOptionValue(resolveOption(opt));
+    }
+
     /**
      * Gets a version of this {@code Option} converted to a particular type.
      *

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

@@ -120,6 +120,18 @@ public Option build() {
             return new Option(this);
         }
 
+        /**
+         * Sets the converter for the option.
+         * <p>Note: see {@link TypeHandler} for serialization discussion.</p>
+         * @param converter the Converter to use.
+         * @return this builder, to allow method chaining.
+         * @since 1.7.0
+         */
+        public Builder converter(final Converter<?> converter) {
+            this.converter = converter;
+            return this;
+        }
+
         /**
          * Sets the description for this option.
          *
@@ -273,18 +285,6 @@ public Builder valueSeparator(final char valueSeparator) {
             this.valueSeparator = valueSeparator;
             return this;
         }
-
-        /**
-         * Sets the converter for the option.
-         * <p>Note: see {@link TypeHandler} for serialization discussion.</p>
-         * @param converter the Converter to use.
-         * @return this builder, to allow method chaining.
-         * @since 1.7.0
-         */
-        public Builder converter(final Converter<?> converter) {
-            this.converter = converter;
-            return this;
-        }
 
     }
 
@@ -542,6 +542,15 @@ public int getArgs() {
         return argCount;
     }
 
+    /**
+     * Gets the value to type converter.
+     * @return the value to type converter
+     * @since 1.7.0
+     */
+    public Converter<?> getConverter() {
+        return converter == null ? TypeHandler.getConverter(type) : converter;
+    }
+
     /**
      * Gets the self-documenting description of this Option
      *
@@ -816,6 +825,15 @@ public void setArgs(final int num) {
         this.argCount = num;
     }
 
+    /**
+     * Sets the value to type converter.
+     * @param converter The converter to convert the string value to the type.
+     * @since 1.7.0
+     */
+    public void setConverter(final Converter<?> converter) {
+        this.converter = converter;
+    }
+
     /**
      * Sets the self-documenting description of this Option
      *
@@ -862,7 +880,7 @@ public void setRequired(final boolean required) {
     public void setType(final Class<?> type) {
         this.type = type;
     }
-
+    
     /**
      * Sets the type of this Option.
      * <p>
@@ -886,24 +904,6 @@ public void setType(final Object type) {
     public void setValueSeparator(final char sep) {
         this.valuesep = sep;
     }
-    
-    /**
-     * Gets the value to type converter.
-     * @return the value to type converter
-     * @since 1.7.0
-     */
-    public Converter<?> getConverter() {
-        return converter == null ? TypeHandler.getConverter(type) : converter;
-    }
-
-    /**
-     * Sets the value to type converter.
-     * @param converter The converter to convert the string value to the type.
-     * @since 1.7.0
-     */
-    public void setConverter(final Converter<?> converter) {
-        this.converter = converter;
-    }
 
     /**
      * Dump state, suitable for debugging.

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

@@ -49,6 +49,14 @@ public static ParseException wrap(final Exception e) throws UnsupportedOperation
         }
         return new ParseException(e);
     }
+    /**
+     * Constructs a new {@code ParseException} wrapping the specified exception. 
+     * @param e the Exception to wrap.
+     */
+    public ParseException(final Exception e) {
+        super(e);
+    }
+    
     /**
      * Constructs a new {@code ParseException} with the specified detail message.
      *
@@ -57,12 +65,4 @@ public static ParseException wrap(final Exception e) throws UnsupportedOperation
     public ParseException(final String message) {
         super(message);
     }
-    
-    /**
-     * Constructs a new {@code ParseException} wrapping the specified exception. 
-     * @param e the Exception to wrap.
-     */
-    public ParseException(final Exception e) {
-        super(e);
-    }
 }

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

@@ -112,14 +112,6 @@ public class PatternOptionBuilder {
         registerTypes();
     }
 
-    /**
-     * Registers custom {@code Converter}s with the {@code TypeHandler}. 
-     * @since 1.7.0
-     */
-    public static void registerTypes() {
-        TypeHandler.register(PatternOptionBuilder.FILES_VALUE, NOT_IMPLEMENTED);
-    }
-
     /**
      * Retrieve the class that {@code ch} represents.
      *
@@ -131,7 +123,7 @@ public static void registerTypes() {
     public static Object getValueClass(final char ch) {
         return getValueType(ch);
     }
-    
+
     /**
      * Retrieve the class that {@code ch} represents.
      *
@@ -163,7 +155,7 @@ public static Class<?> getValueType(final char ch) {
 
         return null;
     }
-
+    
     /**
      * Returns whether {@code ch} is a value code, i.e. whether it represents a class in a pattern.
      *
@@ -223,4 +215,12 @@ public static Options parsePattern(final String pattern) {
 
         return options;
     }
+
+    /**
+     * Registers custom {@code Converter}s with the {@code TypeHandler}. 
+     * @since 1.7.0
+     */
+    public static void registerTypes() {
+        TypeHandler.register(PatternOptionBuilder.FILES_VALUE, NOT_IMPLEMENTED);
+    }
 }