Changeset 16985 in josm for trunk

Timestamp:

2020-08-30T22:19:00+02:00 (4 years ago)

Author:

simon04

Message:

fix #19736 - MapStatus displays non-localized SystemOfMeasurement name

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/SystemOfMeasurement.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/MapStatus.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (modified) (6 diffs)
• test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.text.NumberFormat;
@@ -127 +128 @@
     /**
      * Sets the current global system of measurement.
-     * @param somKey The system of measurement key. Must be defined in {@link SystemOfMeasurement#ALL_SYSTEMS}.
+     * @param som The system of measurement to set. Must be defined in {@link SystemOfMeasurement#ALL_SYSTEMS}.
      * @throws IllegalArgumentException if {@code somKey} is not known
-     * @since 8554
-     */
-    public static void setSystemOfMeasurement(String somKey) {
+     * @since xxx (signature)
+     */
+    public static void setSystemOfMeasurement(SystemOfMeasurement som) {
+        String somKey = som.getName();
         if (!SystemOfMeasurement.ALL_SYSTEMS.containsKey(somKey)) {
             throw new IllegalArgumentException("Invalid system of measurement: "+somKey);
@@ -285 +287 @@
 
     /**
+     * Returns the localized name of this system of measurement
+     * @return the localized name
+     */
+    @Override
+    public String toString() {
+        return tr(name);
+    }
+
+    /**
      * Returns the default system of measurement for the current country.
      * @return the default system of measurement for the current country

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

@@ -35 +35 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
-import java.util.TreeSet;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
@@ -128 +129 @@
     private static final AbstractProperty<Boolean> SHOW_ID = new BooleanProperty("osm-primitives.showid", false);
 
+    private static final List<SystemOfMeasurement> SORTED_SYSTEM_OF_MEASUREMENTS = SystemOfMeasurement.ALL_SYSTEMS.values().stream()
+            .sorted(Comparator.comparing(SystemOfMeasurement::toString))
+            .collect(Collectors.toList());
+
     /**
      * Property for map status background color.
@@ -801 +806 @@
 
         MapStatusPopupMenu() {
-            for (final String key : new TreeSet<>(SystemOfMeasurement.ALL_SYSTEMS.keySet())) {
-                JCheckBoxMenuItem item = new JCheckBoxMenuItem(new AbstractAction(key) {
+            for (final SystemOfMeasurement som : SORTED_SYSTEM_OF_MEASUREMENTS) {
+                JCheckBoxMenuItem item = new JCheckBoxMenuItem(new AbstractAction(som.toString()) {
                     @Override
                     public void actionPerformed(ActionEvent e) {
-                        updateSystemOfMeasurement(key);
+                        updateSystemOfMeasurement(som);
                     }
                 });
@@ -919 +924 @@
         if (Config.getPref().getBoolean("statusbar.change-system-of-measurement-on-click", true)) {
             distText.addMouseListener(new MouseAdapter() {
-                private final List<String> soms = new ArrayList<>(new TreeSet<>(SystemOfMeasurement.ALL_SYSTEMS.keySet()));
-
                 @Override
                 public void mouseClicked(MouseEvent e) {
                     if (!e.isPopupTrigger() && e.getButton() == MouseEvent.BUTTON1) {
-                        String som = SystemOfMeasurement.PROP_SYSTEM_OF_MEASUREMENT.get();
-                        String newsom = soms.get((soms.indexOf(som)+1) % soms.size());
+                        SystemOfMeasurement som = SystemOfMeasurement.getSystemOfMeasurement();
+                        int i = (SORTED_SYSTEM_OF_MEASUREMENTS.indexOf(som) + 1) % SORTED_SYSTEM_OF_MEASUREMENTS.size();
+                        SystemOfMeasurement newsom = SORTED_SYSTEM_OF_MEASUREMENTS.get(i);
                         updateSystemOfMeasurement(newsom);
                     }
@@ -997 +1001 @@
     /**
      * Updates the system of measurement and displays a notification.
-     * @param newsom The new system of measurement to set
+     * @param som The new system of measurement to set
      * @since 6960
      */
-    public void updateSystemOfMeasurement(String newsom) {
-        SystemOfMeasurement.setSystemOfMeasurement(newsom);
+    public void updateSystemOfMeasurement(SystemOfMeasurement som) {
+        SystemOfMeasurement.setSystemOfMeasurement(som);
         if (Config.getPref().getBoolean("statusbar.notify.change-system-of-measurement", true)) {
-            new Notification(tr("System of measurement changed to {0}", newsom))
+            new Notification(tr("System of measurement changed to {0}", som.toString()))
                 .setDuration(Notification.TIME_SHORT)
                 .show();

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences.projection;
 
-import static org.openstreetmap.josm.data.SystemOfMeasurement.ALL_SYSTEMS;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -11 +10 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -296 +296 @@
     private static final StringProperty PROP_COORDINATES = new StringProperty("coordinates", null);
     private static final ListProperty PROP_SUB_PROJECTION_DEFAULT = new ListProperty("projection.default.sub", null);
-    private static final String[] unitsValues = ALL_SYSTEMS.keySet().toArray(new String[ALL_SYSTEMS.size()]);
-    private static final String[] unitsValuesTr = new String[unitsValues.length];
-    static {
-        for (int i = 0; i < unitsValues.length; ++i) {
-            unitsValuesTr[i] = tr(unitsValues[i]);
-        }
-    }
 
     /**
@@ -314 +307 @@
     private final JosmComboBox<ICoordinateFormat> coordinatesCombo;
 
-    private final JosmComboBox<String> unitsCombo = new JosmComboBox<>(unitsValuesTr);
+    /**
+     * Combobox with all system of measurements
+     */
+    private final JosmComboBox<SystemOfMeasurement> unitsCombo = new JosmComboBox<>(
+            SystemOfMeasurement.ALL_SYSTEMS.values().stream()
+                    .sorted(Comparator.comparing(SystemOfMeasurement::toString))
+                    .toArray(SystemOfMeasurement[]::new));
 
     /**
@@ -359 +358 @@
                 .ifPresent(coordinatesCombo::setSelectedIndex);
 
-        IntStream.range(0, unitsValues.length)
-                .filter(i -> unitsValues[i].equals(SystemOfMeasurement.PROP_SYSTEM_OF_MEASUREMENT.get())).findFirst()
-                .ifPresent(unitsCombo::setSelectedIndex);
+        unitsCombo.setSelectedItem(SystemOfMeasurement.getSystemOfMeasurement());
 
         projPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
@@ -448 +445 @@
         }
 
-        int i = unitsCombo.getSelectedIndex();
-        SystemOfMeasurement.setSystemOfMeasurement(unitsValues[i]);
+        SystemOfMeasurement.setSystemOfMeasurement(((SystemOfMeasurement) unitsCombo.getSelectedItem()));
 
         return false;

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -546 +546 @@
         // Make sure we're using the metric system
         if (metric) {
-            SystemOfMeasurement.setSystemOfMeasurement(SystemOfMeasurement.METRIC.getName());
+            SystemOfMeasurement.setSystemOfMeasurement(SystemOfMeasurement.METRIC);
         }