X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=meviz.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Frenamer%2FCommandlineHandler.java;h=bc8c8582acf5168dadc7babe0d350c910c2a0fd7;hp=708cf16bcf6219955fbaeafab179eaf1f4652fcc;hb=cf6e4ace4972f24f40f88ea12fcf99c763e4e40a;hpb=1b742640af99284aae1cd10c259254137316ba7c

diff --git a/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java
index 708cf16..bc8c858 100755
--- a/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -18,28 +18,28 @@ import eu.svjatoslav.meviz.encoder.EncodingOptions;
 
 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");
 
-    NullParameter testParameter = parser.add(
+    private final NullParameter testParameter = parser.add(
             new NullParameter(
                     "Simulate renaming (no changes will be actually done)."))
             .addAliases("-t", "--test");
 
-    StringParameter outputPatternParameter = parser.add(
+    private final StringParameter outputPatternParameter = parser.add(
             new StringParameter("Output pattern.")).addAliases("-o",
             "--output-pattern");
 
-    StringParameters inputPatternParameter = parser.add(
+    private final StringParameters inputPatternParameter = parser.add(
             new StringParameters("File input pattern.")).addAliases("-i",
             "--input-pattern");
 
-    DirectoryParameter workingDirectoryParameter = parser
+    private final DirectoryParameter workingDirectoryParameter = parser
             .add(new DirectoryParameter("Working directory."))
             .addAliases("-w", "--working-directory").mustExist();
 
@@ -55,22 +55,22 @@ public class CommandlineHandler {
         if (!parser.parse(args))
             return null;
 
-        if (testParameter.isParameterSpecified())
+        if (testParameter.isSpecified())
             options.testOnly = true;
 
-        if (recursiveParameter.isParameterSpecified())
+        if (recursiveParameter.isSpecified())
             options.recursive = true;
 
-        if (outputPatternParameter.isParameterSpecified())
+        if (outputPatternParameter.isSpecified())
             options.outputPattern = outputPatternParameter.getValue();
 
-        if (workingDirectoryParameter.isParameterSpecified())
+        if (workingDirectoryParameter.isSpecified())
             options.targetDirectory = workingDirectoryParameter.getValue();
         else
             options.targetDirectory = new File(System.getProperty("user.dir"));
 
         // TODO: add multiple input patterns support
-        if (inputPatternParameter.isParameterSpecified())
+        if (inputPatternParameter.isSpecified())
             options.inputPatterns.addAll(inputPatternParameter.getValue());
 
         return options;