Changeset 10670 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2016-07-29T00:02:17+02:00 (8 years ago)

Author:

Don-vip

Message:

see #12472 - fix "OperatorPrecedence" warnings

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Files:

• ExpressionFactory.java (modified) (2 diffs)
• Selector.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -884 +884 @@
             }
             final Way way = (Way) env.osm;
-            return way.isClosed() && Geometry.isClockwise(way)
-                    || !way.isClosed() && way.getNodesCount() > 2 && Geometry.angleIsClockwise(way.getNode(0), way.getNode(1), way.lastNode());
+            return (way.isClosed() && Geometry.isClockwise(way))
+                || (!way.isClosed() && way.getNodesCount() > 2 && Geometry.angleIsClockwise(way.getNode(0), way.getNode(1), way.lastNode()));
         }
 
@@ -900 +900 @@
             }
             final Way way = (Way) env.osm;
-            return way.isClosed() && !Geometry.isClockwise(way)
-                    || !way.isClosed() && way.getNodesCount() > 2 && !Geometry.angleIsClockwise(way.getNode(0), way.getNode(1), way.lastNode());
+            return (way.isClosed() && !Geometry.isClockwise(way))
+                || (!way.isClosed() && way.getNodesCount() > 2 && !Geometry.angleIsClockwise(way.getNode(0), way.getNode(1), way.lastNode()));
         }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -277 +277 @@
             public void visit(Node n) {
                 if (e.child == null && left.matches(new Environment(n).withParent(e.osm))) {
-                    if (e.osm instanceof Way && Geometry.nodeInsidePolygon(n, ((Way) e.osm).getNodes())
-                            || e.osm instanceof Relation && (
-                                    (Relation) e.osm).isMultipolygon() && Geometry.isNodeInsideMultiPolygon(n, (Relation) e.osm, null)) {
+                    if ((e.osm instanceof Way && Geometry.nodeInsidePolygon(n, ((Way) e.osm).getNodes()))
+                            || (e.osm instanceof Relation && (
+                                    (Relation) e.osm).isMultipolygon() && Geometry.isNodeInsideMultiPolygon(n, (Relation) e.osm, null))) {
                         e.child = n;
                     }
@@ -288 +288 @@
             public void visit(Way w) {
                 if (e.child == null && left.matches(new Environment(w).withParent(e.osm))) {
-                    if (e.osm instanceof Way && Geometry.PolygonIntersection.FIRST_INSIDE_SECOND.equals(
-                            Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes()))
-                            || e.osm instanceof Relation && (
+                    if ((e.osm instanceof Way && Geometry.PolygonIntersection.FIRST_INSIDE_SECOND.equals(
+                            Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes())))
+                            || (e.osm instanceof Relation && (
                                     (Relation) e.osm).isMultipolygon()
-                                    && Geometry.isPolygonInsideMultiPolygon(w.getNodes(), (Relation) e.osm, null)) {
+                                    && Geometry.isPolygonInsideMultiPolygon(w.getNodes(), (Relation) e.osm, null))) {
                         e.child = w;
                     }