Changeset 12636 in josm for trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

Timestamp:

2017-08-24T22:53:50+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.getLayerManager(). Replacement: gui.MainApplication.getLayerManager()

File:

• trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (modified) (3 diffs)

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

@@ -12 +12 @@
 import java.util.concurrent.Future;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -65 +64 @@
                         }
                         targetLayer.mergeFrom(sourceLayer);
-                        GuiHelper.runInEDTAndWait(() -> Main.getLayerManager().removeLayer(sourceLayer));
+                        GuiHelper.runInEDTAndWait(() -> getLayerManager().removeLayer(sourceLayer));
                         layerMerged = true;
                     }
                 }
                 if (layerMerged) {
-                    Main.getLayerManager().setActiveLayer(targetLayer);
+                    getLayerManager().setActiveLayer(targetLayer);
                     Logging.info(tr("{0} completed in {1}", actionName, Utils.getDurationString(System.currentTimeMillis() - start)));
                 }
@@ -131 +130 @@
      */
     protected Layer getSourceLayer() {
-        return Main.getLayerManager().getActiveLayer();
+        return getLayerManager().getActiveLayer();
     }