fixed typo

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

diff --git a/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java
index 4a8f336..3c4cc56 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/replace/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,62 +11,51 @@ package eu.svjatoslav.meviz.replace;
 
 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 searchForPattern = new Parameter(true, true, false,
-                       new StringArgument(), "String to search for", "-s",
-                       "--search-pattern");
+       NullParameter recursiveParameter = parser.add(
+                       new NullParameter("Enable recursive mode.")).addAliases("-r",
+                       "--recursive");
 
-       Parameter replaceWithPattern = new Parameter(true, true, false,
-                       new StringArgument(), "String to place instead", "-p",
-                       "--replace-pattern");
-
-       Parameter workingDirectoryParameter = new Parameter(false, true, false,
-                       new ExistingDirectory(), "Working directory.", "-w",
-                       "--working-directory");
-
-       public Parser initParser() {
+       StringParameter searchForPattern = parser
+                       .add(new StringParameter("String to search for"))
+                       .addAliases("-s", "--search-pattern").setMandatory();
 
-               final Parser parser = new Parser();
-               parser.addParameter(recursiveParameter);
-               parser.addParameter(searchForPattern);
-               parser.addParameter(replaceWithPattern);
-               parser.addParameter(workingDirectoryParameter);
+       StringParameter replaceWithPattern = parser.add(
+                       new StringParameter("String to place instead")).addAliases("-p",
+                       "--replace-pattern");
 
-               return parser;
-       }
+       DirectoryParameter directoryParameter = parser
+                       .add(new DirectoryParameter("Working directory."))
+                       .addAliases("-w", "--working-directory").mustExist();
 
        public CommandlineOptions parseCommandlineArguments(final String[] args) {
 
                final CommandlineOptions options = new CommandlineOptions();
 
-               final Parser parser = initParser();
                if (!parser.parse(args))
                        return null;
 
                if (recursiveParameter.isParameterSpecified())
                        options.recursive = true;
 
-               if (workingDirectoryParameter.isParameterSpecified())
-                       options.targetDirectory = workingDirectoryParameter
-                       .getArgumentsAsFiles().get(0);
+               if (directoryParameter.isParameterSpecified())
+                       options.targetDirectory = directoryParameter.getValue();
                else
                        options.targetDirectory = new File(System.getProperty("user.dir"));
 
                if (searchForPattern.isParameterSpecified())
-                       options.searchForPattern = searchForPattern.getArgumentAsString();
+                       options.searchForPattern = searchForPattern.getValue();
 
                if (replaceWithPattern.isParameterSpecified())
-                       options.replaceWithPattern = replaceWithPattern
-                       .getArgumentAsString();
+                       options.replaceWithPattern = replaceWithPattern.getValue();
 
                return options;
        }