Changeset 11904 in josm for trunk

Timestamp:

2017-04-14T21:06:41+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S2301 - Public methods should not contain selector arguments

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• plugins/PluginHandler.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -1302 +1302 @@
 
     /**
-     * Registers a new {@code MapFrameListener} that will be notified of MapFrame changes
+     * Registers a new {@code MapFrameListener} that will be notified of MapFrame changes.
+     * <p>
+     * It will fire an initial mapFrameInitialized event when the MapFrame is present.
+     * Otherwise will only fire when the MapFrame is created or destroyed.
      * @param listener The MapFrameListener
-     * @param fireWhenMapViewPresent If true, will fire an initial mapFrameInitialized event
-     * when the MapFrame is present. Otherwise will only fire when the MapFrame is created
-     * or destroyed.
      * @return {@code true} if the listeners collection changed as a result of the call
-     */
-    public static boolean addMapFrameListener(MapFrameListener listener, boolean fireWhenMapViewPresent) {
-        if (fireWhenMapViewPresent) {
-            return mainPanel.addAndFireMapFrameListener(listener);
-        } else {
-            return mainPanel.addMapFrameListener(listener);
-        }
+     * @see #addMapFrameListener
+     * @since 11904
+     */
+    public static boolean addAndFireMapFrameListener(MapFrameListener listener) {
+        return mainPanel.addAndFireMapFrameListener(listener);
     }
 
@@ -1321 +1319 @@
      * @param listener The MapFrameListener
      * @return {@code true} if the listeners collection changed as a result of the call
+     * @see #addAndFireMapFrameListener
      * @since 5957
      */

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

@@ -281 +281 @@
     }
 
+    /**
+     * Returns all ClassLoaders whose resource should be searched.
+     * @return all ClassLoaders whose resource should be searched
+     */
     public static Collection<ClassLoader> getResourceClassLoaders() {
         return Collections.unmodifiableCollection(sources);
@@ -716 +720 @@
                 PluginProxy pluginProxy = plugin.load(klass);
                 pluginList.add(pluginProxy);
-                Main.addMapFrameListener(pluginProxy, true);
+                Main.addAndFireMapFrameListener(pluginProxy);
             }
             msg = null;