Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/gui/MapMover.java

Timestamp:

2024-04-22T20:59:26+02:00 (4 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/MapMover.java (modified) (6 diffs)

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

@@ -7 +7 @@
 import java.awt.Point;
 import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
@@ -88 +89 @@
                 EastNorth center = nc.getCenter();
                 EastNorth newcenter = nc.getEastNorth(nc.getWidth()/2+nc.getWidth()/5, nc.getHeight()/2+nc.getHeight()/5);
-                switch(action) {
+                switch (action) {
                 case "left":
                     nc.zoomTo(new EastNorth(2*center.east()-newcenter.east(), center.north()));
@@ -173 +174 @@
     @Override
     public void mouseDragged(MouseEvent e) {
-        int offMask = MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON2_DOWN_MASK;
-        boolean allowMovement = (e.getModifiersEx() & (MouseEvent.BUTTON3_DOWN_MASK | offMask)) == MouseEvent.BUTTON3_DOWN_MASK;
+        int offMask = InputEvent.BUTTON1_DOWN_MASK | InputEvent.BUTTON2_DOWN_MASK;
+        boolean allowMovement = (e.getModifiersEx() & (InputEvent.BUTTON3_DOWN_MASK | offMask)) == InputEvent.BUTTON3_DOWN_MASK;
         if (PlatformManager.isPlatformOsx()) {
             MapFrame map = MainApplication.getMap();
-            int macMouseMask = MouseEvent.CTRL_DOWN_MASK | MouseEvent.BUTTON1_DOWN_MASK;
+            int macMouseMask = InputEvent.CTRL_DOWN_MASK | InputEvent.BUTTON1_DOWN_MASK;
             boolean macMovement = e.getModifiersEx() == macMouseMask;
             boolean allowedMode = !map.mapModeSelect.equals(map.mapMode)
@@ -204 +205 @@
     @Override
     public void mousePressed(MouseEvent e) {
-        int offMask = MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON2_DOWN_MASK;
-        int macMouseMask = MouseEvent.CTRL_DOWN_MASK | MouseEvent.BUTTON1_DOWN_MASK;
+        int offMask = InputEvent.BUTTON1_DOWN_MASK | InputEvent.BUTTON2_DOWN_MASK;
+        int macMouseMask = InputEvent.CTRL_DOWN_MASK | InputEvent.BUTTON1_DOWN_MASK;
         if ((e.getButton() == MouseEvent.BUTTON3 && (e.getModifiersEx() & offMask) == 0) ||
                 (PlatformManager.isPlatformOsx() && e.getModifiersEx() == macMouseMask)) {
@@ -253 +254 @@
     @Override
     public void mouseWheelMoved(MouseWheelEvent e) {
-        int rotation = PROP_ZOOM_REVERSE_WHEEL.get() ? -e.getWheelRotation() : e.getWheelRotation();
+        int rotation = Boolean.TRUE.equals(PROP_ZOOM_REVERSE_WHEEL.get()) ? -e.getWheelRotation() : e.getWheelRotation();
         nc.zoomManyTimes(e.getX(), e.getY(), rotation);
     }
@@ -268 +269 @@
         // Is only the selected mouse button pressed?
         if (PlatformManager.isPlatformOsx()) {
-            if (e.getModifiersEx() == MouseEvent.CTRL_DOWN_MASK) {
+            if (e.getModifiersEx() == InputEvent.CTRL_DOWN_MASK) {
                 doMoveForDrag(e);
             } else {