Changeset 12630 in josm for trunk/test/unit/org/openstreetmap/josm/gui

Timestamp:

2017-08-24T00:15:51+02:00 (9 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.map and Main.isDisplayingMapView(). Replacements: gui.MainApplication.getMap() / gui.MainApplication.isDisplayingMapView()

Location:

trunk/test/unit/org/openstreetmap/josm/gui

Files:

• MapScalerTest.java (modified) (1 diff)
• dialogs/CommandStackDialogTest.java (modified) (2 diffs)
• dialogs/ConflictDialogTest.java (modified) (2 diffs)
• dialogs/MapPaintDialogTest.java (modified) (2 diffs)
• layer/GpxLayerTest.java (modified) (2 diffs)
• layer/MarkerLayerTest.java (modified) (2 diffs)
• layer/OsmDataLayerTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/MapScalerTest.java

@@ -38 +38 @@
         Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null));
         assertEquals(Color.WHITE, MapScaler.getColor());
-        MapScaler ms = new MapScaler(Main.map.mapView);
+        MapScaler ms = new MapScaler(MainApplication.getMap().mapView);
         assertEquals("/MapView/Scaler", ms.helpTopic());
         ms.paint(TestUtils.newGraphics());

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/CommandStackDialogTest.java

@@ -11 +11 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -57 +59 @@
             assertFalse(Main.main.undoRedo.redoCommands.isEmpty());
 
+            MapFrame map = MainApplication.getMap();
             CommandStackDialog dlg = new CommandStackDialog();
-            Main.map.addToggleDialog(dlg);
+            map.addToggleDialog(dlg);
             dlg.unfurlDialog();
             assertTrue(dlg.isVisible());
-            Main.map.removeToggleDialog(dlg);
+            map.removeToggleDialog(dlg);
             dlg.hideDialog();
             assertFalse(dlg.isVisible());

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java

@@ -17 +17 @@
 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.dialogs.ConflictDialog.ConflictPainter;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -57 +58 @@
     public void testConflictPainter() {
         Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null));
-        ConflictPainter cp = new ConflictPainter(Main.map.mapView, new BufferedImage(800, 600, BufferedImage.TYPE_3BYTE_BGR).createGraphics());
+        ConflictPainter cp = new ConflictPainter(MainApplication.getMap().mapView,
+                new BufferedImage(800, 600, BufferedImage.TYPE_3BYTE_BGR).createGraphics());
         Node n1 = new Node(1, 1);
         n1.setCoor(new LatLon(1, 1));

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MapPaintDialogTest.java

@@ -6 +6 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -29 +30 @@
     public void testInfoAction() {
         Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null));
-        Main.map.mapPaintDialog.new InfoAction().actionPerformed(null);
+        MainApplication.getMap().mapPaintDialog.new InfoAction().actionPerformed(null);
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java

@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.io.GpxReaderTest;
@@ -211 +212 @@
             Main.getLayerManager().addLayer(layer);
             assertTrue(layer.getMenuEntries().length > 0);
-            layer.paint(TestUtils.newGraphics(), Main.map.mapView, layer.data.getMetaBounds());
+            layer.paint(TestUtils.newGraphics(), MainApplication.getMap().mapView, layer.data.getMetaBounds());
         } finally {
             Main.getLayerManager().removeLayer(layer);

trunk/test/unit/org/openstreetmap/josm/gui/layer/MarkerLayerTest.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -32 +34 @@
     @Test
     public void testPlayHeadMarker() {
+        MapFrame map = MainApplication.getMap();
         try {
             Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null));
             MarkerLayer layer = new MarkerLayer(new GpxData(), null, null, null);
-            assertNull(Main.map.mapView.playHeadMarker);
+            assertNull(map.mapView.playHeadMarker);
             Main.getLayerManager().addLayer(layer);
-            assertNotNull(Main.map.mapView.playHeadMarker);
+            assertNotNull(map.mapView.playHeadMarker);
             Main.getLayerManager().removeLayer(layer);
         } finally {
-            Main.map.mapView.playHeadMarker = null;
+            map.mapView.playHeadMarker = null;
         }
     }

trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java

@@ -22 +22 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 
 /**
@@ -136 +137 @@
             Main.getLayerManager().addLayer(layer);
             assertTrue(layer.getMenuEntries().length > 0);
-            layer.paint(TestUtils.newGraphics(), Main.map.mapView, new Bounds(LatLon.ZERO));
+            layer.paint(TestUtils.newGraphics(), MainApplication.getMap().mapView, new Bounds(LatLon.ZERO));
         } finally {
             Main.getLayerManager().removeLayer(layer);