Changeset 6056 in josm for trunk/src

Timestamp:

2013-07-07T00:21:33+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #6515 - Allow switching system of measurement from a single click on status line

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapFrame.java (modified) (1 diff)
• MapStatus.java (modified) (8 diffs)
• NavigatableComponent.java (modified) (3 diffs)
• preferences/projection/ProjectionPreference.java (modified) (1 diff)

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

@@ -287 +287 @@
         }
 
-        // MapFrame gets destroyed when the last layer is removed, but the status line background
-        // thread that collects the information doesn't get destroyed automatically.
-        if(statusLine.thread != null) {
-            try {
-                statusLine.thread.interrupt();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
+        statusLine.destroy();
         mapView.destroy();
     }

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

@@ -28 +28 @@
 import java.util.ConcurrentModificationException;
 import java.util.List;
+import java.util.TreeSet;
 
 import javax.swing.AbstractAction;
@@ -50 +51 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.NavigatableComponent.SoMChangeListener;
 import org.openstreetmap.josm.gui.help.Helpful;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor.ProgressMonitorDialog;
@@ -56 +59 @@
 import org.openstreetmap.josm.gui.widgets.ImageLabel;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -72 +76 @@
  * @author imi
  */
-public class MapStatus extends JPanel implements Helpful {
+public class MapStatus extends JPanel implements Helpful, Destroyable {
 
     /**
@@ -142 +146 @@
     public final BackgroundProgressMonitor progressMonitor = new BackgroundProgressMonitor();
     
-    private MouseListener jumpToOnLeftClick;
+    private final MouseListener jumpToOnLeftClick;
+    private final SoMChangeListener somListener;
+    
+    private double distValue; // Distance value displayed in distText, stored if refresh needed after a change of system of measurement
 
     /**
      * This is the thread that runs in the background and collects the information displayed.
-     * It gets destroyed by MapFrame.java/destroy() when the MapFrame itself is destroyed.
+     * It gets destroyed by destroy() when the MapFrame itself is destroyed.
      */
-    public Thread thread;
+    private Thread thread;
 
     private final List<StatusTextHistory> statusText = new ArrayList<StatusTextHistory>();
@@ -751 +758 @@
         add(angleText, GBC.std().insets(3,0,0,0));
         add(distText, GBC.std().insets(3,0,0,0));
-
+        
+        distText.addMouseListener(new MouseAdapter() {
+            private final List<String> soms = new ArrayList<String>(new TreeSet<String>(NavigatableComponent.SYSTEMS_OF_MEASUREMENT.keySet()));
+            
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                String som = ProjectionPreference.PROP_SYSTEM_OF_MEASUREMENT.get();
+                String newsom = soms.get((soms.indexOf(som)+1)%soms.size());
+                NavigatableComponent.setSystemOfMeasurement(newsom);
+            }
+        });
+        
+        NavigatableComponent.addSoMChangeListener(somListener = new SoMChangeListener() {
+            @Override public void systemOfMeasurementChanged(String oldSoM, String newSoM) {
+                setDist(distValue);
+            }
+        });
+        
         latText.addMouseListener(jumpToOnLeftClick);
         lonText.addMouseListener(jumpToOnLeftClick);
@@ -840 +864 @@
      */
     public void setDist(double dist) {
+        distValue = dist;
         distText.setText(dist < 0 ? "--" : NavigatableComponent.getDistText(dist));
     }
@@ -863 +888 @@
         angleText.setBackground(activeFlag ? ImageLabel.backColorActive : ImageLabel.backColor);
     }
+
+    @Override
+    public void destroy() {
+        NavigatableComponent.removeSoMChangeListener(somListener);
+        
+        // MapFrame gets destroyed when the last layer is removed, but the status line background
+        // thread that collects the information doesn't get destroyed automatically.
+        if (thread != null) {
+            try {
+                thread.interrupt();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
 }

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

@@ -64 +64 @@
         void zoomChanged();
     }
-
+    
+    /**
+     * Interface to notify listeners of the change of the system of measurement.
+     * @since 6056
+     */
+    public interface SoMChangeListener {
+        /**
+         * The current SoM has changed.
+         * @param oldSoM The old system of measurement
+         * @param newSoM The new (current) system of measurement
+         */
+        void systemOfMeasurementChanged(String oldSoM, String newSoM);
+    }
+    
     /**
      * Simple data class that keeps map center and scale in one object.
@@ -127 +140 @@
         for (ZoomChangeListener l : zoomChangeListeners) {
             l.zoomChanged();
+        }
+    }
+
+    /**
+     * the SoM listeners
+     */
+    private static final CopyOnWriteArrayList<SoMChangeListener> somChangeListeners = new CopyOnWriteArrayList<SoMChangeListener>();
+
+    /**
+     * Removes a SoM change listener
+     * 
+     * @param listener the listener. Ignored if null or already absent
+     * @since 6056
+     */
+    public static void removeSoMChangeListener(NavigatableComponent.SoMChangeListener listener) {
+        somChangeListeners.remove(listener);
+    }
+
+    /**
+     * Adds a SoM change listener
+     * 
+     * @param listener the listener. Ignored if null or already registered.
+     * @since 6056
+     */
+    public static void addSoMChangeListener(NavigatableComponent.SoMChangeListener listener) {
+        if (listener != null) {
+            somChangeListeners.addIfAbsent(listener);
+        }
+    }
+    
+    protected static void fireSoMChanged(String oldSoM, String newSoM) {
+        for (SoMChangeListener l : somChangeListeners) {
+            l.systemOfMeasurementChanged(oldSoM, newSoM);
         }
     }
@@ -1229 +1275 @@
             return METRIC_SOM;
         return som;
+    }
+
+    /**
+     * Sets the current system of measurement.
+     * @param somKey The system of measurement key. Must be defined in {@link NavigatableComponent#SYSTEMS_OF_MEASUREMENT}.
+     * @since 6056
+     * @throws IllegalArgumentException if {@code somKey} is not known
+     */
+    public static void setSystemOfMeasurement(String somKey) {
+        if (!SYSTEMS_OF_MEASUREMENT.containsKey(somKey)) {
+            throw new IllegalArgumentException("Invalid system of measurement: "+somKey);
+        }
+        String oldKey = ProjectionPreference.PROP_SYSTEM_OF_MEASUREMENT.get();
+        if (ProjectionPreference.PROP_SYSTEM_OF_MEASUREMENT.put(somKey)) {
+            fireSoMChanged(oldKey, somKey);
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

@@ -371 +371 @@
 
         int i = unitsCombo.getSelectedIndex();
-        PROP_SYSTEM_OF_MEASUREMENT.put(unitsValues[i]);
+        NavigatableComponent.setSystemOfMeasurement(unitsValues[i]);
 
         return false;