Changeset 7135 in josm

Timestamp:

2014-05-17T04:49:16+02:00 (9 years ago)

Author:

simon04

Message:

Display numbers in map status line according to locale/language

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapStatus.java (modified) (6 diffs)
• NavigatableComponent.java (modified) (3 diffs)

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

@@ -27 +27 @@
 import java.awt.event.MouseMotionListener;
 import java.lang.reflect.InvocationTargetException;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -85 +86 @@
  */
 public class MapStatus extends JPanel implements Helpful, Destroyable, PreferenceChangedListener {
+
+    private static final DecimalFormat ONE_DECIMAL_PLACE = new DecimalFormat("0.0");
 
     /**
@@ -723 +726 @@
         
         private final JSeparator separator = new JSeparator();
-        
+
         private final JMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide status bar")) {
             @Override
@@ -743 +746 @@
                 add(item);
             }
-            
+
             add(separator);
             add(doNotHide);
-            
+
             addPopupMenuListener(new PopupMenuListener() {
                 @Override
@@ -947 +950 @@
 
     public void setAngle(double a) {
-        angleText.setText(a < 0 ? "--" : Math.round(a*10)/10.0 + " \u00B0");
+        angleText.setText(a < 0 ? "--" : ONE_DECIMAL_PLACE.format(a) + " \u00B0");
     }
 
     public void setHeading(double h) {
-        headingText.setText(h < 0 ? "--" : Math.round(h*10)/10.0 + " \u00B0");
+        headingText.setText(h < 0 ? "--" : ONE_DECIMAL_PLACE.format(h) + " \u00B0");
     }
 
@@ -960 +963 @@
     public void setDist(double dist) {
         distValue = dist;
-        distText.setText(dist < 0 ? "--" : NavigatableComponent.getDistText(dist));
+        distText.setText(dist < 0 ? "--" : NavigatableComponent.getDistText(dist, ONE_DECIMAL_PLACE, 0.01));
     }
 

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

@@ -10 +10 @@
 import java.awt.geom.Point2D;
 import java.nio.charset.StandardCharsets;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -195 +196 @@
 
     /**
+     * Returns the text describing the given distance in the current system of measurement.
+     * @param dist The distance in metres
+     * @param format A {@link NumberFormat} to format the area value
+     * @param threshold Values lower than this {@code threshold} are displayed as {@code "< [threshold]"}
+     * @return the text describing the given distance in the current system of measurement.
+     * @since 7135
+     */
+    public static String getDistText(final double dist, final NumberFormat format, final double threshold) {
+        return getSystemOfMeasurement().getDistText(dist, format, threshold);
+    }
+
+    /**
      * Returns the text describing the given area in the current system of measurement.
      * @param area The distance in square metres.
@@ -202 +215 @@
     public static String getAreaText(double area) {
         return getSystemOfMeasurement().getAreaText(area);
+    }
+
+    /**
+     * Returns the text describing the given area in the current system of measurement.
+     * @param area The area in square metres
+     * @param format A {@link NumberFormat} to format the area value
+     * @param threshold Values lower than this {@code threshold} are displayed as {@code "< [threshold]"}
+     * @return the text describing the given area in the current system of measurement.
+     * @since 7135
+     */
+    public static String getAreaText(final double area, final NumberFormat format, final double threshold) {
+        return getSystemOfMeasurement().getAreaText(area, format, threshold);
     }