Changeset 10670 in josm

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

Files:

• data/validation/tests/CrossingWays.java (modified) (1 diff)
• gui/MapMover.java (modified) (1 diff)
• gui/conflict/tags/MultiValueCellEditor.java (modified) (1 diff)
• gui/history/TagTableCellRenderer.java (modified) (1 diff)
• gui/history/TwoColumnDiff.java (modified) (1 diff)
• gui/mappaint/mapcss/ExpressionFactory.java (modified) (2 diffs)
• gui/mappaint/mapcss/Selector.java (modified) (2 diffs)
• gui/tagging/presets/items/MultiSelect.java (modified) (1 diff)
• io/imagery/WMSImagery.java (modified) (1 diff)

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

@@ -242 +242 @@
                     List<WaySegment> highlight;
 
-                    if (errorSegments.contains(es1) && errorSegments.contains(es2)
+                    if ((errorSegments.contains(es1) && errorSegments.contains(es2))
                             || !es1.intersects(es2)
                             || ignoreWaySegmentCombination(es1.way, es2.way)) {

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

@@ -183 +183 @@
         int offMask = MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON2_DOWN_MASK;
         int macMouseMask = MouseEvent.CTRL_DOWN_MASK | MouseEvent.BUTTON1_DOWN_MASK;
-        if (e.getButton() == MouseEvent.BUTTON3 && (e.getModifiersEx() & offMask) == 0 ||
-                Main.isPlatformOsx() && e.getModifiersEx() == macMouseMask) {
+        if ((e.getButton() == MouseEvent.BUTTON3 && (e.getModifiersEx() & offMask) == 0) ||
+                (Main.isPlatformOsx() && e.getModifiersEx() == macMouseMask)) {
             startMovement(e);
         }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java

@@ -91 +91 @@
             @Override
             public void processKeyEvent(KeyEvent e) {
-                int keyCode = e.getKeyCode();
-                if (e.getID() == KeyEvent.KEY_PRESSED && keyCode == KeyEvent.VK_ENTER) {
-                    fireGotoNextDecision();
-                } else if (e.getID() == KeyEvent.KEY_PRESSED && keyCode == KeyEvent.VK_TAB) {
-                    if (e.isShiftDown()) {
-                        fireGotoPreviousDecision();
-                    } else {
+                if (e.getID() == KeyEvent.KEY_PRESSED) {
+                    int keyCode = e.getKeyCode();
+                    if (keyCode == KeyEvent.VK_ENTER) {
                         fireGotoNextDecision();
+                    } else if (keyCode == KeyEvent.VK_TAB) {
+                        if (e.isShiftDown()) {
+                            fireGotoPreviousDecision();
+                        } else {
+                            fireGotoNextDecision();
+                        }
+                    } else if (keyCode == KeyEvent.VK_DELETE || keyCode == KeyEvent.VK_BACK_SPACE) {
+                        if (editorModel.getIndexOf(MultiValueDecisionType.KEEP_NONE) > 0) {
+                            editorModel.setSelectedItem(MultiValueDecisionType.KEEP_NONE);
+                            fireGotoNextDecision();
+                        }
+                    } else if (keyCode == KeyEvent.VK_ESCAPE) {
+                        cancelCellEditing();
                     }
-                } else if (e.getID() == KeyEvent.KEY_PRESSED && keyCode == KeyEvent.VK_DELETE || keyCode == KeyEvent.VK_BACK_SPACE) {
-                    if (editorModel.getIndexOf(MultiValueDecisionType.KEEP_NONE) > 0) {
-                        editorModel.setSelectedItem(MultiValueDecisionType.KEEP_NONE);
-                        fireGotoNextDecision();
-                    }
-                } else if (e.getID() == KeyEvent.KEY_PRESSED && keyCode == KeyEvent.VK_ESCAPE) {
-                    cancelCellEditing();
                 }
                 super.processKeyEvent(e);

trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java

@@ -36 +36 @@
             boolean isValue) {
         Color bgColor = UIManager.getColor("Table.background");
-        if (!model.hasTag(key) && model.isCurrentPointInTime()
-                || !model.oppositeHasTag(key) && model.isReferencePointInTime()) {
+        if ((!model.hasTag(key) && model.isCurrentPointInTime())
+                || (!model.oppositeHasTag(key) && model.isReferencePointInTime())) {
             bgColor = TwoColumnDiff.Item.DiffItemType.DELETED.getColor();
-        } else if (!model.oppositeHasTag(key) && model.isCurrentPointInTime()
-                || !model.hasTag(key) && model.isReferencePointInTime()) {
+        } else if ((!model.oppositeHasTag(key) && model.isCurrentPointInTime())
+                || (!model.hasTag(key) && model.isReferencePointInTime())) {
             bgColor = TwoColumnDiff.Item.DiffItemType.INSERTED.getColor();
         } else if (isValue && model.hasTag(key) && model.oppositeHasTag(key) && !model.hasSameValueAsOpposite(key)) {

trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java

@@ -79 +79 @@
         Diff.Change scriptReversed = new Diff(referenceReversed, current).diff_2(false);
         if (scriptReversed == null /* reference and current are identical */
-                || script != null && scriptReversed.getTotalNumberOfChanges() < script.getTotalNumberOfChanges()) {
+                || (script != null && scriptReversed.getTotalNumberOfChanges() < script.getTotalNumberOfChanges())) {
             this.referenceReversed = true;
             twoColumnDiffFromScript(scriptReversed, referenceReversed, current, true);

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;
                     }

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelect.java

@@ -34 +34 @@
             originalValue = usage.getFirst();
             list.setSelectedItem(originalValue);
-        } else if (def != null && !usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
+        } else if ((def != null && !usage.hadKeys()) || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
             originalValue = DIFFERENT;
             list.setSelectedItem(def);

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -269 +269 @@
         return ImageIO.getImageReadersByMIMEType(format).hasNext()
                 // handles image/tiff image/tiff8 image/geotiff image/geotiff8
-                || (format.startsWith("image/tiff") || format.startsWith("image/geotiff"))
-                        && ImageIO.getImageReadersBySuffix("tiff").hasNext()
-                || format.startsWith("image/png") && ImageIO.getImageReadersBySuffix("png").hasNext()
-                || format.startsWith("image/svg") && ImageIO.getImageReadersBySuffix("svg").hasNext()
-                || format.startsWith("image/bmp") && ImageIO.getImageReadersBySuffix("bmp").hasNext();
+                || ((format.startsWith("image/tiff") || format.startsWith("image/geotiff"))
+                        && ImageIO.getImageReadersBySuffix("tiff").hasNext())
+                || (format.startsWith("image/png") && ImageIO.getImageReadersBySuffix("png").hasNext())
+                || (format.startsWith("image/svg") && ImageIO.getImageReadersBySuffix("svg").hasNext())
+                || (format.startsWith("image/bmp") && ImageIO.getImageReadersBySuffix("bmp").hasNext());
     }