Changeset 12636 in josm for trunk/test/unit/org/openstreetmap/josm/actions/mapmode

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/test/unit/org/openstreetmap/josm/actions/mapmode

Files:

• AddNoteActionTest.java (modified) (3 diffs)
• DeleteActionTest.java (modified) (3 diffs)
• DrawActionTest.java (modified) (2 diffs)
• ExtrudeActionTest.java (modified) (3 diffs)
• ImproveWayAccuracyActionTest.java (modified) (3 diffs)
• MapViewMock.java (modified) (2 diffs)
• ParallelWayActionTest.java (modified) (3 diffs)
• PlayHeadDragModeTest.java (modified) (3 diffs)
• SelectActionTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/AddNoteActionTest.java

@@ -9 +9 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.notes.Note;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -39 +38 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.getLayerManager().addLayer(layer);
+            MainApplication.getLayerManager().addLayer(layer);
             AddNoteAction mapMode = new AddNoteAction(new NoteData(Collections.<Note>emptyList()));
             MapFrame map = MainApplication.getMap();
@@ -47 +46 @@
             assertTrue(map.selectMapMode(oldMapMode));
         } finally {
-            Main.getLayerManager().removeLayer(layer);
+            MainApplication.getLayerManager().removeLayer(layer);
         }
     }

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DeleteActionTest.java

@@ -7 +7 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.actions.mapmode.DeleteAction.DeleteMode;
@@ -37 +36 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.getLayerManager().addLayer(layer);
+            MainApplication.getLayerManager().addLayer(layer);
             DeleteAction mapMode = new DeleteAction();
             MapFrame map = MainApplication.getMap();
@@ -45 +44 @@
             assertTrue(map.selectMapMode(oldMapMode));
         } finally {
-            Main.getLayerManager().removeLayer(layer);
+            MainApplication.getLayerManager().removeLayer(layer);
         }
     }

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java

@@ -55 +55 @@
         DataSet dataSet = new DataSet();
         OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
-        Main.getLayerManager().addLayer(layer);
+        MainApplication.getLayerManager().addLayer(layer);
 
         // fix map view position
@@ -101 +101 @@
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.getLayerManager().removeLayer(layer);
+            MainApplication.getLayerManager().removeLayer(layer);
         }
     }

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ExtrudeActionTest.java

@@ -7 +7 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.actions.mapmode.ExtrudeAction.Mode;
@@ -37 +36 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.getLayerManager().addLayer(layer);
+            MainApplication.getLayerManager().addLayer(layer);
             ExtrudeAction mapMode = new ExtrudeAction();
             MapFrame map = MainApplication.getMap();
@@ -45 +44 @@
             assertTrue(map.selectMapMode(oldMapMode));
         } finally {
-            Main.getLayerManager().removeLayer(layer);
+            MainApplication.getLayerManager().removeLayer(layer);
         }
     }

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyActionTest.java

@@ -7 +7 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.actions.mapmode.ImproveWayAccuracyAction.State;
@@ -37 +36 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.getLayerManager().addLayer(layer);
+            MainApplication.getLayerManager().addLayer(layer);
             ImproveWayAccuracyAction mapMode = new ImproveWayAccuracyAction();
             MapFrame map = MainApplication.getMap();
@@ -45 +44 @@
             assertTrue(map.selectMapMode(oldMapMode));
         } finally {
-            Main.getLayerManager().removeLayer(layer);
+            MainApplication.getLayerManager().removeLayer(layer);
         }
     }

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java

@@ -6 +6 @@
 import java.awt.geom.Point2D;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
@@ -13 +13 @@
 class MapViewMock extends MapView {
     MapViewMock() {
-        this(Main.getLayerManager());
+        this(MainApplication.getLayerManager());
     }
 

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ParallelWayActionTest.java

@@ -7 +7 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.actions.mapmode.ParallelWayAction.Mode;
@@ -38 +37 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.getLayerManager().addLayer(layer);
+            MainApplication.getLayerManager().addLayer(layer);
             MapFrame map = MainApplication.getMap();
             ParallelWayAction mapMode = new ParallelWayAction(map);
@@ -46 +45 @@
             assertTrue(map.selectMapMode(oldMapMode));
         } finally {
-            Main.getLayerManager().removeLayer(layer);
+            MainApplication.getLayerManager().removeLayer(layer);
         }
     }

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/PlayHeadDragModeTest.java

@@ -7 +7 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -36 +35 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.getLayerManager().addLayer(layer);
+            MainApplication.getLayerManager().addLayer(layer);
             PlayHeadDragMode mapMode = new PlayHeadDragMode(PlayHeadMarker.create());
             MapFrame map = MainApplication.getMap();
@@ -44 +43 @@
             assertTrue(map.selectMapMode(oldMapMode));
         } finally {
-            Main.getLayerManager().removeLayer(layer);
+            MainApplication.getLayerManager().removeLayer(layer);
         }
     }

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java

@@ -89 +89 @@
 
         Main.pref.put("edit.initial-move-delay", "0");
-        Main.getLayerManager().addLayer(layer);
+        MainApplication.getLayerManager().addLayer(layer);
         try {
             MapFrame map = MainApplication.getMap();
@@ -145 +145 @@
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.getLayerManager().removeLayer(layer);
+            MainApplication.getLayerManager().removeLayer(layer);
         }
     }