[Japi-cvs] SF.net SVN: japi: [422] libs/argparser/trunk/src/net/sf/japi/io/args

[<chr...@us...>]

Revision: 422
          http://svn.sourceforge.net/japi/?rev=422&view=rev
Author:   christianhujer
Date:     2007-06-25 04:48:17 -0700 (Mon, 25 Jun 2007)

Log Message:
-----------
Some code cleanup for the release of 0.1.

Modified Paths:
--------------
    libs/argparser/trunk/src/net/sf/japi/io/args/ArgParser.java
    libs/argparser/trunk/src/net/sf/japi/io/args/BasicCommand.java

Modified: libs/argparser/trunk/src/net/sf/japi/io/args/ArgParser.java
===================================================================
--- libs/argparser/trunk/src/net/sf/japi/io/args/ArgParser.java	2007-06-18 21:51:01 UTC (rev 421)
+++ libs/argparser/trunk/src/net/sf/japi/io/args/ArgParser.java	2007-06-25 11:48:17 UTC (rev 422)
@@ -21,8 +21,15 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.*;
-import java.io.Closeable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
 import net.sf.japi.io.args.converter.ConverterRegistry;
 
 /**
@@ -52,9 +59,6 @@
     /** The currently used option. */
     private String currentOption;
 
-    /** The list of opened streams. */
-    private final List<Closeable> openedStreams = new ArrayList<Closeable>();
-
     /**
      * Create a new ArgParser.
      * This ArgParser uses {@link System#in}, {@link System#out} and {@link System#err}.
@@ -156,7 +160,7 @@
      */
     private void parse() throws TerminalException, UnknownOptionException, MissingArgumentException {
         try {
-            for (; argIterator.hasNext(); ) {
+            while (argIterator.hasNext()) {
                 final String arg = argIterator.next();
                 if (arg.length() > 1 && arg.charAt(0) == '-') {
                     argIterator.remove();

Modified: libs/argparser/trunk/src/net/sf/japi/io/args/BasicCommand.java
===================================================================
--- libs/argparser/trunk/src/net/sf/japi/io/args/BasicCommand.java	2007-06-18 21:51:01 UTC (rev 421)
+++ libs/argparser/trunk/src/net/sf/japi/io/args/BasicCommand.java	2007-06-25 11:48:17 UTC (rev 422)
@@ -22,7 +22,6 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Formatter;
-import java.util.HashSet;
 import java.util.List;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
@@ -77,7 +76,6 @@
     @Option(type = OptionType.TERMINAL, value = {"h", "help"})
     public void help() {
         final Set<Method> optionMethods = ArgParser.getOptionMethods(this);
-        final Set<Class<?>> parameterTypes = new HashSet<Class<?>>();
         int maxLong = 0;
         int maxShort = 0;
         for (final Method optionMethod : optionMethods) {
@@ -94,9 +92,6 @@
             }
             maxLong = Math.max(maxLong, currentLong - ", ".length());
             maxShort = Math.max(maxShort, currentShort - ", ".length());
-            for (final Class<?> parameterType : optionMethod.getParameterTypes()) {
-                parameterTypes.add(parameterType);
-            }
         }
         final String formatString = "%-" + maxShort + "s%s%-" + maxLong + "s: %s%s%n";
         final Formatter format = new Formatter(System.err);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.