more elegant commandline handling

[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 1bc4f3c..fdfc3c9 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java
@@ -20,31 +20,22 @@ public class CommandlineHandler {
 
        Parser parser = new Parser();
 
-       NullParameter recursiveParameter = parser.createNullParameter(
-                       "Enable recursive mode.").addAliases("-r", "--recursive");
+       NullParameter recursiveParameter = parser.add(
+                       new NullParameter("Enable recursive mode.")).addAliases("-r",
+                       "--recursive");
 
-       StringParameters inputPatternParameter = parser.createStringParameters(
-                       "File input pattern.").addAliases("-i", "--input-pattern");
+       StringParameters inputPatternParameter = parser.add(
+                       new StringParameters("File input pattern.")).addAliases("-i",
+                                       "--input-pattern");
 
        DirectoryParameter workingDirectoryParameter = parser
-                       .createDirectoryParameter("Working directory.")
+                       .add(new DirectoryParameter("Working directory."))
                        .addAliases("-w", "--working-directory").mustExist();
 
-       public Parser initParser() {
-
-               final Parser parser = new Parser();
-               parser.addParameter(recursiveParameter);
-               parser.addParameter(inputPatternParameter);
-               parser.addParameter(workingDirectoryParameter);
-
-               return parser;
-       }
-
        public BomStrippingOptions parseCommandlineArguments(final String[] args) {
 
                final BomStrippingOptions options = new BomStrippingOptions();
 
-               final Parser parser = initParser();
                if (!parser.parse(args))
                        return null;