Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

Timestamp:

2024-04-22T20:59:26+02:00 (6 weeks ago)

Author:

taylor.smock

Message:

Revert most var changes from r19048, fix most new compile warnings and checkstyle issues

Also, document why various ErrorProne checks were originally disabled and fix
generic SonarLint issues.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -119 +119 @@
     private boolean destroyed;
 
-    private class UpdateImageThread extends Thread {
+    private final class UpdateImageThread extends Thread {
         private boolean restart;
 
@@ -146 +146 @@
         if (e == null ||
             e.getKey().equals(AGPIFO_STYLE.getKey())) {
-            dragButton = AGPIFO_STYLE.get() ? 1 : 3;
+            dragButton = Boolean.TRUE.equals(AGPIFO_STYLE.get()) ? 1 : 3;
             zoomButton = dragButton == 1 ? 3 : 1;
         }
@@ -320 +320 @@
     }
 
-    private class ImgDisplayMouseListener extends MouseAdapter {
+    private final class ImgDisplayMouseListener extends MouseAdapter {
 
         private MouseEvent lastMouseEvent;
@@ -434 +434 @@
                 return;
 
-            if (ZOOM_ON_CLICK.get()) {
+            if (Boolean.TRUE.equals(ZOOM_ON_CLICK.get())) {
                 // click notions are less coherent than wheel, refresh mousePointInImg on each click
                 lastMouseEvent = null;