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

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/actions

Files:

• DeleteLayerAction.java (modified) (1 diff)
• MapRectifierWMSmenuAction.java (modified) (1 diff)
• MergeLayerAction.java (modified) (1 diff)
• NewAction.java (modified) (1 diff)
• downloadtasks/DownloadNotesTask.java (modified) (1 diff)
• downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• downloadtasks/DownloadTaskList.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/DeleteLayerAction.java

@@ -37 +37 @@
             return;
         }
-        Main.main.removeLayer(activeLayer);
+        Main.getLayerManager().removeLayer(activeLayer);
     }
 

trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java

@@ -234 +234 @@
     private static void addWMSLayer(String title, String url) {
         WMSLayer layer = new WMSLayer(new ImageryInfo(title, url));
-        Main.main.addLayer(layer);
+        Main.getLayerManager().addLayer(layer);
     }
 

trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

@@ -57 +57 @@
                             @Override
                             public void run() {
-                                Main.main.removeLayer(sourceLayer);
+                                Main.getLayerManager().removeLayer(sourceLayer);
                             }
                         });

trunk/src/org/openstreetmap/josm/actions/NewAction.java

@@ -30 +30 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        Main.main.addLayer(new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null));
+        Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null));
     }
 }

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java

@@ -117 +117 @@
                 noteLayers.get(0).getNoteData().addNotes(notesData);
             } else {
-                Main.main.addLayer(new NoteLayer(notesData, tr("Notes")));
+                Main.getLayerManager().addLayer(new NoteLayer(notesData, tr("Notes")));
             }
         }

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -261 +261 @@
                 final OsmDataLayer layer = createNewLayer(newLayerName);
                 if (Main.main != null)
-                    Main.main.addLayer(layer);
+                    Main.getLayerManager().addLayer(layer);
                 return layer;
             }

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java

@@ -72 +72 @@
         if (newLayer) {
             Layer l = new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null);
-            Main.main.addLayer(l);
+            Main.getLayerManager().addLayer(l);
             Main.getLayerManager().setActiveLayer(l);
         }