Changeset 10655 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2016-07-27T00:07:20+02:00 (8 years ago)

Author:

Don-vip

Message:

see #12472 - fix warning "OperatorPrecedence"

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• data/osm/Storage.java (modified) (1 diff)
• data/osm/visitor/paint/MapPaintSettings.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -1408 +1408 @@
 
     private static void fireProjectionChanged(Projection oldValue, Projection newValue, Bounds oldBounds) {
-        if (newValue == null ^ oldValue == null
+        if ((newValue == null ^ oldValue == null)
                 || (newValue != null && oldValue != null && !Objects.equals(newValue.toCode(), oldValue.toCode()))) {
             if (Main.map != null) {

trunk/src/org/openstreetmap/josm/data/osm/Storage.java

@@ -275 +275 @@
      */
     private static int rehash(int h) {
-        return 1103515245*h >> 2;
+        return (1103515245*h) >> 2;
     }
 

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

@@ -151 +151 @@
      */
     public Color getSelectedColor(int alpha) {
-        return new Color(selectedColor.getRGB() & 0x00ffffff | (alpha << 24), true);
+        return new Color((selectedColor.getRGB() & 0x00ffffff) | (alpha << 24), true);
     }
 
@@ -176 +176 @@
      */
     public Color getRelationSelectedColor(int alpha) {
-        return new Color(relationSelectedColor.getRGB() & 0x00ffffff | (alpha << 24), true);
+        return new Color((relationSelectedColor.getRGB() & 0x00ffffff) | (alpha << 24), true);
     }