Changeset 10982 in josm

Timestamp:

2016-09-09T02:34:36+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2386 - Mutable fields should not be "public static"

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/PreferenceTabbedPane.java (modified) (2 diffs)
• plugins/PluginHandler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -61 +61 @@
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.plugins.PluginInformation;
-import org.openstreetmap.josm.plugins.PluginProxy;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;
@@ -155 +154 @@
                 // check if plugin dependences can also be loaded
                 Collection<PluginInformation> allPlugins = new HashSet<>(toLoad);
-                for (PluginProxy proxy : PluginHandler.pluginList) {
-                    allPlugins.add(proxy.getPluginInformation());
-                }
+                allPlugins.addAll(PluginHandler.getPlugins());
                 boolean removed;
                 do {

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

@@ -38 +38 @@
 import java.util.concurrent.FutureTask;
 import java.util.jar.JarFile;
+import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
@@ -238 +239 @@
      * All installed and loaded plugins (resp. their main classes)
      */
-    public static final Collection<PluginProxy> pluginList = new LinkedList<>();
+    protected static final Collection<PluginProxy> pluginList = new LinkedList<>();
 
     /**
      * All exceptions that occured during plugin loading
-     * @since 8938
-     */
-    public static final Map<String, Exception> pluginLoadingExceptions = new HashMap<>();
+     */
+    protected static final Map<String, Exception> pluginLoadingExceptions = new HashMap<>();
 
     /**
@@ -266 +266 @@
 
     private static PluginDownloadTask pluginDownloadTask;
+
+    /**
+     * Returns the list of currently installed and loaded plugins.
+     * @return the list of currently installed and loaded plugins
+     * @since 10982
+     */
+    public static List<PluginInformation> getPlugins() {
+        return pluginList.stream().map(PluginProxy::getPluginInformation).collect(Collectors.toList());
+    }
 
     public static Collection<ClassLoader> getResourceClassLoaders() {