Changeset 14394 in josm for trunk/src/org

Timestamp:

2018-11-01T13:39:32+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16912 - don't issue a "missing plugin" warning for JavaFX on Java 8

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -268 +268 @@
 
     /**
+     * All installed but not loaded plugins
+     */
+    static final Collection<PluginInformation> pluginListNotLoaded = new LinkedList<>();
+
+    /**
      * All exceptions that occurred during plugin loading
      */
@@ -674 +679 @@
         }
 
+        // Include plugins that have been processed but not been loaded (for javafx plugin)
+        allPlugins.addAll(pluginListNotLoaded);
+
         return checkRequiredPluginsPreconditions(parent, allPlugins, plugin, true);
     }
@@ -683 +691 @@
      * @param parent The parent Component used to display error popup. If parent is
      * null, the error popup is suppressed
-     * @param plugins the collection of all loaded plugins
+     * @param plugins the collection of all processed plugins
      * @param plugin the plugin for which preconditions are checked
      * @param local Determines if the local or up-to-date plugin dependencies are to be checked.
@@ -815 +823 @@
                 if (checkLoadPreconditions(parent, plugins, pi)) {
                     toLoad.add(pi);
+                } else {
+                    pluginListNotLoaded.add(pi);
                 }
             }