Updated copyright message.

[meviz.git] / src / main / java / eu / svjatoslav / meviz / bomremove / CommandlineHandler.java

diff --git a/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java
index 16d3e2c..895aa7b 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java
@@ -1,7 +1,7 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
- * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ * Copyright (C) 2012 -- 2018, 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.
@@ -9,58 +9,48 @@
 
 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;
+    }
 }