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=898b391787d069ba8c43b7eb426d05b4f2e60133;hb=cf6e4ace4972f24f40f88ea12fcf99c763e4e40a;hpb=c921086faa9d28c7e5c8d3d7a382a2c00901fb18

diff --git a/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java
index 898b391..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,52 +9,54 @@
 
 package eu.svjatoslav.meviz.replace;
 
-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;
 
-public class CommandlineHandler {
+import java.io.File;
+
+class CommandlineHandler {
 
-	Parser parser = new Parser();
+    final Parser parser = new Parser();
 
-	NullParameter recursiveParameter = parser.createNullParameter(
-			"Enable recursive mode.").addAliases("-r", "--recursive");
+    private final NullParameter recursiveParameter = parser.add(
+            new NullParameter("Enable recursive mode.")).addAliases("-r",
+            "--recursive");
 
-	StringParameter searchForPattern = parser
-			.createStringParameter("String to search for")
-			.addAliases("-s", "--search-pattern").setMandatory();
+    private final StringParameter searchForPattern = parser
+            .add(new StringParameter("String to search for"))
+            .addAliases("-s", "--search-pattern").setMandatory();
 
-	StringParameter replaceWithPattern = parser.createStringParameter(
-			"String to place instead").addAliases("-p", "--replace-pattern");
+    private final StringParameter replaceWithPattern = parser.add(
+            new StringParameter("String to place instead")).addAliases("-p",
+            "--replace-pattern");
 
-	DirectoryParameter directoryParameter = parser
-			.createDirectoryParameter("Working directory.")
-			.addAliases("-w", "--working-directory").mustExist();
+    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();
 
-		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 (directoryParameter.isParameterSpecified())
-			options.targetDirectory = directoryParameter.getValue();
-		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.getValue();
+        if (searchForPattern.isSpecified())
+            options.searchForPattern = searchForPattern.getValue();
 
-		if (replaceWithPattern.isParameterSpecified())
-			options.replaceWithPattern = replaceWithPattern.getValue();
+        if (replaceWithPattern.isSpecified())
+            options.replaceWithPattern = replaceWithPattern.getValue();
 
-		return options;
-	}
+        return options;
+    }
 }