Changeset 12636 in josm for trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.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/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java

@@ -26 +26 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -60 +61 @@
             DataSet ds = OsmReader.parseDataSet(is, null);
             Layer layer = new OsmDataLayer(ds, null, null);
-            Main.getLayerManager().addLayer(layer);
+            MainApplication.getLayerManager().addLayer(layer);
             try {
                 new JoinAreasAction().join(ds.getWays());
             } finally {
                 // Ensure we clean the place before leaving, even if test fails.
-                Main.getLayerManager().removeLayer(layer);
+                MainApplication.getLayerManager().removeLayer(layer);
             }
         }
@@ -81 +82 @@
             assertEquals(10, ds.getWays().size());
             Layer layer = new OsmDataLayer(ds, null, null);
-            Main.getLayerManager().addLayer(layer);
+            MainApplication.getLayerManager().addLayer(layer);
             for (String ref : new String[]{"A", "B", "C", "D", "E"}) {
                 System.out.print("Joining ways " + ref);
@@ -112 +113 @@
 
         // set current edit layer
-        Main.getLayerManager().addLayer(new OsmDataLayer(dsToJoin, "join", null));
+        MainApplication.getLayerManager().addLayer(new OsmDataLayer(dsToJoin, "join", null));
 
         Collection<OsmPrimitive> testPrims = dsToJoin.getPrimitives(osm -> osm.get("test") != null);