X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Ftextsplitter%2FCommandlineHandler.java;h=322d56c1afdcc9c51b2a09199f98369a219e8893;hb=0c8606b2b2bee4d93f383653c283da116ad7fdee;hp=1364a1344a727c09d13987b92d6fc1eaefb9bce8;hpb=50cb7085d553fdd82cd06806cd27b1675299f719;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java
index 1364a13..322d56c 100755
--- a/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/textsplitter/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.
@@ -9,61 +9,55 @@
 
 package eu.svjatoslav.meviz.textsplitter;
 
-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.StringParameters;
+
+import java.io.File;
 
 public class CommandlineHandler {
 
-	Parameter recursiveParameter = new Parameter("Enable recursive mode.",
-			"-r", "--recursive");
+    Parser parser = new Parser();
 
-	Parameter inputPatternParameter = new Parameter(
-			true,
-			true,
-			true,
-			new eu.svjatoslav.commons.commandline.parameterparser.arguments.String(),
-			"File input pattern.", "-i", "--input-pattern");
+    NullParameter recursiveParameter = parser.add(
+            new NullParameter("Enable recursive mode.")).addAliases("-r",
+            "--recursive");
 
-	Parameter workingDirectoryParameter = new Parameter(
-			false,
-			true,
-			true,
-			new eu.svjatoslav.commons.commandline.parameterparser.arguments.ExistingDirectory(),
-			"Working directory.", "-w", "--working-directory");
+    StringParameters fileInputPatternsParameter = parser.add(
+            new StringParameters("File input pattern.").addAliases("-i",
+                    "--input-pattern")).setMandatory();
 
-	public Parser initParser() {
+    StringParameters splitPatternsParameter = parser
+            .add(new StringParameters("File split regular expression."))
+            .addAliases("-s", "--split-pattern").setMandatory();
 
-		final Parser parser = new Parser();
-		parser.addParameter(recursiveParameter);
-		parser.addParameter(inputPatternParameter);
-		parser.addParameter(workingDirectoryParameter);
+    DirectoryParameter workingDirectoryParameter = parser.add(
+            new DirectoryParameter("Working directory.")).addAliases("-w",
+            "--working-directory");
 
-		return parser;
-	}
+    public TextSplittingOptions parseCommandlineArguments(final String[] args) {
 
-	public TextSplittingOptions parseCommandlineArguments(final String[] args) {
+        final TextSplittingOptions options = new TextSplittingOptions();
 
-		final TextSplittingOptions options = new TextSplittingOptions();
+        if (!parser.parse(args))
+            return null;
 
-		final Parser parser = initParser();
-		if (!parser.parse(args))
-			return null;
+        if (recursiveParameter.isParameterSpecified())
+            options.recursive = true;
 
-		if (recursiveParameter.isParameterSpecified())
-			options.recursive = true;
+        if (workingDirectoryParameter.isParameterSpecified())
+            options.targetDirectory = workingDirectoryParameter.getValue();
+        else
+            options.targetDirectory = new File(System.getProperty("user.dir"));
 
-		if (workingDirectoryParameter.isParameterSpecified())
-			options.targetDirectory = workingDirectoryParameter
-					.getArgumentsAsFiles().get(0);
-		else
-			options.targetDirectory = new File(System.getProperty("user.dir"));
+        if (fileInputPatternsParameter.isParameterSpecified())
+            options.fileInputPatterns.addAll(fileInputPatternsParameter
+                    .getValue());
 
-		if (inputPatternParameter.isParameterSpecified())
-			options.inputPatterns.addAll(inputPatternParameter
-					.getArgumentsAsStrings());
+        if (splitPatternsParameter.isParameterSpecified())
+            options.textSplitPatterns.addAll(splitPatternsParameter.getValue());
 
-		return options;
-	}
+        return options;
+    }
 }