Changeset 12735 in josm for trunk/src/org/openstreetmap/josm/gui/MapStatus.java
- Timestamp:
- 2017-09-05T17:58:01+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MapStatus.java
r12675 r12735 60 60 import org.openstreetmap.josm.data.SystemOfMeasurement; 61 61 import org.openstreetmap.josm.data.SystemOfMeasurement.SoMChangeListener; 62 import org.openstreetmap.josm.data.coor.CoordinateFormat;63 62 import org.openstreetmap.josm.data.coor.LatLon; 63 import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager; 64 import org.openstreetmap.josm.data.coor.conversion.DMSCoordinateFormat; 65 import org.openstreetmap.josm.data.coor.conversion.ICoordinateFormat; 66 import org.openstreetmap.josm.data.coor.conversion.ProjectedCoordinateFormat; 64 67 import org.openstreetmap.josm.data.osm.DataSet; 65 68 import org.openstreetmap.josm.data.osm.DefaultNameFormatter; … … 210 213 } 211 214 212 /** The {@link CoordinateFormat} set in the previous update */213 private transient CoordinateFormat previousCoordinateFormat;215 /** The {@link ICoordinateFormat} set in the previous update */ 216 private transient ICoordinateFormat previousCoordinateFormat; 214 217 private final ImageLabel latText = new ImageLabel("lat", 215 null, LatLon.SOUTH_POLE.latToString(CoordinateFormat.DEGREES_MINUTES_SECONDS).length(), PROP_BACKGROUND_COLOR.get());218 null, DMSCoordinateFormat.INSTANCE.latToString(LatLon.SOUTH_POLE).length(), PROP_BACKGROUND_COLOR.get()); 216 219 private final ImageLabel lonText = new ImageLabel("lon", 217 null, new LatLon(0, 180).lonToString(CoordinateFormat.DEGREES_MINUTES_SECONDS).length(), PROP_BACKGROUND_COLOR.get());220 null, DMSCoordinateFormat.INSTANCE.lonToString(new LatLon(0, 180)).length(), PROP_BACKGROUND_COLOR.get()); 218 221 private final ImageLabel headingText = new ImageLabel("heading", 219 222 tr("The (compass) heading of the line segment being drawn."), … … 763 766 /** Icons for selecting {@link SystemOfMeasurement} */ 764 767 private final Collection<JCheckBoxMenuItem> somItems = new ArrayList<>(); 765 /** Icons for selecting {@link CoordinateFormat} */768 /** Icons for selecting {@link ICoordinateFormat} */ 766 769 private final Collection<JCheckBoxMenuItem> coordinateFormatItems = new ArrayList<>(); 767 770 … … 787 790 add(item); 788 791 } 789 for (final CoordinateFormat format : CoordinateFormat.values()) {792 for (final ICoordinateFormat format : CoordinateFormatManager.getCoordinateFormats()) { 790 793 JCheckBoxMenuItem item = new JCheckBoxMenuItem(new AbstractAction(format.getDisplayName()) { 791 794 @Override 792 795 public void actionPerformed(ActionEvent e) { 793 CoordinateFormat .setCoordinateFormat(format);796 CoordinateFormatManager.setCoordinateFormat(format); 794 797 } 795 798 }); … … 811 814 item.setVisible(distText.equals(invoker)); 812 815 } 813 final String currentCorrdinateFormat = CoordinateFormat .getDefaultFormat().getDisplayName();816 final String currentCorrdinateFormat = CoordinateFormatManager.getDefaultFormat().getDisplayName(); 814 817 for (JMenuItem item : coordinateFormatItems) { 815 818 item.setSelected(currentCorrdinateFormat.equals(item.getText())); … … 873 876 // Do not update the view if ctrl is pressed. 874 877 if ((e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) == 0) { 875 CoordinateFormat mCord = CoordinateFormat.getDefaultFormat();878 ICoordinateFormat mCord = CoordinateFormatManager.getDefaultFormat(); 876 879 LatLon p = mv.getLatLon(e.getX(), e.getY()); 877 latText.setText( p.latToString(mCord));878 lonText.setText( p.lonToString(mCord));880 latText.setText(mCord.latToString(p)); 881 lonText.setText(mCord.lonToString(p)); 879 882 if (Objects.equals(previousCoordinateFormat, mCord)) { 880 883 // do nothing 881 } else if ( CoordinateFormat.EAST_NORTH.equals(mCord)) {884 } else if (ProjectedCoordinateFormat.INSTANCE.equals(mCord)) { 882 885 latText.setIcon("northing"); 883 886 lonText.setIcon("easting");
Note:
See TracChangeset
for help on using the changeset viewer.