Changeset 10244 in josm for trunk/src

Timestamp:

2016-05-17T17:58:09+02:00 (9 years ago)

Author:

Don-vip

Message:

findbugs - BIT_SIGNED_CHECK

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/LineClip.java (modified) (1 diff)
• gui/ScrollViewport.java (modified) (4 diffs)
• gui/SelectionManager.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java

@@ -85 +85 @@
                 done = true;
             } else {
-                long x = 0, y = 0;
+                long x = 0;
+                long y = 0;
                 outcodeOut = outcode0 != 0 ? outcode0 : outcode1;
-                if ((outcodeOut & OUT_TOP) > 0) {
+                if ((outcodeOut & OUT_TOP) != 0) {
                     x = x1 + (x2 - x1) * (ymax - y1)/(y2 - y1);
                     y = ymax;
-                } else if ((outcodeOut & OUT_BOTTOM) > 0) {
+                } else if ((outcodeOut & OUT_BOTTOM) != 0) {
                     x = x1 + (x2 - x1) * (ymin - y1)/(y2 - y1);
                     y = ymin;
-                } else if ((outcodeOut & OUT_RIGHT) > 0) {
+                } else if ((outcodeOut & OUT_RIGHT) != 0) {
                     y = y1 + (y2 - y1) * (xmax - x1)/(x2 - x1);
                     x = xmax;
-                } else if ((outcodeOut & OUT_LEFT) > 0) {
+                } else if ((outcodeOut & OUT_LEFT) != 0) {
                     y = y1 + (y2 - y1) * (xmin - x1)/(x2 - x1);
                     x = xmin;

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

@@ -90 +90 @@
 
         // UP
-        if ((direction & UP_DIRECTION) > 0) {
+        if ((direction & UP_DIRECTION) != 0) {
             button = new JButton();
             button.addMouseListener(new ScrollViewPortMouseListener(UP_DIRECTION));
@@ -100 +100 @@
 
         // DOWN
-        if ((direction & DOWN_DIRECTION) > 0) {
+        if ((direction & DOWN_DIRECTION) != 0) {
             button = new JButton();
             button.addMouseListener(new ScrollViewPortMouseListener(DOWN_DIRECTION));
@@ -110 +110 @@
 
         // LEFT
-        if ((direction & LEFT_DIRECTION) > 0) {
+        if ((direction & LEFT_DIRECTION) != 0) {
             button = new JButton();
             button.addMouseListener(new ScrollViewPortMouseListener(LEFT_DIRECTION));
@@ -120 +120 @@
 
         // RIGHT
-        if ((direction & RIGHT_DIRECTION) > 0) {
+        if ((direction & RIGHT_DIRECTION) != 0) {
             button = new JButton();
             button.addMouseListener(new ScrollViewPortMouseListener(RIGHT_DIRECTION));

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

@@ -201 +201 @@
         if (e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() > 1 && Main.main.getCurrentDataSet() != null) {
             SelectByInternalPointAction.performSelection(Main.map.mapView.getEastNorth(e.getX(), e.getY()),
-                    (e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) > 0,
-                    (e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) > 0);
+                    (e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) != 0,
+                    (e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) != 0);
         } else if (e.getButton() == MouseEvent.BUTTON1) {
             mousePosStart = mousePos = e.getPoint();