Changeset 12631 in josm for trunk/src/org/openstreetmap/josm/Main.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/Main.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -124 +124 @@
     @Deprecated
     public static boolean isDisplayingMapView() {
-        return map != null && map.mapView != null;
+        return MainApplication.isDisplayingMapView();
     }
 
@@ -681 +681 @@
      */
     public Collection<OsmPrimitive> getInProgressSelection() {
-        if (map != null && map.mapMode instanceof DrawAction) {
-            return ((DrawAction) map.mapMode).getInProgressSelection();
-        } else {
-            DataSet ds = getLayerManager().getEditDataSet();
-            if (ds == null) return null;
-            return ds.getSelected();
-        }
+        DataSet ds = getLayerManager().getEditDataSet();
+        if (ds == null) return null;
+        return ds.getSelected();
     }
 
@@ -906 +902 @@
             ImageProvider.shutdown(false);
             JCSCacheManager.shutdown();
-        }
-        if (map != null) {
-            map.rememberToggleDialogWidth();
         }
         // Remove all layers because somebody may rely on layerRemoved events (like AutosaveTask)
@@ -1090 +1083 @@
     /**
      * The projection method used.
-     * use {@link #getProjection()} and {@link #setProjection(Projection)} for access.
+     * Use {@link #getProjection()} and {@link #setProjection(Projection)} for access.
      * Use {@link #setProjection(Projection)} in order to trigger a projection change event.
      */
@@ -1112 +1105 @@
         CheckParameterUtil.ensureParameterNotNull(p);
         Projection oldValue = proj;
-        Bounds b = isDisplayingMapView() ? map.mapView.getRealBounds() : null;
+        Bounds b = main != null ? main.getRealBounds() : null;
         proj = p;
         fireProjectionChanged(oldValue, proj, b);
+    }
+
+    /**
+     * Returns the bounds for the current projection. Used for projection events.
+     * @return the bounds for the current projection
+     * @see #restoreOldBounds
+     */
+    protected Bounds getRealBounds() {
+        // To be overriden
+        return null;
+    }
+
+    /**
+     * Restore clean state corresponding to old bounds after a projection change event.
+     * @param oldBounds bounds previously returned by {@link #getRealBounds}, before the change of projection
+     * @see #getRealBounds
+     */
+    protected void restoreOldBounds(Bounds oldBounds) {
+        // To be overriden
     }
 
@@ -1139 +1151 @@
                 }
             }
-            if (newValue != null && oldBounds != null) {
-                MainApplication.getMap().mapView.zoomTo(oldBounds);
+            if (newValue != null && oldBounds != null && main != null) {
+                main.restoreOldBounds(oldBounds);
             }
             /* TODO - remove layers with fixed projection */