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

Timestamp:

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

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

@@ -79 +79 @@
      * @author Michael Zangl
      */
-    private class SelectionHintLayer extends AbstractMapViewPaintable {
+    private final class SelectionHintLayer extends AbstractMapViewPaintable {
         @Override
         public void paint(Graphics2D g, MapView mv, Bounds bbox) {
@@ -186 +186 @@
         if (e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() > 1 && MainApplication.getLayerManager().getActiveDataSet() != null) {
             SelectByInternalPointAction.performSelection(MainApplication.getMap().mapView.getEastNorth(e.getX(), e.getY()),
-                    (e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) != 0,
+                    (e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) != 0,
                     (e.getModifiersEx() & PlatformManager.getPlatform().getMenuShortcutKeyMaskEx()) != 0);
         } else if (e.getButton() == MouseEvent.BUTTON1) {
@@ -201 +201 @@
     @Override
     public void mouseDragged(MouseEvent e) {
-        int buttonPressed = e.getModifiersEx() & (MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON3_DOWN_MASK);
+        int buttonPressed = e.getModifiersEx() & (InputEvent.BUTTON1_DOWN_MASK | InputEvent.BUTTON3_DOWN_MASK);
 
         if (buttonPressed != 0) {
@@ -210 +210 @@
         }
 
-        if (buttonPressed == MouseEvent.BUTTON1_DOWN_MASK) {
+        if (buttonPressed == InputEvent.BUTTON1_DOWN_MASK) {
             mousePos = e.getPoint();
             addLassoPoint(e.getPoint());
             selectionAreaChanged();
-        } else if (buttonPressed == (MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON3_DOWN_MASK)) {
+        } else if (buttonPressed == (InputEvent.BUTTON1_DOWN_MASK | InputEvent.BUTTON3_DOWN_MASK)) {
             moveSelection(e.getX()-mousePos.x, e.getY()-mousePos.y);
             mousePos = e.getPoint();
@@ -253 +253 @@
 
         // Left mouse was released while right is still pressed.
-        boolean rightMouseStillPressed = (e.getModifiersEx() & MouseEvent.BUTTON3_DOWN_MASK) != 0;
+        boolean rightMouseStillPressed = (e.getModifiersEx() & InputEvent.BUTTON3_DOWN_MASK) != 0;
 
         if (!rightMouseStillPressed) {
@@ -317 +317 @@
     @Override
     public void propertyChange(PropertyChangeEvent evt) {
-        if ("active".equals(evt.getPropertyName()) && !(Boolean) evt.getNewValue()) {
+        if ("active".equals(evt.getPropertyName()) && Boolean.FALSE.equals(evt.getNewValue())) {
             abortSelecting();
         }