allow implementor to skip reloading

Author: tulinkry

opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java

@@ -337,6 +337,9 @@ private String getClassName(JarEntry f) {
 
     /**
      * Perform custom operations before the plugins are loaded.
+     * <p>
+     * If this function returns {@code null}, the reloading is completely skipped and {@link #afterReload(Object)}
+     * is never called.
      *
      * @return the implementor can generate custom data which will be later passed to {@link #afterReload(Object)}
      */
@@ -347,6 +350,9 @@ private String getClassName(JarEntry f) {
      * <p>
      * When this is invoked, all plugins has been loaded into the memory and for each available plugin
      * the {@link #classLoaded(Object, Object)} was invoked.
+     * <p>
+     * When {@link #beforeReload()} returns {@code null}, the reloading is skipped, and this method is
+     * never called.
      *
      * @param data a custom data created with {@link #beforeReload()}
      */
@@ -363,6 +369,12 @@ public final void reload() {
         // notify the implementing class that the reload is about to begin
         final DataType localData = beforeReload();
 
+        if (localData == null) {
+            // the implementor does not want to reload the plugins
+            LOGGER.log(Level.WARNING, "Loading plugins from {0} as instructed by the implementer's class", pluginDirectory);
+            return;
+        }
+
         try {
             if (pluginDirectory == null || !pluginDirectory.isDirectory() || !pluginDirectory.canRead()) {
                 LOGGER.log(Level.WARNING, "Plugin directory not found or not readable: {0}.", pluginDirectory);

opengrok-web/src/main/webapp/list.jsp

@@ -247,13 +247,8 @@ Click <a href="<%= rawPath %>">download <%= basename %></a><%
             }
         } else {
             // requesting a previous revision or needed to generate xref on the fly (economy mode).
-<<<<<<< HEAD
-            AnalyzerFactory a = AnalyzerGuru.find(basename);
-            Genre g = AnalyzerGuru.getGenre(a);
-=======
             AnalyzerFactory a = cfg.getEnv().getAnalyzerGuru().find(basename);
             AbstractAnalyzer.Genre g = cfg.getEnv().getAnalyzerGuru().getGenre(a);
->>>>>>> Introducing an plugin framework for analyzers
             String error = null;
             if (g == Genre.PLAIN || g == Genre.HTML || g == null) {
                 InputStream in = null;