X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Frenamer%2FMain.java;h=2359a69a77362ed6a04ff2530b8bffd7c44bc072;hb=ed57ca76172f5984eee2d08de841fa7b7bb21b29;hp=6495e0f3bd9538e6852f91c3ed694fb3f06dd57a;hpb=1b742640af99284aae1cd10c259254137316ba7c;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/renamer/Main.java b/src/main/java/eu/svjatoslav/meviz/renamer/Main.java
index 6495e0f..2359a69 100755
--- a/src/main/java/eu/svjatoslav/meviz/renamer/Main.java
+++ b/src/main/java/eu/svjatoslav/meviz/renamer/Main.java
@@ -1,15 +1,15 @@
 /*
  * 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.renamer;
 
-import eu.svjatoslav.commons.string.WildCardMatcher;
+import eu.svjatoslav.commons.string.GlobMatcher;
 import eu.svjatoslav.meviz.Module;
 
 import java.io.File;
@@ -17,16 +17,16 @@ import java.util.Arrays;
 
 public class Main implements Module {
 
-    public int processedFilesCount;
-    CommandlineHandler commandlineHandler = new CommandlineHandler();
-    RenamingOptions options;
+    private final CommandlineHandler commandlineHandler = new CommandlineHandler();
+    private int processedFilesCount;
+    private RenamingOptions options;
 
     /**
      * Verify that program has enough information to start executing
      *
      * @return true if all is ok, false if errors were found
      */
-    public boolean checkThatThereIsEnoughDataToProceed() {
+    private boolean checkThatThereIsEnoughDataToProceed() {
         if (options.inputPatterns.size() == 0) {
             System.out.println("Error: no input patterns given.");
             return false;
@@ -40,11 +40,11 @@ public class Main implements Module {
         return true;
     }
 
-    public boolean fileMatchesInputPattern(final File file) {
+    private boolean fileMatchesInputPattern(final File file) {
         final String fileName = file.getName();
 
         for (final String inputPattern : options.inputPatterns)
-            if (WildCardMatcher.match(fileName, inputPattern))
+            if (GlobMatcher.match(fileName, inputPattern))
                 return true;
 
         return false;
@@ -119,7 +119,7 @@ public class Main implements Module {
         }
     }
 
-    public void processFileOrDirectory(final File file) {
+    private void processFileOrDirectory(final File file) {
         if (!file.exists()) {
             System.out.println("Error: file \"" + file.getAbsolutePath()
                     + "\" does not exist.");
@@ -134,7 +134,7 @@ public class Main implements Module {
 
     }
 
-    public void rename() {
+    private void rename() {
         processFileOrDirectory(options.targetDirectory);
     }