Changeset 10413 in josm for trunk/src/org/openstreetmap/josm/data/validation

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

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• Test.java (modified) (1 diff)
• tests/DuplicateNode.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -333 +333 @@
         }
         if (!primitivesToDelete.isEmpty()) {
-            return DeleteCommand.delete(Main.main.getEditLayer(), primitivesToDelete);
+            return DeleteCommand.delete(Main.getLayerManager().getEditLayer(), primitivesToDelete);
         } else {
             return null;

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

@@ -409 +409 @@
 
             if (DeleteCommand.checkAndConfirmOutlyingDelete(nodes, Collections.singleton(target)))
-                return MergeNodesAction.mergeNodes(Main.main.getEditLayer(), nodes, target);
+                return MergeNodesAction.mergeNodes(Main.getLayerManager().getEditLayer(), nodes, target);
         }