X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=meviz.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Freplace%2FCommandlineHandler.java;h=915367bf2e50fc29bfbcfc88198ac8a6cfdf95da;hp=4a8f3369aad67f04ab3c5320ada66f24a03a5dbc;hb=cf6e4ace4972f24f40f88ea12fcf99c763e4e40a;hpb=44b11b236b891659a86865c0ff66677fea5233f1

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