Changeset 12735 in josm for trunk/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java

Timestamp:

2017-09-05T17:58:01+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - move CoordinateFormat code out of LatLon class

File:

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

trunk/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
+import org.openstreetmap.josm.data.coor.conversion.DMSCoordinateFormat;
+import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat;
+import org.openstreetmap.josm.data.coor.conversion.ICoordinateFormat;
+import org.openstreetmap.josm.data.coor.conversion.NauticalCoordinateFormat;
+import org.openstreetmap.josm.data.coor.conversion.ProjectedCoordinateFormat;
+
 /**
  * An enumeration  of coordinate formats
  * @since 1990
+ * @deprecated use {@link CoordinateFormatManager}
  */
+@Deprecated
 public enum CoordinateFormat {
 
@@ -13 +22 @@
      * the decimal format 999.999
      */
-    DECIMAL_DEGREES(tr("Decimal Degrees")),
+    DECIMAL_DEGREES(tr("Decimal Degrees"), DecimalDegreesCoordinateFormat.INSTANCE),
 
     /**
      * the degrees/minutes/seconds format 9 deg 99 min 99 sec
      */
-    DEGREES_MINUTES_SECONDS(tr("deg\u00B0 min'' sec\"")),
+    DEGREES_MINUTES_SECONDS(tr("deg\u00B0 min'' sec\""), DMSCoordinateFormat.INSTANCE),
 
     /**
      * the nautical format
      */
-    NAUTICAL(tr("deg\u00B0 min'' (Nautical)")),
+    NAUTICAL(tr("deg\u00B0 min'' (Nautical)"), NauticalCoordinateFormat.INSTANCE),
 
     /**
      * coordinates East/North
      */
-    EAST_NORTH(tr("Projected Coordinates"));
+    EAST_NORTH(tr("Projected Coordinates"), ProjectedCoordinateFormat.INSTANCE);
 
     private final String displayName;
+    private final ICoordinateFormat migration;
 
-    CoordinateFormat(String displayName) {
+    CoordinateFormat(String displayName, ICoordinateFormat migration) {
         this.displayName = displayName;
+        this.migration = migration;
     }
 
@@ -43 +54 @@
     public String getDisplayName() {
         return displayName;
+    }
+
+    /**
+     * Returns the corresponding {@link ICoordinateFormat} instance for
+     * migration.
+     * @return the corresponding {@link ICoordinateFormat} instance for
+     * migration
+     */
+    public ICoordinateFormat getICoordinateFormat() {
+        return migration;
     }