X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fbomremove%2FCommandlineHandler.java;h=5ac2050b1311323fa0b7c99bb32b9037199d0411;hb=567410640f4e0428caf9de9fc83df4c73f0e5067;hp=16d3e2c3d81a3f8832363849202808fa73bf5ad3;hpb=c921086faa9d28c7e5c8d3d7a382a2c00901fb18;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java
index 16d3e2c..5ac2050 100755
--- a/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java
@@ -1,66 +1,56 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
- * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ * Copyright (C) 2012 -- 2019, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
- */
+ * modify it under the terms of version 3 of the GNU Lesser General Public License
+ * or later as published by the Free Software Foundation.
+*/
 
 package eu.svjatoslav.meviz.bomremove;
 
-import java.io.File;
-
 import eu.svjatoslav.commons.commandline.parameterparser.Parser;
 import eu.svjatoslav.commons.commandline.parameterparser.parameter.DirectoryParameter;
 import eu.svjatoslav.commons.commandline.parameterparser.parameter.NullParameter;
-import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParameter;
-
-public class CommandlineHandler {
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParameters;
 
-	Parser parser = new Parser();
-
-	NullParameter recursiveParameter = parser.createNullParameter(
-			"Enable recursive mode.").addAliases("-r", "--recursive");
+import java.io.File;
 
-	StringParameter inputPatternParameter = parser.createStringParameter(
-			"File input pattern.").addAliases("-i", "--input-pattern");
+class CommandlineHandler {
 
-	DirectoryParameter workingDirectoryParameter = parser
-			.createDirectoryParameter("Working directory.")
-			.addAliases("-w", "--working-directory").mustExist();
+    final Parser parser = new Parser();
 
-	public Parser initParser() {
+    private final NullParameter recursiveParameter = parser.add(
+            new NullParameter("Enable recursive mode.")).addAliases("-r",
+            "--recursive");
 
-		final Parser parser = new Parser();
-		parser.addParameter(recursiveParameter);
-		parser.addParameter(inputPatternParameter);
-		parser.addParameter(workingDirectoryParameter);
+    private final StringParameters inputPatternParameter = parser.add(
+            new StringParameters("File input pattern.")).addAliases("-i",
+            "--input-pattern");
 
-		return parser;
-	}
+    private final DirectoryParameter workingDirectoryParameter = parser
+            .add(new DirectoryParameter("Working directory."))
+            .addAliases("-w", "--working-directory").mustExist();
 
-	public BomStrippingOptions parseCommandlineArguments(final String[] args) {
+    public BomStrippingOptions parseCommandlineArguments(final String[] args) {
 
-		final BomStrippingOptions options = new BomStrippingOptions();
+        final BomStrippingOptions options = new BomStrippingOptions();
 
-		final Parser parser = initParser();
-		if (!parser.parse(args))
-			return null;
+        if (!parser.parse(args))
+            return null;
 
-		if (recursiveParameter.isParameterSpecified())
-			options.recursive = true;
+        if (recursiveParameter.isSpecified())
+            options.recursive = true;
 
-		if (workingDirectoryParameter.isParameterSpecified())
-			options.targetDirectory = workingDirectoryParameter.getValue();
-		else
-			options.targetDirectory = new File(System.getProperty("user.dir"));
+        if (workingDirectoryParameter.isSpecified())
+            options.targetDirectory = workingDirectoryParameter.getValue();
+        else
+            options.targetDirectory = new File(System.getProperty("user.dir"));
 
-		// TODO: add support for multiple input patterns
-		if (inputPatternParameter.isParameterSpecified())
-			options.inputPatterns.addAll(inputPatternParameter
-					.getArgumentsAsStrings());
+        // TODO: add support for multiple input patterns
+        if (inputPatternParameter.isSpecified())
+            options.inputPatterns.addAll(inputPatternParameter.getValue());
 
-		return options;
-	}
+        return options;
+    }
 }