X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Frenamer%2FCommandlineHandler.java;h=9eb45de1869a35c17a5ff49d75f05d935ea833c3;hb=b0c6e70ecdcb0dc55eed55ded5a82edc8bdfa729;hp=1c559c727c98123f5ff70bd3b5465d8ddb02b7f1;hpb=50cb7085d553fdd82cd06806cd27b1675299f719;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java
index 1c559c7..9eb45de 100755
--- a/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java
@@ -11,51 +11,32 @@ package eu.svjatoslav.meviz.renamer;
 
 import java.io.File;
 
-import eu.svjatoslav.commons.commandline.parameterparser.Parameter;
 import eu.svjatoslav.commons.commandline.parameterparser.Parser;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.DirectoryParameter;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.NullParameter;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParameter;
 import eu.svjatoslav.meviz.encoder.EncodingOptions;
 
 public class CommandlineHandler {
 
-	Parameter recursiveParameter = new Parameter("Enable recursive mode.",
-			"-r", "--recursive");
-
-	Parameter testParameter = new Parameter(
-			"Simulate renaming (no changes will be actually done).", "-t",
-			"--test");
-
-	Parameter outputPatternParameter = new Parameter(
-			true,
-			true,
-			true,
-			new eu.svjatoslav.commons.commandline.parameterparser.arguments.String(),
-			"Output pattern.", "-o", "--output-pattern");
-
-	Parameter inputPatternParameter = new Parameter(
-			true,
-			true,
-			true,
-			new eu.svjatoslav.commons.commandline.parameterparser.arguments.String(),
-			"File input pattern.", "-i", "--input-pattern");
-
-	Parameter workingDirectoryParameter = new Parameter(
-			false,
-			true,
-			true,
-			new eu.svjatoslav.commons.commandline.parameterparser.arguments.ExistingDirectory(),
-			"Working directory.", "-w", "--working-directory");
-
-	public Parser initParser() {
-
-		final Parser parser = new Parser();
-		parser.addParameter(recursiveParameter);
-		parser.addParameter(testParameter);
-		parser.addParameter(outputPatternParameter);
-		parser.addParameter(inputPatternParameter);
-		parser.addParameter(workingDirectoryParameter);
-
-		return parser;
-	}
+	Parser parser = new Parser();
+
+	NullParameter recursiveParameter = parser.createNullParameter(
+			"Enable recursive mode.").addAliases("-r", "--recursive");
+
+	NullParameter testParameter = parser.createNullParameter(
+			"Simulate renaming (no changes will be actually done).")
+			.addAliases("-t", "--test");
+
+	StringParameter outputPatternParameter = parser.createStringParameter(
+			"Output pattern.").addAliases("-o", "--output-pattern");
+
+	StringParameter inputPatternParameter = parser.createStringParameter(
+			"File input pattern.").addAliases("-i", "--input-pattern");
+
+	DirectoryParameter workingDirectoryParameter = parser
+			.createDirectoryParameter("Working directory.")
+			.addAliases("-w", "--working-directory").mustExist();
 
 	/**
 	 * @return {@link EncodingOptions} if commandline arguments were
@@ -66,7 +47,6 @@ public class CommandlineHandler {
 
 		final RenamingOptions options = new RenamingOptions();
 
-		final Parser parser = initParser();
 		if (!parser.parse(args))
 			return null;
 
@@ -77,15 +57,14 @@ public class CommandlineHandler {
 			options.recursive = true;
 
 		if (outputPatternParameter.isParameterSpecified())
-			options.outputPattern = outputPatternParameter
-					.getArgumentsAsStrings().get(0);
+			options.outputPattern = outputPatternParameter.getValue();
 
 		if (workingDirectoryParameter.isParameterSpecified())
-			options.targetDirectory = workingDirectoryParameter
-					.getArgumentsAsFiles().get(0);
+			options.targetDirectory = workingDirectoryParameter.getValue();
 		else
 			options.targetDirectory = new File(System.getProperty("user.dir"));
 
+		// TODO: add multiple input patterns support
 		if (inputPatternParameter.isParameterSpecified())
 			options.inputPatterns.addAll(inputPatternParameter
 					.getArgumentsAsStrings());