Changeset 10436 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-06-20T02:47:43+02:00 (9 years ago)

Author:

Don-vip

Message:

see #13001 - replace calls to Main.main.[add|remove]Layer by Main.getLayerManager().[add|remove]Layer

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/layer/DeleteLayerAction.java (modified) (1 diff)
• dialogs/layer/DuplicateAction.java (modified) (1 diff)
• io/DownloadPrimitivesWithReferrersTask.java (modified) (1 diff)
• layer/OsmDataLayer.java (modified) (1 diff)
• layer/ValidatorLayer.java (modified) (1 diff)
• layer/geoimage/GeoImageLayer.java (modified) (1 diff)
• layer/gpx/ConvertToDataLayerAction.java (modified) (1 diff)
• layer/gpx/ImportAudioAction.java (modified) (1 diff)
• layer/gpx/MarkersFromNamedPointsAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java

@@ -46 +46 @@
             return;
         for (Layer l: selectedLayers) {
-            Main.main.removeLayer(l);
+            Main.getLayerManager().removeLayer(l);
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java

@@ -70 +70 @@
                 i++;
             }
-            Main.main.addLayer(new OsmDataLayer(new DataSet(oldLayer.data), newName, null));
+            Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(oldLayer.data), newName, null));
         }
     }

trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java

@@ -131 +131 @@
         OsmDataLayer layer = Main.getLayerManager().getEditLayer();
         if (layer == null || this.newLayer)
-            Main.main.addLayer(tmpLayer);
+            Main.getLayerManager().addLayer(tmpLayer);
         else
             layer.mergeFrom(tmpLayer);

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

@@ -821 +821 @@
                 gpxLayer.setAssociatedFile(new File(getAssociatedFile().getParentFile(), filename));
             }
-            Main.main.addLayer(gpxLayer);
+            Main.getLayerManager().addLayer(gpxLayer);
             if (Main.pref.getBoolean("marker.makeautomarkers", true) && !gpxData.waypoints.isEmpty()) {
-                Main.main.addLayer(new MarkerLayer(gpxData, tr("Converted from: {0}", getName()), null, gpxLayer));
-            }
-            Main.main.removeLayer(OsmDataLayer.this);
+                Main.getLayerManager().addLayer(new MarkerLayer(gpxData, tr("Converted from: {0}", getName()), null, gpxLayer));
+            }
+            Main.getLayerManager().removeLayer(OsmDataLayer.this);
         }
     }

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

@@ -164 +164 @@
     public void layerRemoving(LayerRemoveEvent e) {
         if (e.getRemovedLayer() instanceof OsmDataLayer && Main.isDisplayingMapView() && !Main.main.hasEditLayer()) {
-            Main.main.removeLayer(this);
+            Main.getLayerManager().removeLayer(this);
         } else if (e.getRemovedLayer() == this) {
             Main.getLayerManager().removeLayerChangeListener(this);

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -283 +283 @@
             }
             if (layer != null) {
-                Main.main.addLayer(layer);
+                Main.getLayerManager().addLayer(layer);
 
                 if (!canceled && layer.data != null && !layer.data.isEmpty()) {

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java

@@ -135 +135 @@
         }
         layer.setUploadDiscouraged(true);
-        Main.main.addLayer(layer);
-        Main.main.removeLayer(this.layer);
+        Main.getLayerManager().addLayer(layer);
+        Main.getLayerManager().removeLayer(this.layer);
     }
 }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java

@@ -115 +115 @@
                 importAudio(file, ml, firstStartTime, m);
             }
-            Main.main.addLayer(ml);
+            Main.getLayerManager().addLayer(ml);
             Main.map.repaint();
         }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java

@@ -41 +41 @@
         MarkerLayer ml = new MarkerLayer(namedTrackPoints, tr("Named Trackpoints from {0}", layer.getName()), layer.getAssociatedFile(), layer);
         if (!ml.data.isEmpty()) {
-            Main.main.addLayer(ml);
+            Main.getLayerManager().addLayer(ml);
         }
     }