Changeset 3455 in josm for trunk/src/org

Timestamp:

2010-08-21T18:34:28+02:00 (15 years ago)

Author:

jttt

Message:

Revert MapFrame.selectMapMode signature change (some plugins are using it)

File:

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

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

@@ -275 +275 @@
      * @param mapMode   The new mode to set.
      */
-    public boolean selectMapMode(MapMode newMapMode) {
+    public void selectMapMode(MapMode newMapMode) {
         MapMode oldMapMode = this.mapMode;
         if (newMapMode == oldMapMode)
-            return false;
+            return;
         if (oldMapMode != null) {
             oldMapMode.exitMode();
@@ -286 +286 @@
         lastMapMode.put(mapView.getActiveLayer(), newMapMode);
         fireMapModeChanged(oldMapMode, newMapMode);
-        return true;
     }
 
@@ -383 +382 @@
         if (mapMode == null || !mapMode.layerIsSupported(newLayer)) {
             MapMode newMapMode = lastMapMode.get(newLayer);
+            modeChanged = newMapMode != mapMode;
             if (newMapMode != null) {
-                modeChanged = selectMapMode(newMapMode);
+                selectMapMode(newMapMode);
             } // it would be nice to select first supported mode when layer is first selected, but it don't work well with for example editgpx layer
         }