Changeset 12631 in josm for trunk/src/org/openstreetmap/josm/gui/MainApplication.java

Timestamp:

2017-08-24T01:24:27+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - remove last calls to Main.map

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -51 +51 @@
 import org.openstreetmap.josm.actions.PreferencesAction;
 import org.openstreetmap.josm.actions.RestartAction;
+import org.openstreetmap.josm.actions.mapmode.DrawAction;
 import org.openstreetmap.josm.data.AutosaveTask;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.CustomConfigurator;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.gui.ProgramArguments.Option;
@@ -220 +223 @@
             mainFrame.storeState();
         }
+        if (map != null) {
+            map.rememberToggleDialogWidth();
+        }
         super.shutdown();
+    }
+
+    @Override
+    protected Bounds getRealBounds() {
+        return isDisplayingMapView() ? map.mapView.getRealBounds() : null;
+    }
+
+    @Override
+    protected void restoreOldBounds(Bounds oldBounds) {
+        if (isDisplayingMapView()) {
+            map.mapView.zoomTo(oldBounds);
+        }
+    }
+
+    @Override
+    public Collection<OsmPrimitive> getInProgressSelection() {
+        if (map != null && map.mapMode instanceof DrawAction) {
+            return ((DrawAction) map.mapMode).getInProgressSelection();
+        } else {
+            return super.getInProgressSelection();
+        }
     }