X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Ftextsplitter%2FCommandlineHandler.java;h=8060db6090cd211605532d7527bab726f1a73270;hb=b0c6e70ecdcb0dc55eed55ded5a82edc8bdfa729;hp=15be77c458fd23c1f347f98e935830f0e532acc5;hpb=6b6927aafa42fefece54df3c05ebd9161993ef52;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 15be77c..8060db6 100755
--- a/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java
@@ -11,39 +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 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 fileInputPatternsParameter = parser
+			.createStringParameter("File input pattern.")
+			.addAliases("-i", "--input-pattern").setMandatory();
 
-	public Parser initParser() {
+	StringParameter splitPatternsParameter = parser
+			.createStringParameter("File split regular expression.")
+			.addAliases("-s", "--split-pattern").setMandatory();
 
-		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 TextSplittingOptions parseCommandlineArguments(final String[] args) {
 
 		final TextSplittingOptions options = new TextSplittingOptions();
 
-		final Parser parser = initParser();
 		if (!parser.parse(args))
 			return null;
 
@@ -51,13 +46,16 @@ 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"));
 
-		if (inputPatternParameter.isParameterSpecified())
-			options.inputPatterns.addAll(inputPatternParameter
+		if (fileInputPatternsParameter.isParameterSpecified())
+			options.fileInputPatterns.addAll(fileInputPatternsParameter
+					.getArgumentsAsStrings());
+
+		if (splitPatternsParameter.isParameterSpecified())
+			options.textSplitPatterns.addAll(splitPatternsParameter
 					.getArgumentsAsStrings());
 
 		return options;