added possibility to use multiple patterns from command-line

[meviz.git] / src / main / java / eu / svjatoslav / meviz / textsplitter / CommandlineHandler.java

diff --git a/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java
index 8060db6..ef2a27a 100755 (executable)
--- 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.
@@ -14,7 +14,7 @@ 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 {
 
@@ -23,12 +23,12 @@ public class CommandlineHandler {
        NullParameter recursiveParameter = parser.createNullParameter(
                        "Enable recursive mode.").addAliases("-r", "--recursive");
 
-       StringParameter fileInputPatternsParameter = parser
-                       .createStringParameter("File input pattern.")
+       StringParameters fileInputPatternsParameter = parser
+                       .createStringParameters("File input pattern.")
                        .addAliases("-i", "--input-pattern").setMandatory();
 
-       StringParameter splitPatternsParameter = parser
-                       .createStringParameter("File split regular expression.")
+       StringParameters splitPatternsParameter = parser
+                       .createStringParameters("File split regular expression.")
                        .addAliases("-s", "--split-pattern").setMandatory();
 
        DirectoryParameter workingDirectoryParameter = parser
@@ -52,11 +52,10 @@ public class CommandlineHandler {
 
                if (fileInputPatternsParameter.isParameterSpecified())
                        options.fileInputPatterns.addAll(fileInputPatternsParameter
-                                       .getArgumentsAsStrings());
+                                       .getValue());
 
                if (splitPatternsParameter.isParameterSpecified())
-                       options.textSplitPatterns.addAll(splitPatternsParameter
-                                       .getArgumentsAsStrings());
+                       options.textSplitPatterns.addAll(splitPatternsParameter.getValue());
 
                return options;
        }