Just cleanup suggested by IDEA

Author: idodeclare

opengrok-indexer/src/main/java/org/opengrok/indexer/history/HistoryGuru.java

@@ -68,6 +68,8 @@ public final class HistoryGuru {
      */
     private static final HistoryGuru INSTANCE = new HistoryGuru();
 
+    private final RuntimeEnvironment env;
+
     /**
      * The history cache to use.
      */
@@ -91,10 +93,10 @@ public final class HistoryGuru {
      * control system.
      */
     private HistoryGuru() {
-        HistoryCache cache = null;
-        RuntimeEnvironment env = RuntimeEnvironment.getInstance();
+        env = RuntimeEnvironment.getInstance();
         scanningDepth = env.getScanningDepth();
 
+        HistoryCache cache = null;
         if (env.useHistoryCache()) {
             cache = new FileHistoryCache();
 
@@ -244,7 +246,7 @@ public History getHistory(File file, boolean withFiles, boolean ui)
         final File dir = file.isDirectory() ? file : file.getParentFile();
         final Repository repo = getRepository(dir);
 
-        RemoteSCM rscm = RuntimeEnvironment.getInstance().getRemoteScmSupported();
+        RemoteSCM rscm = env.getRemoteScmSupported();
         boolean doRemote = (ui && (rscm == RemoteSCM.UIONLY))
                 || (rscm == RemoteSCM.ON)
                 || (ui || ((rscm == RemoteSCM.DIRBASED) && (repo != null) && repo.hasHistoryForDirectories()));
@@ -318,9 +320,9 @@ public boolean hasHistory(File file) {
 
         // This should return true for Annotate view.
         return repo.isWorking() && repo.fileHasHistory(file)
-                && ((RuntimeEnvironment.getInstance().getRemoteScmSupported() == RemoteSCM.ON)
-                || (RuntimeEnvironment.getInstance().getRemoteScmSupported() == RemoteSCM.UIONLY)
-                || (RuntimeEnvironment.getInstance().getRemoteScmSupported() == RemoteSCM.DIRBASED)
+                && ((env.getRemoteScmSupported() == RemoteSCM.ON)
+                || (env.getRemoteScmSupported() == RemoteSCM.UIONLY)
+                || (env.getRemoteScmSupported() == RemoteSCM.DIRBASED)
                 || !repo.isRemote());
     }
 
@@ -541,8 +543,7 @@ private void createCache(Repository repository, String sinceRevision) {
 
     private void createCacheReal(Collection<Repository> repositories) {
         Statistics elapsed = new Statistics();
-        ExecutorService executor = RuntimeEnvironment.getInstance().
-                getIndexerParallelizer().getHistoryExecutor();
+        ExecutorService executor = env.getIndexerParallelizer().getHistoryExecutor();
         // Since we know each repository object from the repositories
         // collection is unique, we can abuse HashMap to create a list of
         // repository,revision tuples with repository as key (as the revision
@@ -704,7 +705,7 @@ public void createCache() {
      */
     private List<Repository> getReposFromString(Collection<String> repositories) {
         ArrayList<Repository> repos = new ArrayList<>();
-        File srcRoot = RuntimeEnvironment.getInstance().getSourceRootFile();
+        File srcRoot = env.getSourceRootFile();
 
         for (String file : repositories) {
             File f = new File(srcRoot, file);

opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java

@@ -180,16 +180,6 @@ public IndexDatabase(Project project) throws IOException {
         CHECK_FIELDS.add(QueryBuilder.TYPE);
     }
 
-    /**
-     * Update the index database for all of the projects. Print progress to
-     * standard out.
-     *
-     * @throws IOException if an error occurs
-     */
-    public static void updateAll() throws IOException {
-        updateAll(null);
-    }
-
     /**
      * Update the index database for all of the projects.
      *
@@ -1248,16 +1238,6 @@ private void indexParallel(String dir, IndexDownArgs args) {
         }
     }
 
-    /**
-     * Interrupt the index generation (and the index generation will stop as
-     * soon as possible).
-     */
-    public void interrupt() {
-        synchronized (lock) {
-            interrupted = true;
-        }
-    }
-
     private boolean isInterrupted() {
         synchronized (lock) {
             return interrupted;
@@ -1274,26 +1254,6 @@ public void addIndexChangedListener(IndexChangedListener listener) {
         listeners.add(listener);
     }
 
-    /**
-     * Remove an object from the lists of objects to receive events when
-     * modifications is done to the index database.
-     *
-     * @param listener the object to remove
-     */
-    public void removeIndexChangedListener(IndexChangedListener listener) {
-        listeners.remove(listener);
-    }
-
-    /**
-     * Get all files in all of the index databases.
-     *
-     * @throws IOException if an error occurs
-     * @return set of files
-     */
-    public static Set<String> getAllFiles() throws IOException {
-        return getAllFiles(null);
-    }
-
     /**
      * Get all files in some of the index databases.
      *
@@ -1400,10 +1360,6 @@ public int getNumFiles() throws IOException {
         return numDocs;
     }
 
-    static void listFrequentTokens() throws IOException {
-        listFrequentTokens(null);
-    }
-
     static void listFrequentTokens(List<String> subFiles) throws IOException {
         final int limit = 4;
 
@@ -1796,12 +1752,12 @@ private boolean xrefExistsFor(String path) {
         return true;
     }
 
-    private class IndexDownArgs {
+    private static class IndexDownArgs {
         int cur_count;
         final List<IndexFileWork> works = new ArrayList<>();
     }
 
-    private class IndexFileWork {
+    private static class IndexFileWork {
         final File file;
         final String path;
         Exception exception;