X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fbomremove%2FCommandlineHandler.java;h=16d3e2c3d81a3f8832363849202808fa73bf5ad3;hb=c921086faa9d28c7e5c8d3d7a382a2c00901fb18;hp=3276e13266d499ac7e738aa877e4174bc147d071;hpb=44f215f2bc0113e9f30cfcb788af6b01989dad01;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java
index 3276e13..16d3e2c 100755
--- a/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java
@@ -11,23 +11,24 @@ package eu.svjatoslav.meviz.bomremove;
 
 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 inputPatternParameter = parser.createStringParameter(
+			"File input pattern.").addAliases("-i", "--input-pattern");
+
+	DirectoryParameter workingDirectoryParameter = parser
+			.createDirectoryParameter("Working directory.")
+			.addAliases("-w", "--working-directory").mustExist();
 
 	public Parser initParser() {
 
@@ -51,11 +52,11 @@ 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"));
 
+		// TODO: add support for multiple input patterns
 		if (inputPatternParameter.isParameterSpecified())
 			options.inputPatterns.addAll(inputPatternParameter
 					.getArgumentsAsStrings());