Changeset 10391 in josm for trunk

Timestamp:

2016-06-15T20:30:09+02:00 (8 years ago)

Author:

wiktorn

Message:

Fixes for LayerManager.

• LayerManager: invoke hookupMapView at the end of addLayer so layer's initialization code depending on presence of MapView will be executed
• Main: moved creation of mapFrame from addLayer(...) to anonymous LayerManager listener, so hookupMapView can depend on the fact, that mapFrame exists
• AbstractTileSourceLayer: forced generation of the event for this layer, so MouseAdapter listeners will be properly registered

Closes: #12964, #12965

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (3 diffs)
• gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)
• gui/layer/LayerManager.java (modified) (1 diff)

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

@@ -88 +88 @@
 import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
+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;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -563 +567 @@
     public Main() {
         main = this;
+        getLayerManager().addLayerChangeListener(new LayerChangeListener() {
+            @Override
+            public void layerAdded(LayerAddEvent e) {
+                if (map == null) {
+                    Layer layer = e.getAddedLayer();
+                    ProjectionBounds viewProjectionBounds = layer.getViewProjectionBounds();
+                    Main.main.createMapFrame(layer, viewProjectionBounds == null ? null : new ViewportData(viewProjectionBounds));
+                }
+            }
+
+            @Override
+            public void layerRemoving(LayerRemoveEvent e) {
+                // empty
+            }
+
+            @Override
+            public void layerOrderChanged(LayerOrderChangeEvent e) {
+                //empty
+            }
+
+        });
     }
 
@@ -794 +819 @@
      */
     public final synchronized void addLayer(final Layer layer, ViewportData viewport) {
-        boolean noMap = map == null;
-        if (noMap) {
-            createMapFrame(layer, viewport);
-        }
-        layer.hookUpMapView();
         getLayerManager().addLayer(layer);
-        if (noMap) {
+        if (map != null) {
             Main.map.setVisible(true);
         } else if (viewport != null) {

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -651 +651 @@
                 }
             }
-        });
+        }, true);
         // FIXME: why do we need this? Without this, if you add a WMS layer and do not move the mouse, sometimes, tiles do not
         // start loading.

trunk/src/org/openstreetmap/josm/gui/layer/LayerManager.java

@@ -149 +149 @@
         insertLayerAt(layer, position);
         fireLayerAdded(layer);
+        layer.hookUpMapView(); // needs to be after fireLayerAdded
     }