Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/AddNoteActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/AddNoteActionTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/AddNoteActionTest.java	(revision 12630)
@@ -13,4 +13,6 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.NoteData;
+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;
@@ -39,8 +41,9 @@
             Main.getLayerManager().addLayer(layer);
             AddNoteAction mapMode = new AddNoteAction(new NoteData(Collections.<Note>emptyList()));
-            MapMode oldMapMode = Main.map.mapMode;
-            assertTrue(Main.map.selectMapMode(mapMode));
-            assertEquals(mapMode, Main.map.mapMode);
-            assertTrue(Main.map.selectMapMode(oldMapMode));
+            MapFrame map = MainApplication.getMap();
+            MapMode oldMapMode = map.mapMode;
+            assertTrue(map.selectMapMode(mapMode));
+            assertEquals(mapMode, map.mapMode);
+            assertTrue(map.selectMapMode(oldMapMode));
         } finally {
             Main.getLayerManager().removeLayer(layer);
Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DeleteActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DeleteActionTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DeleteActionTest.java	(revision 12630)
@@ -11,4 +11,6 @@
 import org.openstreetmap.josm.actions.mapmode.DeleteAction.DeleteMode;
 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;
@@ -37,8 +39,9 @@
             Main.getLayerManager().addLayer(layer);
             DeleteAction mapMode = new DeleteAction();
-            MapMode oldMapMode = Main.map.mapMode;
-            assertTrue(Main.map.selectMapMode(mapMode));
-            assertEquals(mapMode, Main.map.mapMode);
-            assertTrue(Main.map.selectMapMode(oldMapMode));
+            MapFrame map = MainApplication.getMap();
+            MapMode oldMapMode = map.mapMode;
+            assertTrue(map.selectMapMode(mapMode));
+            assertEquals(mapMode, map.mapMode);
+            assertTrue(map.selectMapMode(oldMapMode));
         } finally {
             Main.getLayerManager().removeLayer(layer);
Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java	(revision 12630)
@@ -23,4 +23,6 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -56,5 +58,6 @@
 
         // fix map view position
-        Main.map.mapView.zoomTo(new EastNorth(0, 0), 1);
+        MapFrame map = MainApplication.getMap();
+        map.mapView.zoomTo(new EastNorth(0, 0), 1);
 
         Node n1 = new Node(new EastNorth(0, 0));
@@ -69,8 +72,8 @@
 
         try {
-            assertTrue(Main.map.selectDrawTool(false));
+            assertTrue(map.selectDrawTool(false));
 
-            Main.map.mapModeDraw.mouseReleased(new MouseEvent(
-                    Main.map,
+            map.mapModeDraw.mouseReleased(new MouseEvent(
+                    map,
                     MouseEvent.MOUSE_RELEASED,
                     2000,
Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ExtrudeActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ExtrudeActionTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ExtrudeActionTest.java	(revision 12630)
@@ -11,4 +11,6 @@
 import org.openstreetmap.josm.actions.mapmode.ExtrudeAction.Mode;
 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;
@@ -37,8 +39,9 @@
             Main.getLayerManager().addLayer(layer);
             ExtrudeAction mapMode = new ExtrudeAction();
-            MapMode oldMapMode = Main.map.mapMode;
-            assertTrue(Main.map.selectMapMode(mapMode));
-            assertEquals(mapMode, Main.map.mapMode);
-            assertTrue(Main.map.selectMapMode(oldMapMode));
+            MapFrame map = MainApplication.getMap();
+            MapMode oldMapMode = map.mapMode;
+            assertTrue(map.selectMapMode(mapMode));
+            assertEquals(mapMode, map.mapMode);
+            assertTrue(map.selectMapMode(oldMapMode));
         } finally {
             Main.getLayerManager().removeLayer(layer);
Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyActionTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyActionTest.java	(revision 12630)
@@ -11,4 +11,6 @@
 import org.openstreetmap.josm.actions.mapmode.ImproveWayAccuracyAction.State;
 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;
@@ -37,8 +39,9 @@
             Main.getLayerManager().addLayer(layer);
             ImproveWayAccuracyAction mapMode = new ImproveWayAccuracyAction();
-            MapMode oldMapMode = Main.map.mapMode;
-            assertTrue(Main.map.selectMapMode(mapMode));
-            assertEquals(mapMode, Main.map.mapMode);
-            assertTrue(Main.map.selectMapMode(oldMapMode));
+            MapFrame map = MainApplication.getMap();
+            MapMode oldMapMode = map.mapMode;
+            assertTrue(map.selectMapMode(mapMode));
+            assertEquals(mapMode, map.mapMode);
+            assertTrue(map.selectMapMode(oldMapMode));
         } finally {
             Main.getLayerManager().removeLayer(layer);
Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ParallelWayActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ParallelWayActionTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ParallelWayActionTest.java	(revision 12630)
@@ -12,4 +12,6 @@
 import org.openstreetmap.josm.actions.mapmode.ParallelWayAction.Modifier;
 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;
@@ -37,9 +39,10 @@
         try {
             Main.getLayerManager().addLayer(layer);
-            ParallelWayAction mapMode = new ParallelWayAction(Main.map);
-            MapMode oldMapMode = Main.map.mapMode;
-            assertTrue(Main.map.selectMapMode(mapMode));
-            assertEquals(mapMode, Main.map.mapMode);
-            assertTrue(Main.map.selectMapMode(oldMapMode));
+            MapFrame map = MainApplication.getMap();
+            ParallelWayAction mapMode = new ParallelWayAction(map);
+            MapMode oldMapMode = map.mapMode;
+            assertTrue(map.selectMapMode(mapMode));
+            assertEquals(mapMode, map.mapMode);
+            assertTrue(map.selectMapMode(oldMapMode));
         } finally {
             Main.getLayerManager().removeLayer(layer);
Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/PlayHeadDragModeTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/PlayHeadDragModeTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/PlayHeadDragModeTest.java	(revision 12630)
@@ -9,4 +9,6 @@
 import org.openstreetmap.josm.Main;
 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.gui.layer.markerlayer.PlayHeadMarker;
@@ -36,8 +38,9 @@
             Main.getLayerManager().addLayer(layer);
             PlayHeadDragMode mapMode = new PlayHeadDragMode(PlayHeadMarker.create());
-            MapMode oldMapMode = Main.map.mapMode;
-            assertTrue(Main.map.selectMapMode(mapMode));
-            assertEquals(mapMode, Main.map.mapMode);
-            assertTrue(Main.map.selectMapMode(oldMapMode));
+            MapFrame map = MainApplication.getMap();
+            MapMode oldMapMode = map.mapMode;
+            assertTrue(map.selectMapMode(mapMode));
+            assertEquals(mapMode, map.mapMode);
+            assertTrue(map.selectMapMode(oldMapMode));
         } finally {
             Main.getLayerManager().removeLayer(layer);
Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java	(revision 12630)
@@ -22,4 +22,5 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
@@ -90,5 +91,6 @@
         Main.getLayerManager().addLayer(layer);
         try {
-            SelectAction action = new SelectActionMock(Main.map, dataSet, layer);
+            MapFrame map = MainApplication.getMap();
+            SelectAction action = new SelectActionMock(map, dataSet, layer);
             nodesMerged = false;
 
@@ -97,5 +99,5 @@
 
             MouseEvent event;
-            event = new MouseEvent(Main.map,
+            event = new MouseEvent(map,
                                    MouseEvent.MOUSE_PRESSED,
                                    0,
@@ -105,5 +107,5 @@
                                    false, MouseEvent.BUTTON1);
             action.mousePressed(event);
-            event = new MouseEvent(Main.map,
+            event = new MouseEvent(map,
                                    MouseEvent.MOUSE_DRAGGED,
                                    1000,
@@ -113,5 +115,5 @@
                                    false, MouseEvent.BUTTON1);
             action.mouseDragged(event);
-            event = new MouseEvent(Main.map,
+            event = new MouseEvent(map,
                                    MouseEvent.MOUSE_RELEASED,
                                    2000,
Index: trunk/test/unit/org/openstreetmap/josm/gui/MapScalerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/MapScalerTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/gui/MapScalerTest.java	(revision 12630)
@@ -38,5 +38,5 @@
         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());
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/CommandStackDialogTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/CommandStackDialogTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/CommandStackDialogTest.java	(revision 12630)
@@ -11,4 +11,6 @@
 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,9 +59,10 @@
             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());
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java	(revision 12630)
@@ -17,4 +17,5 @@
 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,5 +58,6 @@
     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));
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MapPaintDialogTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MapPaintDialogTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MapPaintDialogTest.java	(revision 12630)
@@ -6,4 +6,5 @@
 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,5 +30,5 @@
     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);
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java	(revision 12630)
@@ -24,4 +24,5 @@
 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,5 +212,5 @@
             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);
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/MarkerLayerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/MarkerLayerTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/MarkerLayerTest.java	(revision 12630)
@@ -10,4 +10,6 @@
 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,13 +34,14 @@
     @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;
         }
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java	(revision 12630)
@@ -22,4 +22,5 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 
 /**
@@ -136,5 +137,5 @@
             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);
Index: trunk/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java	(revision 12625)
+++ trunk/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java	(revision 12630)
@@ -11,4 +11,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -30,5 +31,5 @@
     public void testTicket12531() {
         Main.getLayerManager().resetState();
-        assertNull(Main.map);
+        assertNull(MainApplication.getMap());
         assertTrue(new NoteImporter().importDataHandleExceptions(
                 new File(TestUtils.getRegressionDataFile(12531, "notes.osn")), null));