Changeset 14394 in josm for trunk/src/org


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

    r14384 r14394  
    268268
    269269    /**
     270     * All installed but not loaded plugins
     271     */
     272    static final Collection<PluginInformation> pluginListNotLoaded = new LinkedList<>();
     273
     274    /**
    270275     * All exceptions that occurred during plugin loading
    271276     */
     
    674679        }
    675680
     681        // Include plugins that have been processed but not been loaded (for javafx plugin)
     682        allPlugins.addAll(pluginListNotLoaded);
     683
    676684        return checkRequiredPluginsPreconditions(parent, allPlugins, plugin, true);
    677685    }
     
    683691     * @param parent The parent Component used to display error popup. If parent is
    684692     * null, the error popup is suppressed
    685      * @param plugins the collection of all loaded plugins
     693     * @param plugins the collection of all processed plugins
    686694     * @param plugin the plugin for which preconditions are checked
    687695     * @param local Determines if the local or up-to-date plugin dependencies are to be checked.
     
    815823                if (checkLoadPreconditions(parent, plugins, pi)) {
    816824                    toLoad.add(pi);
     825                } else {
     826                    pluginListNotLoaded.add(pi);
    817827                }
    818828            }
Note: See TracChangeset for help on using the changeset viewer.