updated meviz to work with new commandline parsing API

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

diff --git a/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java
index 5f7bc0e..8060db6 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java
@@ -11,44 +11,34 @@ package eu.svjatoslav.meviz.textsplitter;
 
 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 fileInputPatternsParameter = new Parameter(true, true, true,
-                       new StringArgument(), "File input pattern.", "-i",
-                       "--input-pattern");
+       NullParameter recursiveParameter = parser.createNullParameter(
+                       "Enable recursive mode.").addAliases("-r", "--recursive");
 
-       Parameter splitPatternsParameter = new Parameter(true, true, true,
-                       new StringArgument(), "File split regular expression.", "-s",
-                       "--split-pattern");
+       StringParameter fileInputPatternsParameter = parser
+                       .createStringParameter("File input pattern.")
+                       .addAliases("-i", "--input-pattern").setMandatory();
 
-       Parameter workingDirectoryParameter = new Parameter(false, true, true,
-                       new ExistingDirectory(), "Working directory.", "-w",
-                       "--working-directory");
+       StringParameter splitPatternsParameter = parser
+                       .createStringParameter("File split regular expression.")
+                       .addAliases("-s", "--split-pattern").setMandatory();
 
-       public Parser initParser() {
-
-               final Parser parser = new Parser();
-               parser.addParameter(recursiveParameter);
-               parser.addParameter(fileInputPatternsParameter);
-               parser.addParameter(splitPatternsParameter);
-               parser.addParameter(workingDirectoryParameter);
-
-               return parser;
-       }
+       DirectoryParameter workingDirectoryParameter = parser
+                       .createDirectoryParameter("Working directory.").addAliases("-w",
+                                       "--working-directory");
 
        public TextSplittingOptions parseCommandlineArguments(final String[] args) {
 
                final TextSplittingOptions options = new TextSplittingOptions();
 
-               final Parser parser = initParser();
                if (!parser.parse(args))
                        return null;
 
@@ -56,8 +46,7 @@ public class CommandlineHandler {
                        options.recursive = true;
 
                if (workingDirectoryParameter.isParameterSpecified())
-                       options.targetDirectory = workingDirectoryParameter
-                                       .getArgumentsAsFiles().get(0);
+                       options.targetDirectory = workingDirectoryParameter.getValue();
                else
                        options.targetDirectory = new File(System.getProperty("user.dir"));