Changeset 33290 in osm for applications/editors

Timestamp:

2017-05-06T21:46:49+02:00 (8 years ago)

Author:

stoecker

Message:

fix layer handling of routes plugin, drop unused classes

Location:

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes

Files:

• RelationEditMode.java (deleted)
• RemoveRelationMemberCommand.java (deleted)
• RouteLayer.java (modified) (1 diff)
• RoutesPlugin.java (modified) (4 diffs)

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java

@@ -154 +154 @@
     }
 
+    @Override
+    public synchronized void destroy() {
+        /* layer is reused, don't destroy it at all */
+    }
 }

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RoutesPlugin.java

@@ -29 +29 @@
 
     private final List<RouteLayer> routeLayers = new ArrayList<>();
-    private boolean isShown;
 
     public RoutesPlugin(PluginInformation info) {
@@ -70 +69 @@
             e.printStackTrace();
         }
-
-        //new RelationEditMode(Main.map);
-        //Main.main.addLayer(new RouteLayer("Hiking trails"));
     }
 
@@ -79 +75 @@
     }
 
-    private void checkLayers() {
-        if (Main.map != null && Main.map.mapView != null) {
-            for (Layer layer : Main.getLayerManager().getLayers()) {
-                if (layer instanceof OsmDataLayer) {
-                    if (!isShown) {
-                        isShown = true;
-                        SwingUtilities.invokeLater(() -> {
-                            for (RouteLayer routeLayer : routeLayers) {
-                                Main.getLayerManager().addLayer(routeLayer);
-                            }
-                        });
-                    }
-                    return;
+    @Override
+    public void layerAdded(LayerAddEvent e) {
+        Layer layer = e.getAddedLayer();
+        if (layer instanceof OsmDataLayer) {
+            for (RouteLayer routeLayer : routeLayers) {
+                if (!Main.getLayerManager().containsLayer(routeLayer)) {
+                    SwingUtilities.invokeLater(() -> {
+                        Main.getLayerManager().addLayer(routeLayer);
+                    });
                 }
-            }
-            if (isShown) {
-                isShown = false;
-                SwingUtilities.invokeLater(() -> {
-                    for (RouteLayer routeLayer : routeLayers) {
-                        if (Main.getLayerManager().containsLayer(routeLayer)) {
-                            Main.getLayerManager().removeLayer(routeLayer);
-                        }
-                    }
-                });
             }
         }
@@ -108 +90 @@
 
     @Override
-    public void layerAdded(LayerAddEvent e) {
-        checkLayers();
-    }
-
-    @Override
     public void layerRemoving(LayerRemoveEvent e) {
-        checkLayers();
+        for (Layer layer : e.getSource().getLayers()) {
+            if (layer instanceof OsmDataLayer)  {
+                return; /* at least one OSM layer left, do nothing */
+            }
+        }
+        if(!e.isLastLayer()) {
+            SwingUtilities.invokeLater(() -> {
+                for (RouteLayer routeLayer : routeLayers) {
+                    if (Main.getLayerManager().containsLayer(routeLayer)) {
+                        Main.getLayerManager().removeLayer(routeLayer);
+                    }
+                }
+            });
+        }
     }