Index: /trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/Main.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/Main.java	(revision 5460)
@@ -822,5 +822,5 @@
         CheckParameterUtil.ensureParameterNotNull(p);
         Projection oldValue = proj;
-        Bounds b = (Main.map != null && Main.map.mapView != null) ? Main.map.mapView.getRealBounds() : null;
+        Bounds b = isDisplayingMapView() ? map.mapView.getRealBounds() : null;
         proj = p;
         fireProjectionChanged(oldValue, proj, b);
Index: /trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java	(revision 5460)
@@ -58,5 +58,5 @@
     
     protected boolean isLayerAlreadyPresent() {
-        if (Main.map != null && Main.map.mapView != null) {
+        if (Main.isDisplayingMapView()) {
             for (ImageryLayer layer : Main.map.mapView.getLayersOfType(ImageryLayer.class)) {
                 if (info.equals(layer.getInfo())) {
@@ -75,5 +75,5 @@
         } else if (info.getImageryType() == ImageryType.TMS || info.getImageryType() == ImageryType.BING || info.getImageryType() == ImageryType.SCANEX) {
             setEnabled(true);
-        } else if (Main.map != null && Main.map.mapView != null && !Main.map.mapView.getAllLayers().isEmpty()) {
+        } else if (Main.isDisplayingMapView() && !Main.map.mapView.getAllLayers().isEmpty()) {
             setEnabled(true);
         } else {
Index: /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 5460)
@@ -129,5 +129,5 @@
 
     public void autoScale()  {
-        if (Main.map != null) {
+        if (Main.isDisplayingMapView()) {
             if (mode.equals("previous")) {
                 Main.map.mapView.zoomPrevious();
@@ -237,7 +237,7 @@
             }
         } else if ("previous".equals(mode)) {
-            setEnabled(Main.map != null && Main.map.mapView != null && Main.map.mapView.hasZoomUndoEntries());
+            setEnabled(Main.isDisplayingMapView() && Main.map.mapView.hasZoomUndoEntries());
         } else if ("next".equals(mode)) {
-            setEnabled(Main.map != null && Main.map.mapView != null && Main.map.mapView.hasZoomRedoEntries());
+            setEnabled(Main.isDisplayingMapView() && Main.map.mapView.hasZoomRedoEntries());
         } else {
             setEnabled(
Index: /trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 5460)
@@ -201,5 +201,5 @@
             }
             updateOffsetIntl();
-            if (Main.map != null) {
+            if (Main.isDisplayingMapView()) {
                 Main.map.repaint();
             }
Index: /trunk/src/org/openstreetmap/josm/actions/LassoModeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/LassoModeAction.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/actions/LassoModeAction.java	(revision 5460)
@@ -19,5 +19,5 @@
     @Override
     public void enterMode() {
-        if (Main.map != null) {
+        if (Main.isDisplayingMapView()) {
             Main.map.mapModeSelect.setLassoMode(true);
             Main.map.mapModeSelect.enterMode();
@@ -28,6 +28,8 @@
     @Override
     public void exitMode() {
-        Main.map.mapModeSelect.setLassoMode(false);
-        Main.map.mapModeSelect.exitMode();
+        if (Main.isDisplayingMapView()) {
+            Main.map.mapModeSelect.setLassoMode(false);
+            Main.map.mapModeSelect.exitMode();
+        }
         super.exitMode();
     }
Index: /trunk/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java	(revision 5460)
@@ -224,5 +224,5 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(Main.map != null && Main.map.mapView != null && !Main.map.mapView.getAllLayers().isEmpty());
+        setEnabled(Main.isDisplayingMapView() && !Main.map.mapView.getAllLayers().isEmpty());
     }
 }
Index: /trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 5460)
@@ -105,6 +105,5 @@
             return;
         }
-        boolean check =  Main.map != null
-        && Main.map.mapView !=null
+        boolean check = Main.isDisplayingMapView()
         && Main.map.mapView.getActiveLayer() != null;
         if(!check) {
Index: /trunk/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java	(revision 5460)
@@ -21,5 +21,5 @@
     public void actionPerformed(ActionEvent e) {
         Main.pref.put("draw.rawgps.lines", !Main.pref.getBoolean("draw.rawgps.lines", true));
-        if(Main.map != null) {
+        if (Main.isDisplayingMapView()) {
             Main.map.mapView.repaint();
         }
Index: /trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java	(revision 5460)
@@ -64,5 +64,5 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(Main.map != null && Main.main.getEditLayer() != null);
+        setEnabled(Main.isDisplayingMapView() && Main.main.getEditLayer() != null);
     }
 }
Index: /trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java	(revision 5460)
@@ -67,5 +67,5 @@
         
         notifySelectedState();
-        if (Main.map != null) {
+        if (Main.isDisplayingMapView()) {
             Main.map.mapView.repaint();
         }
@@ -78,5 +78,5 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(Main.map != null && Main.main.getEditLayer() != null);
+        setEnabled(Main.isDisplayingMapView() && Main.main.getEditLayer() != null);
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(revision 5460)
@@ -326,5 +326,5 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(Main.map != null && Main.map.mapView != null && Main.map.mapView.isActiveLayerDrawable());
+        setEnabled(Main.isDisplayingMapView() && Main.map.mapView.isActiveLayerDrawable());
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java	(revision 5460)
@@ -71,6 +71,7 @@
      */
     public void actionPerformed(ActionEvent e) {
-        if (Main.map != null)
+        if (Main.isDisplayingMapView()) {
             Main.map.selectMapMode(this);
+        }
     }
 
Index: /trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java	(revision 5460)
@@ -103,5 +103,5 @@
     public static void bookmarkOffset(String name, ImageryLayer layer) {
         LatLon center;
-        if (Main.map != null && Main.map.mapView != null) {
+        if (Main.isDisplayingMapView()) {
             center = Main.getProjection().eastNorth2latlon(Main.map.mapView.getCenter());
         } else {
Index: /trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 5460)
@@ -593,6 +593,5 @@
          */
         protected void refreshEnabled() {
-            presetsMenu.setEnabled(Main.map != null
-                    && Main.map.mapView !=null
+            presetsMenu.setEnabled(Main.isDisplayingMapView()
                     && Main.map.mapView.getEditLayer() != null
             );
Index: /trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 5460)
@@ -143,5 +143,5 @@
         addEditLayerChangeListener(listener);
         if (initialFire) {
-            if (Main.map != null && Main.map.mapView != null && Main.map.mapView.getEditLayer() != null) {
+            if (Main.isDisplayingMapView() && Main.map.mapView.getEditLayer() != null) {
                 fireEditLayerChanged(null, Main.map.mapView.getEditLayer());
             }
@@ -623,5 +623,5 @@
         tempG.draw(border);
 
-        if (Main.map != null && Main.map.filterDialog != null) {
+        if (Main.isDisplayingMapView() && Main.map.filterDialog != null) {
             Main.map.filterDialog.drawOSDText(tempG);
         }
Index: /trunk/src/org/openstreetmap/josm/gui/actionsupport/AlignImageryPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/actionsupport/AlignImageryPanel.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/gui/actionsupport/AlignImageryPanel.java	(revision 5460)
@@ -2,16 +2,16 @@
 
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.Color;
 import java.awt.Font;
-import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.BoxLayout;
+
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.Box;
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.EmptyBorder;
@@ -20,5 +20,4 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.GBC;
-import static org.openstreetmap.josm.tools.I18n.tr;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.UrlLabel;
@@ -50,5 +49,5 @@
             @Override
             public void actionPerformed( ActionEvent e ) {
-                if (Main.map!=null) {
+                if (Main.isDisplayingMapView()) {
                     Main.map.removeTopPanel(AlignImageryPanel.class);
                     Main.pref.put(PREF, false);
@@ -73,5 +72,5 @@
 
     public static void addNagPanelIfNeeded() {
-        if( Main.map != null && !Main.pref.getBoolean("expert") && Main.pref.getBoolean(PREF, true) ) {
+        if (Main.isDisplayingMapView() && !Main.pref.getBoolean("expert") && Main.pref.getBoolean(PREF, true) ) {
             if (Main.map.getTopPanel(AlignImageryPanel.class) == null) {
                 double w = Toolkit.getDefaultToolkit().getScreenSize().getWidth();
Index: /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 5460)
@@ -315,5 +315,5 @@
         tpDownloadAreaSelectors.setSelectedIndex(idx);
 
-        if (Main.map != null) {
+        if (Main.isDisplayingMapView()) {
             MapView mv = Main.map.mapView;
             currentBounds = new Bounds(
Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java	(revision 5460)
@@ -131,5 +131,5 @@
         // remove all history browsers if the number of layers drops to 0
         //
-        if (Main.map != null && Main.map.mapView.getNumLayers() == 0) {
+        if (Main.isDisplayingMapView() && Main.map.mapView.getNumLayers() == 0) {
             hideAll();
         }
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java	(revision 5460)
@@ -223,5 +223,5 @@
             //            }                     TODO: pop up image dialog but don't load image again
 
-            if (centerView && Main.map != null && entry != null && entry.getPos() != null) {
+            if (centerView && Main.isDisplayingMapView() && entry != null && entry.getPos() != null) {
                 Main.map.mapView.zoomTo(entry.getPos());
             }
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java	(revision 5460)
@@ -45,5 +45,5 @@
             data.get(i).thumbnail = loadThumb(data.get(i));
 
-            if (Main.map != null && Main.map.mapView != null) {
+            if (Main.isDisplayingMapView()) {
                 layer.updateOffscreenBuffer = true;
                 Main.map.mapView.repaint();
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java	(revision 5460)
@@ -55,5 +55,5 @@
         @Override
         public void updateEnabledState() {
-            setEnabled(Main.map != null && Main.main.getEditLayer() != null);
+            setEnabled(Main.isDisplayingMapView() && Main.main.getEditLayer() != null);
         }
     }
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java	(revision 5460)
@@ -170,5 +170,5 @@
                         AutoScaleAction.autoScale("selection");
                     }
-                    if (Main.map != null && Main.map.relationListDialog != null) {
+                    if (Main.isDisplayingMapView() && Main.map.relationListDialog != null) {
                         Main.map.relationListDialog.selectRelations(null); // unselect all relations to fix #7342
                         Main.map.relationListDialog.dataChanged(null);
@@ -221,5 +221,5 @@
         // make sure this isn't called unless there *is* a MapView
         //
-        if (Main.map != null && Main.map.mapView != null) {
+        if (Main.isDisplayingMapView()) {
             Main.worker.execute(new Runnable() {
                 public void run() {
Index: /trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(revision 5459)
+++ /trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(revision 5460)
@@ -152,5 +152,5 @@
         int height = Toolkit.getDefaultToolkit().getScreenSize().height;
         int width = Toolkit.getDefaultToolkit().getScreenSize().width;
-        if (Main.map != null && Main.map.mapView != null) {
+        if (Main.isDisplayingMapView()) {
             height = Main.map.mapView.getHeight();
             width = Main.map.mapView.getWidth();