Changeset 8020 in josm for trunk/src

Timestamp:

2015-02-09T13:57:33+01:00 (10 years ago)

Author:

bastiK

Message:

see #11090 - make sure modifications to the current MapFrame are done when loading plugin at runtime

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• plugins/PluginHandler.java (modified) (1 diff)

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

@@ -1566 +1566 @@
      * Registers a new {@code MapFrameListener} that will be notified of MapFrame changes
      * @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) {
+        boolean changed = listener != null ? mapFrameListeners.add(listener) : false;
+        if (fireWhenMapViewPresent && changed && map != null) {
+            listener.mapFrameInitialized(null, map);
+        }
+        return changed;
+    }
+
+    /**
+     * Registers a new {@code MapFrameListener} that will be notified of MapFrame changes
+     * @param listener The MapFrameListener
      * @return {@code true} if the listeners collection changed as a result of the call
      * @since 5957
      */
     public static boolean addMapFrameListener(MapFrameListener listener) {
-        return listener != null ? mapFrameListeners.add(listener) : false;
+        return addMapFrameListener(listener, false);
     }
 

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

@@ -614 +614 @@
                 PluginProxy pluginProxy = plugin.load(klass);
                 pluginList.add(pluginProxy);
-                Main.addMapFrameListener(pluginProxy);
+                Main.addMapFrameListener(pluginProxy, true);
             }
             msg = null;