Code refactoring

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

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java
index d45bc84..93a9d7b 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/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.htmlindexer;
 
@@ -19,29 +19,26 @@ import java.io.File;
 
 public class CommandlineHandler {
 
-    Parser parser = new Parser();
-
-    StringParameter galleryNameParameter = parser.add(
+    final Parser parser = new Parser();
+    final NullParameter removeIndex = parser.add(
+            new NullParameter("Remove generated index")).addAliases("-r",
+            "--remove");
+    private final StringParameter galleryNameParameter = parser.add(
             new StringParameter("Gallery title. (default is: "
                     + Constants.DEFAULT_GALLERY_TITLE + ").")).addAliases("-t",
             "--gallery-title");
-
-    DirectoryParameter workingDirectoryParameter = parser
+    private final DirectoryParameter workingDirectoryParameter = parser
             .add(new DirectoryParameter("Working directory."))
             .addAliases("-w", "--working-directory").mustExist();
 
-    NullParameter removeIndex = parser.add(
-            new NullParameter("Remove generated index")).addAliases("-r",
-            "--remove");
-
     public String getGalleryTitle() {
-        if (galleryNameParameter.isParameterSpecified())
+        if (galleryNameParameter.isSpecified())
             return galleryNameParameter.getValue();
         return Constants.DEFAULT_GALLERY_TITLE;
     }
 
     public File getWorkingDirectory() {
-        if (workingDirectoryParameter.isParameterSpecified())
+        if (workingDirectoryParameter.isSpecified())
             return workingDirectoryParameter.getValue();
         else
             return new File(System.getProperty("user.dir"));