Changeset 5234 in josm for trunk/src/org/openstreetmap/josm/Main.java

Timestamp:

2012-05-12T18:23:08+02:00 (12 years ago)

Author:

bastiK

Message:

separate preference gui from core projection code (there may be bugs)

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (3 diffs)

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

@@ -816 +816 @@
         CheckParameterUtil.ensureParameterNotNull(p);
         Projection oldValue = proj;
+        Bounds b = (Main.map != null && Main.map.mapView != null) ? Main.map.mapView.getRealBounds() : null;
         proj = p;
-        fireProjectionChanged(oldValue, proj);
+        fireProjectionChanged(oldValue, proj, b);
     }
 
@@ -827 +828 @@
     private static final ArrayList<WeakReference<ProjectionChangeListener>> listeners = new ArrayList<WeakReference<ProjectionChangeListener>>();
 
-    private static void fireProjectionChanged(Projection oldValue, Projection newValue) {
+    private static void fireProjectionChanged(Projection oldValue, Projection newValue, Bounds oldBounds) {
         if (newValue == null ^ oldValue == null
                 || (newValue != null && oldValue != null && !Utils.equal(newValue.toCode(), oldValue.toCode()))) {
@@ -843 +844 @@
                 }
             }
-            if (newValue != null) {
-                Bounds b = (Main.map != null && Main.map.mapView != null) ? Main.map.mapView.getRealBounds() : null;
-                if (b != null){
-                    Main.map.mapView.zoomTo(b);
-                }
+            if (newValue != null && oldBounds != null) {
+                Main.map.mapView.zoomTo(oldBounds);
             }
             /* TODO - remove layers with fixed projection */