Changeset 14775 in josm for trunk/src

Timestamp:

2019-02-09T21:02:50+01:00 (6 years ago)

Author:

GerdP

Message:

fix some new sonar issues

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java

@@ -250 +250 @@
         Node n = way.getNode(nodePos);
         int oneway = way.isOneway();
-        if (oneway == 0) {
-            if ("roundabout".equals(way.get("junction"))) {
-                oneway = 1;
-            }
+        if (oneway == 0 && "roundabout".equals(way.get("junction"))) {
+            oneway = 1;
         }
 
@@ -291 +289 @@
     private static boolean onlySharpAngle(Node common, Node from, Way toWay) {
         int oneway = toWay.isOneway();
-        if (oneway == 0) {
-            if ("roundabout".equals(toWay.get("junction"))) {
-                oneway = 1;
-            }
+        if (oneway == 0 && "roundabout".equals(toWay.get("junction"))) {
+            oneway = 1;
         }