changed my email add, removed CommandLineParserFactory

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

Author: John Keyes

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

@@ -64,7 +64,7 @@
  * <p>Thrown when more than one option in an option group
  * has been provided.</p>
  *
- * @author John Keyes ( jbjk at mac.com )
+ * @author John Keyes ( john at integralsource.com )
  * @see ParseException
  */
 public class AlreadySelectedException extends ParseException {

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

@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/BasicParser.java,v 1.2 2002/08/26 20:15:02 jkeyes Exp $
- * $Revision: 1.2 $
- * $Date: 2002/08/26 20:15:02 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/BasicParser.java,v 1.3 2002/09/19 22:59:43 jkeyes Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/09/19 22:59:43 $
  *
  * ====================================================================
  *
@@ -64,7 +64,7 @@
  * The class BasicParser provides a very simple implementation of
  * the {@link Parser#flatten(Options,String[],boolean) flatten} method.
  *
- * @author John Keyes (jbjk at mac.com)
+ * @author John Keyes (john at integralsource.com)
  * @see Parser
  */
 public class BasicParser extends Parser {

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

@@ -60,6 +60,7 @@
  */
 package org.apache.commons.cli;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -80,7 +81,7 @@
  *
  * @author bob mcwhirter (bob @ werken.com)
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
- * @author John Keyes (jbjk at mac.com)
+ * @author John Keyes (john at integralsource.com)
  */
 public class CommandLine {
 
@@ -92,6 +93,8 @@ public class CommandLine {
 
     /** Map of unique options for ease to get complete list of options */
     private Map hashcodeMap = new HashMap();
+    private List optionList = new ArrayList();
+    private List keyList    = new ArrayList();
 
     /** the processed options */
     private Option[] optionsArray;
@@ -282,13 +285,16 @@ void addArg(String arg) {
      *
      * @param opt the processed option
      */
-    void setOpt( Option opt ) {
+    void addOption( Option opt ) {
         hashcodeMap.put( new Integer( opt.hashCode() ), opt );
 
+        optionList.add( opt );
         String key = opt.getOpt();
         if( " ".equals(key) ) {
             key = opt.getLongOpt();
         }
+        keyList.add( key );
+
         if( options.get( key ) != null ) {
             ((java.util.List)options.get( key )).add( opt );
         }
@@ -323,4 +329,14 @@ public Option[] getOptions( ) {
         return (Option[]) processed.toArray( optionsArray );
     }
 
+    public Option[] getOptions2() {
+        System.out.println( "--2--" );
+        Collection processed = optionList;
+        // reinitialise array
+        optionsArray = new Option[ processed.size() ];
+
+        // return the array
+        return (Option[]) processed.toArray( optionsArray );
+    }
+
 }

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

@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/CommandLineParser.java,v 1.3 2002/08/26 20:15:02 jkeyes Exp $
- * $Revision: 1.3 $
- * $Date: 2002/08/26 20:15:02 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/CommandLineParser.java,v 1.4 2002/09/19 22:59:43 jkeyes Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/09/19 22:59:43 $
  *
  * ====================================================================
  *
@@ -65,7 +65,7 @@
  * can parse a String array according to the {@link Options} specified
  * and return a {@link CommandLine}.
  *
- * @author John Keyes (jbjk at mac.com)
+ * @author John Keyes (john at integralsource.com)
  */
 public interface CommandLineParser {
 

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

@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/GnuParser.java,v 1.9 2002/08/31 17:53:11 jkeyes Exp $
- * $Revision: 1.9 $
- * $Date: 2002/08/31 17:53:11 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/GnuParser.java,v 1.10 2002/09/19 22:59:43 jkeyes Exp $
+ * $Revision: 1.10 $
+ * $Date: 2002/09/19 22:59:43 $
  *
  * ====================================================================
  *
@@ -69,9 +69,9 @@
  * The class GnuParser provides an implementation of the 
  * {@link Parser#flatten(Options,String[],boolean) flatten} method.
  *
- * @author John Keyes (jbjk at mac.com)
+ * @author John Keyes (john at integralsource.com)
  * @see Parser
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
  */
 public class GnuParser extends Parser {
 

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

@@ -73,7 +73,7 @@
  * A formatter of help messages for the current command line options
  *
  * @author Slawek Zachcial
- * @author John Keyes (jbjk at mac.com)
+ * @author John Keyes (john at integralsource.com)
  **/
 public class HelpFormatter
 {

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

@@ -65,7 +65,7 @@
  * <p>Thrown when an option requiring an argument
  * is not provided with an argument.</p>
  *
- * @author John Keyes (jbjk at mac.com)
+ * @author John Keyes (john at integralsource.com)
  * @see ParseException
  */
 public class MissingArgumentException extends ParseException {

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

@@ -64,7 +64,7 @@
 /** 
  * <p>Thrown when a required option has not been provided.</p>
  *
- * @author John Keyes ( jbjk at mac.com )
+ * @author John Keyes ( john at integralsource.com )
  * @see ParseException
  */
 public class MissingOptionException extends ParseException {

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

@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/OptionBuilder.java,v 1.9 2002/09/10 21:35:57 jkeyes Exp $
- * $Revision: 1.9 $
- * $Date: 2002/09/10 21:35:57 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/OptionBuilder.java,v 1.10 2002/09/19 22:59:43 jkeyes Exp $
+ * $Revision: 1.10 $
+ * $Date: 2002/09/19 22:59:43 $
  *
  * ====================================================================
  *
@@ -67,7 +67,7 @@
  * <p>Details on the Builder pattern can be found at 
  * <a href="http://">http://</a>.</p>
  *
- * @author John Keyes ( jbjk at mac.com )
+ * @author John Keyes ( john at integralsource.com )
  * @since 1.0
  */
 public class OptionBuilder {