X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Ftexttruncate%2FCommandlineHandler.java;h=303c607543b9ca15f9b451e0d128e2ff4403f669;hb=6cda75011fa4346a3cc2c7c7790eb1f1b12cd3fe;hp=d391bcac9f6fbdef6205d2ac127ab5b0414c8e48;hpb=92b09ba436ee986976a4430ebf5c8359916bc2a8;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/texttruncate/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/texttruncate/CommandlineHandler.java
index d391bca..303c607 100755
--- a/src/main/java/eu/svjatoslav/meviz/texttruncate/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/texttruncate/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.
@@ -11,39 +11,31 @@ package eu.svjatoslav.meviz.texttruncate;
 
 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.StringParameters;
 
 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",
+	NullParameter recursiveParameter = parser.add(
+			new NullParameter("Enable recursive mode.")).addAliases("-r",
+			"--recursive");
+
+	StringParameters inputPatternParameter = parser.add(
+			new StringParameters("File input pattern.")).addAliases("-i",
 			"--input-pattern");
 
-	Parameter workingDirectoryParameter = new Parameter(false, true, true,
-			new ExistingDirectory(), "Working directory.", "-w",
+	DirectoryParameter workingDirectoryParameter = parser.add(
+			new DirectoryParameter("Working directory.")).addAliases("-w",
 			"--working-directory");
 
-	public Parser initParser() {
-
-		final Parser parser = new Parser();
-		parser.addParameter(recursiveParameter);
-		parser.addParameter(inputPatternParameter);
-		parser.addParameter(workingDirectoryParameter);
-
-		return parser;
-	}
-
 	public TextTruncatingOptions parseCommandlineArguments(final String[] args) {
 
 		final TextTruncatingOptions options = new TextTruncatingOptions();
 
-		final Parser parser = initParser();
 		if (!parser.parse(args))
 			return null;
 
@@ -51,14 +43,12 @@ 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
-					.getArgumentsAsStrings());
+			options.inputPatterns.addAll(inputPatternParameter.getValue());
 
 		return options;
 	}