updated meviz to work with new commandline parsing API

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

diff --git a/src/main/java/eu/svjatoslav/meviz/texttruncate/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/texttruncate/CommandlineHandler.java
index d391bca..005a828 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/texttruncate/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/texttruncate/CommandlineHandler.java
@@ -11,39 +11,29 @@ package eu.svjatoslav.meviz.texttruncate;
 
 import java.io.File;
 
-import eu.svjatoslav.commons.commandline.parameterparser.Parameter;
 import eu.svjatoslav.commons.commandline.parameterparser.Parser;
-import eu.svjatoslav.commons.commandline.parameterparser.arguments.ExistingDirectory;
-import eu.svjatoslav.commons.commandline.parameterparser.arguments.StringArgument;
+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 {
 
-       Parameter recursiveParameter = new Parameter("Enable recursive mode.",
-                       "-r", "--recursive");
+       Parser parser = new Parser();
 
-       Parameter inputPatternParameter = new Parameter(true, true, true,
-                       new StringArgument(), "File input pattern.", "-i",
-                       "--input-pattern");
+       NullParameter recursiveParameter = parser.createNullParameter(
+                       "Enable recursive mode.").addAliases("-r", "--recursive");
 
-       Parameter workingDirectoryParameter = new Parameter(false, true, true,
-                       new ExistingDirectory(), "Working directory.", "-w",
-                       "--working-directory");
+       StringParameter inputPatternParameter = parser.createStringParameter(
+                       "File input pattern.").addAliases("-i", "--input-pattern");
 
-       public Parser initParser() {
-
-               final Parser parser = new Parser();
-               parser.addParameter(recursiveParameter);
-               parser.addParameter(inputPatternParameter);
-               parser.addParameter(workingDirectoryParameter);
-
-               return parser;
-       }
+       DirectoryParameter workingDirectoryParameter = parser
+                       .createDirectoryParameter("Working directory.").addAliases("-w",
+                                       "--working-directory");
 
        public TextTruncatingOptions parseCommandlineArguments(final String[] args) {
 
                final TextTruncatingOptions options = new TextTruncatingOptions();
 
-               final Parser parser = initParser();
                if (!parser.parse(args))
                        return null;