X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=javainspect.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Finspector%2Fjava%2Fcommandline%2FMain.java;fp=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Finspector%2Fjava%2Fcommandline%2FMain.java;h=f8dd57750aea102ccbe45e992655123e59d4c10e;hp=8fcf5f6f42031ec82df1cd6b35699015efd50f8f;hb=c98cda3c339e0a3345884e17e7657301d285ca1f;hpb=b2f519fd934cd49afbb5cfc88b3d2be396af0afa diff --git a/src/main/java/eu/svjatoslav/inspector/java/commandline/Main.java b/src/main/java/eu/svjatoslav/inspector/java/commandline/Main.java index 8fcf5f6..f8dd577 100644 --- a/src/main/java/eu/svjatoslav/inspector/java/commandline/Main.java +++ b/src/main/java/eu/svjatoslav/inspector/java/commandline/Main.java @@ -1,6 +1,5 @@ package eu.svjatoslav.inspector.java.commandline; -import eu.svjatoslav.inspector.java.commandline.CommandlineConfiguration; import eu.svjatoslav.inspector.java.structure.ClassGraph; import java.io.File; @@ -14,9 +13,6 @@ import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; -import static java.io.File.separator; -import static java.lang.System.getProperty; - /** * This class acts as a commandline interface for JavaInspect. */ @@ -41,7 +37,8 @@ public class Main { ClassGraph classGraph = new ClassGraph(); - classGraph.setTargetDirectory(getTargetDirectory(configuration)); + if (configuration.targetDirectory.isSpecified()) + classGraph.setTargetDirectory(configuration.targetDirectory.getValue()); if (configuration.targetImageType.isSpecified()) classGraph.setTargetImageType(configuration.targetImageType.getValue()); @@ -60,14 +57,6 @@ public class Main { return classGraph; } - private static File getTargetDirectory(CommandlineConfiguration configuration) { - if (configuration.targetDirectory.isSpecified()) - return configuration.targetDirectory.getValue(); - - // default to current directory - return new File(getProperty("user.dir") + separator); - } - private static URL[] getFileUrls(List jarFiles) { List urls = new ArrayList<>(); jarFiles.forEach((File file) -> {