Changeset 29525 in osm for applications/editors/josm/plugins

Timestamp:

2013-04-21T15:15:09+02:00 (12 years ago)

Author:

donvip

Message:

[josm_plugins] see #josm8582 - Use Main.removeLayer() everywhere

Location:

applications/editors/josm/plugins

Files:

• cadastre-fr/src/cadastre_fr/CadastreInterface.java (modified) (1 diff)
• cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java (modified) (2 diffs)
• graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java (modified) (1 diff)
• junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java (modified) (1 diff)
• mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java (modified) (1 diff)
• routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java (modified) (1 diff)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java

@@ -556 +556 @@
                     System.out.println("Try to grab into a new layer when "+wmsLayer.getName()+" is already opened.");
                     // remove the duplicated layer
-                    Main.map.mapView.removeLayer(wmsLayer);
+                    Main.main.removeLayer(wmsLayer);
                     throw new DuplicateLayerException();
                 }

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java

@@ -66 +66 @@
         actionCompleted();
         if (wmsLayer != null) {
-            Main.map.mapView.removeLayer(wmsLayer);
+            Main.main.removeLayer(wmsLayer);
             wmsLayer = null;
         }
@@ -278 +278 @@
         if (selectedValue == 0) { // "Cancel"
             // remove layer
-            Main.map.mapView.removeLayer(wmsLayer);
+            Main.main.removeLayer(wmsLayer);
             wmsLayer = null;
             Main.map.mapView.removeMouseListener(this);

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java

@@ -252 +252 @@
         } else if (oldLayer == Main.map.mapView.getEditLayer()) { //data layer removed
             if (graphViewLayer != null) {
-                Main.map.mapView.removeLayer(graphViewLayer);
+                Main.main.removeLayer(graphViewLayer);
                 graphViewLayer = null;
             }

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java

@@ -55 +55 @@
         protected void finish() {
                 if (canceled) {
-                        Main.map.mapView.removeLayer(plugin.getChannelDigraphLayer());
+                        Main.main.removeLayer(plugin.getChannelDigraphLayer());
                         return;
                 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java

@@ -452 +452 @@
                     MapdustPluginState.ONLINE.getValue());
             NavigatableComponent.removeZoomChangeListener(this);
-            Main.map.mapView.removeLayer(layer);
+            Main.main.removeLayer(layer);
             if (mapdustGUI != null) {
                 Main.map.remove(mapdustGUI);

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java

@@ -270 +270 @@
                                         try {
                                                 // Remove layer
-                                                Main.map.mapView.removeLayer(layersArray[i]);
+                                                Main.main.removeLayer(layersArray[i]);
                                         } catch (IllegalArgumentException e) {
                                         }