X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Freplace%2FCommandlineHandler.java;h=898b391787d069ba8c43b7eb426d05b4f2e60133;hb=28cac33d2214756bb8bcb3bb0fee897df072382b;hp=4a8f3369aad67f04ab3c5320ada66f24a03a5dbc;hpb=44b11b236b891659a86865c0ff66677fea5233f1;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java
index 4a8f336..898b391 100755
--- a/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java
@@ -11,62 +11,49 @@ package eu.svjatoslav.meviz.replace;
 
 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 searchForPattern = new Parameter(true, true, false,
-			new StringArgument(), "String to search for", "-s",
-			"--search-pattern");
+	NullParameter recursiveParameter = parser.createNullParameter(
+			"Enable recursive mode.").addAliases("-r", "--recursive");
 
-	Parameter replaceWithPattern = new Parameter(true, true, false,
-			new StringArgument(), "String to place instead", "-p",
-			"--replace-pattern");
+	StringParameter searchForPattern = parser
+			.createStringParameter("String to search for")
+			.addAliases("-s", "--search-pattern").setMandatory();
 
-	Parameter workingDirectoryParameter = new Parameter(false, true, false,
-			new ExistingDirectory(), "Working directory.", "-w",
-			"--working-directory");
+	StringParameter replaceWithPattern = parser.createStringParameter(
+			"String to place instead").addAliases("-p", "--replace-pattern");
 
-	public Parser initParser() {
-
-		final Parser parser = new Parser();
-		parser.addParameter(recursiveParameter);
-		parser.addParameter(searchForPattern);
-		parser.addParameter(replaceWithPattern);
-		parser.addParameter(workingDirectoryParameter);
-
-		return parser;
-	}
+	DirectoryParameter directoryParameter = parser
+			.createDirectoryParameter("Working directory.")
+			.addAliases("-w", "--working-directory").mustExist();
 
 	public CommandlineOptions parseCommandlineArguments(final String[] args) {
 
 		final CommandlineOptions options = new CommandlineOptions();
 
-		final Parser parser = initParser();
 		if (!parser.parse(args))
 			return null;
 
 		if (recursiveParameter.isParameterSpecified())
 			options.recursive = true;
 
-		if (workingDirectoryParameter.isParameterSpecified())
-			options.targetDirectory = workingDirectoryParameter
-			.getArgumentsAsFiles().get(0);
+		if (directoryParameter.isParameterSpecified())
+			options.targetDirectory = directoryParameter.getValue();
 		else
 			options.targetDirectory = new File(System.getProperty("user.dir"));
 
 		if (searchForPattern.isParameterSpecified())
-			options.searchForPattern = searchForPattern.getArgumentAsString();
+			options.searchForPattern = searchForPattern.getValue();
 
 		if (replaceWithPattern.isParameterSpecified())
-			options.replaceWithPattern = replaceWithPattern
-			.getArgumentAsString();
+			options.replaceWithPattern = replaceWithPattern.getValue();
 
 		return options;
 	}