Allow to build args4j 2.0.30 with java 6

Change-Id: I27a62e7c0863caede0853b20cd2949eac76c4d8e

4 files changed, 16 insertions, 63 deletions

diff --git a/args4j/README.android b/args4j/README.android
index 4a67e5b..fd2fdce 100644
--- a/args4j/README.android
+++ b/args4j/README.android
@@ -5,3 +5,16 @@ Description: "Command line option parser"
 
 Direct link: https://github.com/kohsuke/args4j/releases/tag/args4j-site-2.0.30
 
+Modifications in order to build with javac 6
+Removed files:
+args4j/args4j/src/org/kohsuke/args4j/spi/MultiPathOptionHandler.java
+args4j/args4j/src/org/kohsuke/args4j/spi/PathOptionHandler.java
+Modified file:
+args4j/args4j/src/org/kohsuke/args4j/OptionHandlerRegistry.java
+-        try {
+-            Class p = Class.forName("java.nio.file.Path");
+-            registerHandler(p, PathOptionHandler.class);
+-        } catch (ClassNotFoundException e) {
+-            // running in Java6 or earlier
+-        }
+
diff --git a/args4j/args4j/src/org/kohsuke/args4j/OptionHandlerRegistry.java b/args4j/args4j/src/org/kohsuke/args4j/OptionHandlerRegistry.java
index 45dda07..c923e98 100644
--- a/args4j/args4j/src/org/kohsuke/args4j/OptionHandlerRegistry.java
+++ b/args4j/args4j/src/org/kohsuke/args4j/OptionHandlerRegistry.java
@@ -22,7 +22,6 @@ import org.kohsuke.args4j.spi.IntOptionHandler;
 import org.kohsuke.args4j.spi.LongOptionHandler;
 import org.kohsuke.args4j.spi.MapOptionHandler;
 import org.kohsuke.args4j.spi.OptionHandler;
-import org.kohsuke.args4j.spi.PathOptionHandler;
 import org.kohsuke.args4j.spi.PatternOptionHandler;
 import org.kohsuke.args4j.spi.Setter;
 import org.kohsuke.args4j.spi.ShortOptionHandler;
@@ -91,16 +90,9 @@ public class OptionHandlerRegistry {
         registerHandler(Pattern.class, PatternOptionHandler.class);
         // enum is a special case
         registerHandler(Map.class,MapOptionHandler.class);
-
-        try {
-            Class p = Class.forName("java.nio.file.Path");
-            registerHandler(p, PathOptionHandler.class);
-        } catch (ClassNotFoundException e) {
-            // running in Java6 or earlier
-        }
     }
-    
-    /** Finds the constructor for an option handler. 
+
+    /** Finds the constructor for an option handler.
      */
     private static Constructor<? extends OptionHandler> getConstructor(Class<? extends OptionHandler> handlerClass) {
         try {
@@ -109,7 +101,7 @@ public class OptionHandlerRegistry {
             throw new IllegalArgumentException(Messages.NO_CONSTRUCTOR_ON_HANDLER.format(handlerClass));
         }
     }
-    
+
     /**
      * Registers a user-defined {@link OptionHandler} class with args4j.
      *
diff --git a/args4j/args4j/src/org/kohsuke/args4j/spi/MultiPathOptionHandler.java b/args4j/args4j/src/org/kohsuke/args4j/spi/MultiPathOptionHandler.java
deleted file mode 100644
index 97e3c06..0000000
--- a/args4j/args4j/src/org/kohsuke/args4j/spi/MultiPathOptionHandler.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.kohsuke.args4j.spi;
-
-import org.kohsuke.args4j.CmdLineParser;
-import org.kohsuke.args4j.OptionDef;
-
-import java.nio.file.Path;
-
-/**
- * Takes a classpath like option ("-cp a.jar;b.jar;c") and maps them to a collection of {@link Path}.
- *
- * @author kmahoney
- */
-public class MultiPathOptionHandler extends DelimitedOptionHandler<Path> {
-    protected static String sysPathSeperator = System.getProperty("path.separator");
-    public MultiPathOptionHandler(CmdLineParser parser, OptionDef option, Setter<? super Path> setter) {
-        super(parser, option, setter, sysPathSeperator, new PathOptionHandler(parser, option, setter));
-    }
-}
\ No newline at end of file
diff --git a/args4j/args4j/src/org/kohsuke/args4j/spi/PathOptionHandler.java b/args4j/args4j/src/org/kohsuke/args4j/spi/PathOptionHandler.java
deleted file mode 100644
index 9f13f15..0000000
--- a/args4j/args4j/src/org/kohsuke/args4j/spi/PathOptionHandler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.kohsuke.args4j.spi;
-
-import org.kohsuke.args4j.CmdLineException;
-import org.kohsuke.args4j.CmdLineParser;
-import org.kohsuke.args4j.OptionDef;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-/**
- * Takes a single argument to the option and maps that to {@link Path}.
- *
- * @author kmahoney
- */
-public class PathOptionHandler extends OneArgumentOptionHandler<Path> {
-    public PathOptionHandler(CmdLineParser parser, OptionDef option, Setter<? super Path> setter) {
-        super(parser, option, setter);
-    }
-
-    @Override
-    protected Path parse(String argument) throws NumberFormatException, CmdLineException {
-        try {
-        return Paths.get(argument);
-        }
-        catch (Exception e) {
-            throw new CmdLineException(owner, Messages.ILLEGAL_PATH, argument);
-        }
-    }
-
-    @Override
-    public String getDefaultMetaVariable() {
-        return Messages.DEFAULT_META_PATH_OPTION_HANDLER.format();
-    }
-}
\ No newline at end of file