Changeset 9863 in josm

Timestamp:

2016-02-23T21:14:30+01:00 (9 years ago)

Author:

simon04

Message:

see #12275 - Clarify variable name

File:

• trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified) (4 diffs)

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

@@ -93 +93 @@
 public class MapStatus extends JPanel implements Helpful, Destroyable, PreferenceChangedListener {
 
-    private static final DecimalFormat ONE_DECIMAL_PLACE = new DecimalFormat(
-            Main.pref.get("statusbar.decimal-format", "0.0")); // change of preference requires restart
-    private static final double DISTANCE_THRESHOLD = Main.pref.getDouble("statusbar.distance-threshold", 0.01);
+    private final DecimalFormat DECIMAL_FORMAT = new DecimalFormat(Main.pref.get("statusbar.decimal-format", "0.0"));
+    private final double DISTANCE_THRESHOLD = Main.pref.getDouble("statusbar.distance-threshold", 0.01);
 
     /**
@@ -191 +190 @@
     private final ImageLabel headingText = new ImageLabel("heading",
             tr("The (compass) heading of the line segment being drawn."),
-            ONE_DECIMAL_PLACE.format(360).length() + 1, PROP_BACKGROUND_COLOR.get());
+            DECIMAL_FORMAT.format(360).length() + 1, PROP_BACKGROUND_COLOR.get());
     private final ImageLabel angleText = new ImageLabel("angle",
             tr("The angle between the previous and the current way segment."),
-            ONE_DECIMAL_PLACE.format(360).length() + 1, PROP_BACKGROUND_COLOR.get());
+            DECIMAL_FORMAT.format(360).length() + 1, PROP_BACKGROUND_COLOR.get());
     private final ImageLabel distText = new ImageLabel("dist",
             tr("The length of the new way segment being drawn."), 10, PROP_BACKGROUND_COLOR.get());
@@ -1028 +1027 @@
 
     public void setAngle(double a) {
-        angleText.setText(a < 0 ? "--" : ONE_DECIMAL_PLACE.format(a) + " \u00B0");
+        angleText.setText(a < 0 ? "--" : DECIMAL_FORMAT.format(a) + " \u00B0");
     }
 
     public void setHeading(double h) {
-        headingText.setText(h < 0 ? "--" : ONE_DECIMAL_PLACE.format(h) + " \u00B0");
+        headingText.setText(h < 0 ? "--" : DECIMAL_FORMAT.format(h) + " \u00B0");
     }
 
@@ -1041 +1040 @@
     public void setDist(double dist) {
         distValue = dist;
-        distText.setText(dist < 0 ? "--" : NavigatableComponent.getDistText(dist, ONE_DECIMAL_PLACE, DISTANCE_THRESHOLD));
+        distText.setText(dist < 0 ? "--" : NavigatableComponent.getDistText(dist, DECIMAL_FORMAT, DISTANCE_THRESHOLD));
     }