Changeset 32724 in osm for applications/viewer/jmapviewer/src

Timestamp:

2016-07-26T22:39:12+02:00 (8 years ago)

Author:

donvip

Message:

error-prone - fix warning OperatorPrecedence + javadoc

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java (modified) (7 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java

@@ -37 +37 @@
     private boolean doubleClickZoomEnabled = true;
 
+    /**
+     * Constructs a new {@code DefaultMapController}.
+     * @param map map panel
+     */
     public DefaultMapController(JMapViewer map) {
         super(map);
@@ -47 +51 @@
         // Is only the selected mouse button pressed?
         if ((e.getModifiersEx() & MOUSE_BUTTONS_MASK) == movementMouseButtonMask
-                || isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK) {
+                || (isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK)) {
             Point p = e.getPoint();
             if (lastDragPoint != null) {
@@ -67 +71 @@
     @Override
     public void mousePressed(MouseEvent e) {
-        if (e.getButton() == movementMouseButton || isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK) {
+        if (e.getButton() == movementMouseButton || (isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK)) {
             lastDragPoint = null;
             isMoving = true;
@@ -75 +79 @@
     @Override
     public void mouseReleased(MouseEvent e) {
-        if (e.getButton() == movementMouseButton || isPlatformOsx() && e.getButton() == MouseEvent.BUTTON1) {
+        if (e.getButton() == movementMouseButton || (isPlatformOsx() && e.getButton() == MouseEvent.BUTTON1)) {
             lastDragPoint = null;
             isMoving = false;
@@ -89 +93 @@
     }
 
+    /**
+     * Determines if the map pane is allowed to be moved using the mouse
+     * @return {@code true} to allow the map pane to be moved using the mouse
+     */
     public boolean isMovementEnabled() {
         return movementEnabled;
@@ -151 +159 @@
     @Override
     public void mouseEntered(MouseEvent e) {
+        // do nothing
     }
 
     @Override
     public void mouseExited(MouseEvent e) {
+        // do nothing
     }
 
@@ -174 +184 @@
                 lastDragPoint = p;
             }
-
         }
-
     }