Changeset 12846 in josm for trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java

Timestamp:

2017-09-13T23:24:50+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - use Config.getPref() wherever possible

File:

• trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java (modified) (3 diffs)

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

@@ -12 +12 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.preferences.StringProperty;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -230 +230 @@
     public String getDistText(final double dist, final NumberFormat format, final double threshold) {
         double a = dist / aValue;
-        if (a > bValue / aValue && !Main.pref.getBoolean("system_of_measurement.use_only_lower_unit", false))
+        if (a > bValue / aValue && !Config.getPref().getBoolean("system_of_measurement.use_only_lower_unit", false))
             return formatText(dist / bValue, bName, format);
         else if (a < threshold)
@@ -258 +258 @@
     public String getAreaText(final double area, final NumberFormat format, final double threshold) {
         double a = area / (aValue*aValue);
-        boolean lowerOnly = Main.pref.getBoolean("system_of_measurement.use_only_lower_unit", false);
-        boolean customAreaOnly = Main.pref.getBoolean("system_of_measurement.use_only_custom_area_unit", false);
+        boolean lowerOnly = Config.getPref().getBoolean("system_of_measurement.use_only_lower_unit", false);
+        boolean customAreaOnly = Config.getPref().getBoolean("system_of_measurement.use_only_custom_area_unit", false);
         if ((!lowerOnly && areaCustomValue > 0 && a > areaCustomValue / (aValue*aValue)
                 && a < (bValue*bValue) / (aValue*aValue)) || customAreaOnly)