Changeset 17666 in josm for trunk

Timestamp:

2021-03-25T21:50:07+01:00 (4 years ago)

Author:

simon04

Message:

see #20101 - Separate MapStatus.setAngle/setAngleNaN for plugin compatibility

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (1 diff)
• actions/mapmode/SelectAction.java (modified) (1 diff)
• gui/MapStatus.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -900 +900 @@
     static void showStatusInfo(double angle, double hdg, double distance, boolean activeFlag) {
         MapFrame map = MainApplication.getMap();
-        map.statusLine.setAngle(angle);
+        map.statusLine.setAngleNaN(angle);
         map.statusLine.activateAnglePanel(activeFlag);
         map.statusLine.setHeading(hdg);

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -772 +772 @@
                 if (c instanceof RotateCommand) {
                     double angle = Utils.toDegrees(((RotateCommand) c).getRotationAngle());
-                    MainApplication.getMap().statusLine.setAngle(angle);
+                    MainApplication.getMap().statusLine.setAngleNaN(angle);
                 } else if (c instanceof ScaleCommand) {
                     // U+00D7 MULTIPLICATION SIGN

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

@@ -1085 +1085 @@
 
     /**
+     * Sets the angle to display in the angle panel. Values less than 0 yield "--".
+     * @param a The angle
+     * @see #setAngleNaN
+     * @see #setAngleText
+     */
+    public void setAngle(double a) {
+        angleText.setText(a < 0 ? "--" : DECIMAL_FORMAT.format(a) + " \u00B0");
+    }
+
+    /**
      * Sets the angle to display in the angle panel. NaN yields "--".
      * @param a The angle
-     */
-    public void setAngle(double a) {
+     * @see #setAngle
+     * @see #setAngleText
+     */
+    public void setAngleNaN(double a) {
         angleText.setText(!Double.isFinite(a) ? "--" : DECIMAL_FORMAT.format(a) + " \u00B0");
     }