Changeset 11452 in josm for trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

Timestamp:

2017-01-12T01:24:40+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - fb-contrib:SEO_SUBOPTIMAL_EXPRESSION_ORDER - Performance - Method orders expressions in a conditional in a sub optimal way

File:

• trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -175 +175 @@
         SystemOfMeasurement som = SystemOfMeasurement.getSystemOfMeasurement();
         velocityScale.addTitle(tr("Velocity, {0}", som.speedName));
-        if (Main.isDisplayingMapView() && oldSoM != null && newSoM != null) {
+        if (oldSoM != null && newSoM != null && Main.isDisplayingMapView()) {
             Main.map.mapView.repaint();
         }
@@ -1167 +1167 @@
      */
     private void checkCache() {
-        if ((computeCacheMaxLineLengthUsed != maxLineLength) || (!neutralColor.equals(computeCacheColorUsed))
-                || (computeCacheColored != colored) || (computeCacheColorTracksTune != colorTracksTune)
+        if ((computeCacheMaxLineLengthUsed != maxLineLength)
+                || (computeCacheColored != colored)
+                || (computeCacheColorTracksTune != colorTracksTune)
                 || (computeCacheColorDynamic != colorModeDynamic)
                 || (computeCacheHeatMapDrawColorTableIdx != heatMapDrawColorTableIdx)
+                || (!neutralColor.equals(computeCacheColorUsed))
       ) {
             computeCacheMaxLineLengthUsed = maxLineLength;