Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

@@ -29 +29 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapFrameListener;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.ValidatorDialog.ValidatorBoundingXYVisitor;
@@ -102 +104 @@
         bboxCalculator.enlargeBoundingBox();
         if (bboxCalculator.getBounds() != null) {
-            Main.map.mapView.zoomTo(bboxCalculator);
+            MainApplication.getMap().mapView.zoomTo(bboxCalculator);
         }
     }
@@ -191 +193 @@
      */
     public void autoScale() {
-        if (Main.isDisplayingMapView()) {
+        if (MainApplication.isDisplayingMapView()) {
+            MapView mapView = MainApplication.getMap().mapView;
             switch (mode) {
             case "previous":
-                Main.map.mapView.zoomPrevious();
+                mapView.zoomPrevious();
                 break;
             case "next":
-                Main.map.mapView.zoomNext();
+                mapView.zoomNext();
                 break;
             default:
                 BoundingXYVisitor bbox = getBoundingBox();
                 if (bbox != null && bbox.getBounds() != null) {
-                    Main.map.mapView.zoomTo(bbox);
+                    mapView.zoomTo(bbox);
                 }
             }
@@ -254 +257 @@
 
     private static BoundingXYVisitor modeProblem(ValidatorBoundingXYVisitor v) {
-        TestError error = Main.map.validatorDialog.getSelectedError();
+        TestError error = MainApplication.getMap().validatorDialog.getSelectedError();
         if (error == null)
             return null;
@@ -288 +291 @@
             }
         } else {
-            Conflict<? extends OsmPrimitive> c = Main.map.conflictDialog.getSelectedConflict();
+            ConflictDialog conflictDialog = MainApplication.getMap().conflictDialog;
+            Conflict<? extends OsmPrimitive> c = conflictDialog.getSelectedConflict();
             if (c != null) {
                 sel.add(c.getMy());
-            } else if (Main.map.conflictDialog.getConflicts() != null) {
-                sel = Main.map.conflictDialog.getConflicts().getMyConflictParties();
+            } else if (conflictDialog.getConflicts() != null) {
+                sel = conflictDialog.getConflicts().getMyConflictParties();
             }
         }
@@ -350 +354 @@
     protected void updateEnabledState() {
         DataSet ds = getLayerManager().getEditDataSet();
+        MapFrame map = MainApplication.getMap();
         switch (mode) {
         case "selection":
@@ -358 +363 @@
             break;
         case "conflict":
-            setEnabled(Main.map != null && Main.map.conflictDialog.getSelectedConflict() != null);
+            setEnabled(map != null && map.conflictDialog.getSelectedConflict() != null);
             break;
         case "download":
@@ -364 +369 @@
             break;
         case "problem":
-            setEnabled(Main.map != null && Main.map.validatorDialog.getSelectedError() != null);
+            setEnabled(map != null && map.validatorDialog.getSelectedError() != null);
             break;
         case "previous":
-            setEnabled(Main.isDisplayingMapView() && Main.map.mapView.hasZoomUndoEntries());
+            setEnabled(MainApplication.isDisplayingMapView() && map.mapView.hasZoomUndoEntries());
             break;
         case "next":
-            setEnabled(Main.isDisplayingMapView() && Main.map.mapView.hasZoomRedoEntries());
+            setEnabled(MainApplication.isDisplayingMapView() && map.mapView.hasZoomRedoEntries());
             break;
         default: