Changeset 12735 in josm for trunk/src/org/openstreetmap/josm/gui/MapStatus.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/gui/MapStatus.java (modified) (6 diffs)

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

@@ -60 +60 @@
 import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.SystemOfMeasurement.SoMChangeListener;
-import org.openstreetmap.josm.data.coor.CoordinateFormat;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
+import org.openstreetmap.josm.data.coor.conversion.DMSCoordinateFormat;
+import org.openstreetmap.josm.data.coor.conversion.ICoordinateFormat;
+import org.openstreetmap.josm.data.coor.conversion.ProjectedCoordinateFormat;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
@@ -210 +213 @@
     }
 
-    /** The {@link CoordinateFormat} set in the previous update */
-    private transient CoordinateFormat previousCoordinateFormat;
+    /** The {@link ICoordinateFormat} set in the previous update */
+    private transient ICoordinateFormat previousCoordinateFormat;
     private final ImageLabel latText = new ImageLabel("lat",
-            null, LatLon.SOUTH_POLE.latToString(CoordinateFormat.DEGREES_MINUTES_SECONDS).length(), PROP_BACKGROUND_COLOR.get());
+            null, DMSCoordinateFormat.INSTANCE.latToString(LatLon.SOUTH_POLE).length(), PROP_BACKGROUND_COLOR.get());
     private final ImageLabel lonText = new ImageLabel("lon",
-            null, new LatLon(0, 180).lonToString(CoordinateFormat.DEGREES_MINUTES_SECONDS).length(), PROP_BACKGROUND_COLOR.get());
+            null, DMSCoordinateFormat.INSTANCE.lonToString(new LatLon(0, 180)).length(), PROP_BACKGROUND_COLOR.get());
     private final ImageLabel headingText = new ImageLabel("heading",
             tr("The (compass) heading of the line segment being drawn."),
@@ -763 +766 @@
         /** Icons for selecting {@link SystemOfMeasurement} */
         private final Collection<JCheckBoxMenuItem> somItems = new ArrayList<>();
-        /** Icons for selecting {@link CoordinateFormat}  */
+        /** Icons for selecting {@link ICoordinateFormat}  */
         private final Collection<JCheckBoxMenuItem> coordinateFormatItems = new ArrayList<>();
 
@@ -787 +790 @@
                 add(item);
             }
-            for (final CoordinateFormat format : CoordinateFormat.values()) {
+            for (final ICoordinateFormat format : CoordinateFormatManager.getCoordinateFormats()) {
                 JCheckBoxMenuItem item = new JCheckBoxMenuItem(new AbstractAction(format.getDisplayName()) {
                     @Override
                     public void actionPerformed(ActionEvent e) {
-                        CoordinateFormat.setCoordinateFormat(format);
+                        CoordinateFormatManager.setCoordinateFormat(format);
                     }
                 });
@@ -811 +814 @@
                         item.setVisible(distText.equals(invoker));
                     }
-                    final String currentCorrdinateFormat = CoordinateFormat.getDefaultFormat().getDisplayName();
+                    final String currentCorrdinateFormat = CoordinateFormatManager.getDefaultFormat().getDisplayName();
                     for (JMenuItem item : coordinateFormatItems) {
                         item.setSelected(currentCorrdinateFormat.equals(item.getText()));
@@ -873 +876 @@
                 // Do not update the view if ctrl is pressed.
                 if ((e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) == 0) {
-                    CoordinateFormat mCord = CoordinateFormat.getDefaultFormat();
+                    ICoordinateFormat mCord = CoordinateFormatManager.getDefaultFormat();
                     LatLon p = mv.getLatLon(e.getX(), e.getY());
-                    latText.setText(p.latToString(mCord));
-                    lonText.setText(p.lonToString(mCord));
+                    latText.setText(mCord.latToString(p));
+                    lonText.setText(mCord.lonToString(p));
                     if (Objects.equals(previousCoordinateFormat, mCord)) {
                         // do nothing
-                    } else if (CoordinateFormat.EAST_NORTH.equals(mCord)) {
+                    } else if (ProjectedCoordinateFormat.INSTANCE.equals(mCord)) {
                         latText.setIcon("northing");
                         lonText.setIcon("easting");