Changeset 10413 in josm for trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java

Timestamp:

2016-06-18T00:06:41+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12983 - replace calls to Main.main.get[Active|Edit]Layer() by Main.getLayerManager().get[Active|Edit]Layer() - gsoc-core

File:

• trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) (2 diffs)

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

@@ -44 +44 @@
         try {
             DataSet ds = reader.parseOsm(NullProgressMonitor.INSTANCE);
-            Main.main.getEditLayer().mergeFrom(ds);
+            Main.getLayerManager().getEditLayer().mergeFrom(ds);
         } catch (OsmTransferException e) {
             ExceptionDialogUtil.explainException(e);
@@ -58 +58 @@
      */
     public static void updatePrimitives(final Collection<OsmPrimitive> selection) {
-        UpdatePrimitivesTask task = new UpdatePrimitivesTask(Main.main.getEditLayer(), selection);
+        UpdatePrimitivesTask task = new UpdatePrimitivesTask(Main.getLayerManager().getEditLayer(), selection);
         Main.worker.submit(task);
     }