X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Ftextsplitter%2FCommandlineHandler.java;h=21a2ed4f5d8dba2dd86496ef778ff68c1ee137f2;hb=fd7c0e940fb4059155d07992b8c1902537cf193b;hp=5f7bc0e3aa535e10824c5bebffbdcd6160af5531;hpb=92b09ba436ee986976a4430ebf5c8359916bc2a8;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java
index 5f7bc0e..21a2ed4 100755
--- a/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/textsplitter/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 -- 2017, 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,66 +9,55 @@
 
 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.StringParameters;
 
-public class CommandlineHandler {
-
-	Parameter recursiveParameter = new Parameter("Enable recursive mode.",
-			"-r", "--recursive");
+import java.io.File;
 
-	Parameter fileInputPatternsParameter = new Parameter(true, true, true,
-			new StringArgument(), "File input pattern.", "-i",
-			"--input-pattern");
+class CommandlineHandler {
 
-	Parameter splitPatternsParameter = new Parameter(true, true, true,
-			new StringArgument(), "File split regular expression.", "-s",
-			"--split-pattern");
+    final Parser parser = new Parser();
 
-	Parameter workingDirectoryParameter = new Parameter(false, true, true,
-			new ExistingDirectory(), "Working directory.", "-w",
-			"--working-directory");
+    private final NullParameter recursiveParameter = parser.add(
+            new NullParameter("Enable recursive mode.")).addAliases("-r",
+            "--recursive");
 
-	public Parser initParser() {
+    private final StringParameters fileInputPatternsParameter = parser.add(
+            new StringParameters("File input pattern.").addAliases("-i",
+                    "--input-pattern")).setMandatory();
 
-		final Parser parser = new Parser();
-		parser.addParameter(recursiveParameter);
-		parser.addParameter(fileInputPatternsParameter);
-		parser.addParameter(splitPatternsParameter);
-		parser.addParameter(workingDirectoryParameter);
+    private final StringParameters splitPatternsParameter = parser
+            .add(new StringParameters("File split regular expression."))
+            .addAliases("-s", "--split-pattern").setMandatory();
 
-		return parser;
-	}
+    private final DirectoryParameter workingDirectoryParameter = parser.add(
+            new DirectoryParameter("Working directory.")).addAliases("-w",
+            "--working-directory");
 
-	public TextSplittingOptions parseCommandlineArguments(final String[] args) {
+    public TextSplittingOptions parseCommandlineArguments(final String[] args) {
 
-		final TextSplittingOptions options = new TextSplittingOptions();
+        final TextSplittingOptions options = new TextSplittingOptions();
 
-		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
-					.getArgumentsAsFiles().get(0);
-		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"));
 
-		if (fileInputPatternsParameter.isParameterSpecified())
-			options.fileInputPatterns.addAll(fileInputPatternsParameter
-					.getArgumentsAsStrings());
+        if (fileInputPatternsParameter.isSpecified())
+            options.fileInputPatterns.addAll(fileInputPatternsParameter
+                    .getValue());
 
-		if (splitPatternsParameter.isParameterSpecified())
-			options.textSplitPatterns.addAll(splitPatternsParameter
-					.getArgumentsAsStrings());
+        if (splitPatternsParameter.isSpecified())
+            options.textSplitPatterns.addAll(splitPatternsParameter.getValue());
 
-		return options;
-	}
+        return options;
+    }
 }