X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fbomremove%2FCommandlineHandler.java;h=fdfc3c9d14cf753f5971811dd9c5b4477aac9c8f;hb=a1f0af78541492c161ed5e7694b39da94e26116e;hp=16d3e2c3d81a3f8832363849202808fa73bf5ad3;hpb=c921086faa9d28c7e5c8d3d7a382a2c00901fb18;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 16d3e2c..fdfc3c9 100755
--- a/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java
@@ -1,7 +1,7 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
  * Copyright (C) 2012, 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.
@@ -14,37 +14,28 @@ import java.io.File;
 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.commons.commandline.parameterparser.parameter.StringParameters;
 
 public class CommandlineHandler {
 
 	Parser parser = new Parser();
 
-	NullParameter recursiveParameter = parser.createNullParameter(
-			"Enable recursive mode.").addAliases("-r", "--recursive");
+	NullParameter recursiveParameter = parser.add(
+			new NullParameter("Enable recursive mode.")).addAliases("-r",
+			"--recursive");
 
-	StringParameter inputPatternParameter = parser.createStringParameter(
-			"File input pattern.").addAliases("-i", "--input-pattern");
+	StringParameters inputPatternParameter = parser.add(
+			new StringParameters("File input pattern.")).addAliases("-i",
+					"--input-pattern");
 
 	DirectoryParameter workingDirectoryParameter = parser
-			.createDirectoryParameter("Working directory.")
+			.add(new DirectoryParameter("Working directory."))
 			.addAliases("-w", "--working-directory").mustExist();
 
-	public Parser initParser() {
-
-		final Parser parser = new Parser();
-		parser.addParameter(recursiveParameter);
-		parser.addParameter(inputPatternParameter);
-		parser.addParameter(workingDirectoryParameter);
-
-		return parser;
-	}
-
 	public BomStrippingOptions parseCommandlineArguments(final String[] args) {
 
 		final BomStrippingOptions options = new BomStrippingOptions();
 
-		final Parser parser = initParser();
 		if (!parser.parse(args))
 			return null;
 
@@ -58,8 +49,7 @@ public class CommandlineHandler {
 
 		// TODO: add support for multiple input patterns
 		if (inputPatternParameter.isParameterSpecified())
-			options.inputPatterns.addAll(inputPatternParameter
-					.getArgumentsAsStrings());
+			options.inputPatterns.addAll(inputPatternParameter.getValue());
 
 		return options;
 	}