Changeset 11893 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2017-04-13T01:08:58+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1126 - Return of boolean expressions should not be wrapped into an "if-then-else" statement

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• Changeset.java (modified) (1 diff)
• OsmPrimitive.java (modified) (1 diff)
• WaySegment.java (modified) (1 diff)
• visitor/paint/StyledMapRenderer.java (modified) (1 diff)

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

@@ -380 +380 @@
         } else if (!user.equals(other.user))
             return false;
-        if (commentsCount != other.commentsCount) {
-            return false;
-        }
-        return true;
+        return commentsCount == other.commentsCount;
     }
 

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

@@ -1152 +1152 @@
         if (!isNew() && id != other.id)
             return false;
-        if (isIncomplete() ^ other.isIncomplete()) // exclusive or operator for performance (see #7159)
-            return false;
-        return true;
+        return !(isIncomplete() ^ other.isIncomplete()); // exclusive or operator for performance (see #7159)
     }
 

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

@@ -121 +121 @@
      */
     public boolean isSimilar(WaySegment s2) {
-        if (getFirstNode().equals(s2.getFirstNode()) && getSecondNode().equals(s2.getSecondNode()))
-            return true;
-        if (getFirstNode().equals(s2.getSecondNode()) && getSecondNode().equals(s2.getFirstNode()))
-            return true;
-        return false;
+        return (getFirstNode().equals(s2.getFirstNode()) && getSecondNode().equals(s2.getSecondNode()))
+            || (getFirstNode().equals(s2.getSecondNode()) && getSecondNode().equals(s2.getFirstNode()));
     }
 

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

@@ -1454 +1454 @@
         if (bounds.isEmpty()) return false;
         MapViewPoint p = mapState.getPointFor(new EastNorth(bounds.getX(), bounds.getY()));
-        if (p.getInViewX() > mapState.getViewWidth()) return false;
-        if (p.getInViewY() < 0) return false;
+        if (p.getInViewY() < 0 || p.getInViewX() > mapState.getViewWidth()) return false;
         p = mapState.getPointFor(new EastNorth(bounds.getX() + bounds.getWidth(), bounds.getY() + bounds.getHeight()));
-        if (p.getInViewX() < 0) return false;
-        if (p.getInViewY() > mapState.getViewHeight()) return false;
-        return true;
-    }
-
+        return p.getInViewX() >= 0 && p.getInViewY() <= mapState.getViewHeight();
+    }
+
+    /**
+     * Determines if the paint visitor shall render OSM objects such that they look inactive.
+     * @return {@code true} if the paint visitor shall render OSM objects such that they look inactive
+     */
     public boolean isInactiveMode() {
         return isInactiveMode;