Changeset 16974 in josm for trunk/src/org

Timestamp:

2020-08-29T21:28:44+02:00 (4 years ago)

Author:

simon04

Message:

see #19027, see #19290 - PluginHandler.loadVeryEarlyPlugins for plugins providing a LookAndFeel

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/MainApplication.java (modified) (1 diff)
• plugins/PluginHandler.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -871 +871 @@
         setupCallbacks();
 
+        if (!skipLoadingPlugins) {
+            PluginHandler.loadVeryEarlyPlugins();
+        }
         // Configure Look and feel before showing SplashScreen (#19290)
         setupUIManager();

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

@@ -902 +902 @@
 
     /**
-     * Loads plugins from <code>plugins</code> which have the flag {@link PluginInformation#early} set to true.
+     * Loads plugins from <code>plugins</code> which have the flag {@link PluginInformation#early} set to true
+     * <i>and</i> a negative {@link PluginInformation#stage} value.
+     *
+     * This is meant for plugins that provide additional {@link javax.swing.LookAndFeel}.
+     */
+    public static void loadVeryEarlyPlugins() {
+        List<PluginInformation> veryEarlyPlugins = PluginHandler.buildListOfPluginsToLoad(null, null)
+                .stream()
+                .filter(pi -> pi.early && pi.stage < 0)
+                .collect(Collectors.toList());
+        loadPlugins(null, veryEarlyPlugins, null);
+    }
+
+    /**
+     * Loads plugins from <code>plugins</code> which have the flag {@link PluginInformation#early} set to true
+     * <i>and</i> a non-negative {@link PluginInformation#stage} value.
      *
      * @param parent The parent component to be used for the displayed dialog
@@ -909 +924 @@
      */
     public static void loadEarlyPlugins(Component parent, Collection<PluginInformation> plugins, ProgressMonitor monitor) {
-        List<PluginInformation> earlyPlugins = new ArrayList<>(plugins.size());
-        for (PluginInformation pi: plugins) {
-            if (pi.early) {
-                earlyPlugins.add(pi);
-            }
-        }
+        List<PluginInformation> earlyPlugins = plugins.stream()
+                .filter(pi -> pi.early && pi.stage >= 0)
+                .collect(Collectors.toList());
         loadPlugins(parent, earlyPlugins, monitor);
     }
@@ -926 +938 @@
      */
     public static void loadLatePlugins(Component parent, Collection<PluginInformation> plugins, ProgressMonitor monitor) {
-        List<PluginInformation> latePlugins = new ArrayList<>(plugins.size());
-        for (PluginInformation pi: plugins) {
-            if (!pi.early) {
-                latePlugins.add(pi);
-            }
-        }
+        List<PluginInformation> latePlugins = plugins.stream()
+                .filter(pi -> !pi.early)
+                .collect(Collectors.toList());
         loadPlugins(parent, latePlugins, monitor);
     }
@@ -1023 +1032 @@
                 }
             }
-            if (!plugins.isEmpty()) {
+            if (!plugins.isEmpty() && parent != null) {
                 alertMissingPluginInformation(parent, plugins);
             }