Changeset 12674 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2017-08-27T17:29:32+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - move PROP_SYSTEM_OF_MEASUREMENT from gui.preferences.ProjectionPreferences to data.SystemOfMeasurment

File:

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

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

@@ -13 +13 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
+import org.openstreetmap.josm.data.preferences.StringProperty;
 
 /**
  * A system of units used to express length and area measurements.
  * <p>
- * This class also manages one globally set system of measurement stored in the {@link ProjectionPreference}
+ * This class also manages one globally set system of measurement stored in the {@code ProjectionPreference}
  * @since 3406 (creation)
  * @since 6992 (extraction in this package)
  */
 public class SystemOfMeasurement {
+
+    /**
+     * Preferences entry for system of measurement.
+     * @since 12674 (moved from ProjectionPreference)
+     */
+    public static final StringProperty PROP_SYSTEM_OF_MEASUREMENT = new StringProperty("system_of_measurement", "Metric");
 
     /**
@@ -116 +122 @@
      */
     public static SystemOfMeasurement getSystemOfMeasurement() {
-        return Optional.ofNullable(SystemOfMeasurement.ALL_SYSTEMS.get(ProjectionPreference.PROP_SYSTEM_OF_MEASUREMENT.get()))
+        return Optional.ofNullable(SystemOfMeasurement.ALL_SYSTEMS.get(PROP_SYSTEM_OF_MEASUREMENT.get()))
                 .orElse(SystemOfMeasurement.METRIC);
     }
@@ -130 +136 @@
             throw new IllegalArgumentException("Invalid system of measurement: "+somKey);
         }
-        String oldKey = ProjectionPreference.PROP_SYSTEM_OF_MEASUREMENT.get();
-        if (ProjectionPreference.PROP_SYSTEM_OF_MEASUREMENT.put(somKey)) {
+        String oldKey = PROP_SYSTEM_OF_MEASUREMENT.get();
+        if (PROP_SYSTEM_OF_MEASUREMENT.put(somKey)) {
             fireSoMChanged(oldKey, somKey);
         }