X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Freplace%2FCommandlineHandler.java;h=6be577f2d8e37e71d8c3944868e6c5abba20e0a1;hb=567410640f4e0428caf9de9fc83df4c73f0e5067;hp=d8147a12036bd74bfe73260814e87068a2a50d84;hpb=1b742640af99284aae1cd10c259254137316ba7c;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java
index d8147a1..6be577f 100755
--- a/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java
@@ -1,11 +1,11 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
- * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Copyright (C) 2012 -- 2019, 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.
- */
+ * modify it under the terms of version 3 of the GNU Lesser General Public License
+ * or later as published by the Free Software Foundation.
+*/
 
 package eu.svjatoslav.meviz.replace;
 
@@ -16,23 +16,23 @@ import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParamet
 
 import java.io.File;
 
-public class CommandlineHandler {
+class CommandlineHandler {
 
-    Parser parser = new Parser();
+    final Parser parser = new Parser();
 
-    NullParameter recursiveParameter = parser.add(
+    private final NullParameter recursiveParameter = parser.add(
             new NullParameter("Enable recursive mode.")).addAliases("-r",
             "--recursive");
 
-    StringParameter searchForPattern = parser
+    private final StringParameter searchForPattern = parser
             .add(new StringParameter("String to search for"))
             .addAliases("-s", "--search-pattern").setMandatory();
 
-    StringParameter replaceWithPattern = parser.add(
+    private final StringParameter replaceWithPattern = parser.add(
             new StringParameter("String to place instead")).addAliases("-p",
             "--replace-pattern");
 
-    DirectoryParameter directoryParameter = parser
+    private final DirectoryParameter directoryParameter = parser
             .add(new DirectoryParameter("Working directory."))
             .addAliases("-w", "--working-directory").mustExist();
 
@@ -43,18 +43,18 @@ public class CommandlineHandler {
         if (!parser.parse(args))
             return null;
 
-        if (recursiveParameter.isParameterSpecified())
+        if (recursiveParameter.isSpecified())
             options.recursive = true;
 
-        if (directoryParameter.isParameterSpecified())
+        if (directoryParameter.isSpecified())
             options.targetDirectory = directoryParameter.getValue();
         else
             options.targetDirectory = new File(System.getProperty("user.dir"));
 
-        if (searchForPattern.isParameterSpecified())
+        if (searchForPattern.isSpecified())
             options.searchForPattern = searchForPattern.getValue();
 
-        if (replaceWithPattern.isParameterSpecified())
+        if (replaceWithPattern.isSpecified())
             options.replaceWithPattern = replaceWithPattern.getValue();
 
         return options;