Changeset 10364 in josm for trunk/test/unit/org/openstreetmap/josm/command/conflict

Timestamp:

2016-06-12T20:46:23+02:00 (8 years ago)

Author:

stoecker

Message:

gsoc-core - patch by Michael Zangl - see #12953 - remove deprecation usage

File:

• trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java

@@ -51 +51 @@
     @Test
     public void testExecuteUndoCommand() {
-        OsmDataLayer layer = Main.map.mapView.getEditLayer();
+        OsmDataLayer layer = Main.getLayerManager().getEditLayer();
         Conflict<Node> conflict = new Conflict<>(new Node(), new Node());
         ConflictAddCommand cmd = new ConflictAddCommand(layer, conflict);
@@ -67 +67 @@
     @Test
     public void testGetDescriptionIcon() {
-        OsmDataLayer layer = Main.map.mapView.getEditLayer();
+        OsmDataLayer layer = Main.getLayerManager().getEditLayer();
         Conflict<Node> conflict = new Conflict<>(new Node(), new Node());
         assertNotNull(new ConflictAddCommand(layer, conflict).getDescriptionIcon());