Changeset 10975 in josm for trunk/src/org

Timestamp:

2016-09-08T00:59:51+02:00 (8 years ago)

Author:

Don-vip

Message:

remove deprecated stuff - gsoc-core

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• gui/MainPanel.java (modified) (1 diff)
• gui/MapView.java (modified) (2 diffs)

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

@@ -166 +166 @@
 
     /**
-     * The MapFrame. Use {@link Main#setMapFrame} to set or clear it.
+     * The MapFrame.
      * <p>
      * There should be no need to access this to access any map data. Use {@link #layerManager} instead.

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

@@ -76 +76 @@
         // Notify map frame listeners, mostly plugins.
         for (MapFrameListener listener : mapFrameListeners) {
-            MapView.fireDeprecatedListenerOnAdd = true;
             listener.mapFrameInitialized(old, map);
-            MapView.fireDeprecatedListenerOnAdd = false;
         }
         if (map == null && Main.currentProgressMonitor != null) {

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

@@ -56 +56 @@
 import org.openstreetmap.josm.gui.layer.LayerManager;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
-import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
@@ -186 +185 @@
         }
     }
-
-    /**
-     * Temporary. To be removed as soon as the {@link LayerChangeListener}s are removed.
-     * <p>
-     * Some plugins add their listeners in {@link Main#setMapFrame(MapFrame)}. This method is now called just after the first layer was added to
-     * the layer manager. So that listener would not receive the addition of the first layer. As long as this field is set, we fake an add call
-     * to that listener when it is added to immitate the old behaviour. You should not access it from anywhere else.
-     */
-    public static boolean fireDeprecatedListenerOnAdd;
 
     public boolean viewportFollowing;