Changeset 11452 in josm for trunk/src/org/openstreetmap/josm

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinAreasAction.java (modified) (1 diff)
• actions/SplitWayAction.java (modified) (1 diff)
• actions/audio/AudioPlayPauseAction.java (modified) (1 diff)
• actions/mapmode/DrawAction.java (modified) (4 diffs)
• actions/mapmode/SelectAction.java (modified) (2 diffs)
• actions/search/SearchAction.java (modified) (1 diff)
• command/conflict/CoordinateConflictResolveCommand.java (modified) (1 diff)
• command/conflict/DeletedStateConflictResolveCommand.java (modified) (1 diff)
• data/Preferences.java (modified) (2 diffs)
• data/SystemOfMeasurement.java (modified) (1 diff)
• data/imagery/TMSCachedTileLoaderJob.java (modified) (1 diff)
• data/osm/AbstractPrimitive.java (modified) (2 diffs)
• data/osm/BBox.java (modified) (1 diff)
• data/osm/OsmPrimitive.java (modified) (1 diff)
• data/osm/QuadBuckets.java (modified) (1 diff)
• data/osm/RelationMemberData.java (modified) (1 diff)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• data/osm/visitor/paint/WireframeMapRenderer.java (modified) (1 diff)
• data/validation/routines/UrlValidator.java (modified) (1 diff)
• data/validation/tests/DuplicateRelation.java (modified) (1 diff)
• data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• data/validation/tests/UnconnectedWays.java (modified) (1 diff)
• gui/NavigatableComponent.java (modified) (1 diff)
• gui/bbox/SlippyMapControler.java (modified) (1 diff)
• gui/conflict/tags/RelationMemberConflictDecision.java (modified) (1 diff)
• gui/dialogs/DialogsPanel.java (modified) (2 diffs)
• gui/dialogs/FilterTableModel.java (modified) (1 diff)
• gui/dialogs/InspectPrimitiveDialog.java (modified) (1 diff)
• gui/dialogs/MinimapDialog.java (modified) (1 diff)
• gui/dialogs/layer/LayerListTransferHandler.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (modified) (2 diffs)
• gui/io/UploadDialog.java (modified) (1 diff)
• gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (2 diffs)
• gui/layer/geoimage/ImageViewerDialog.java (modified) (1 diff)
• gui/layer/gpx/GpxDrawHelper.java (modified) (2 diffs)
• gui/layer/gpx/ImportAudioAction.java (modified) (4 diffs)
• gui/mappaint/styleelement/BoxTextElement.java (modified) (1 diff)
• gui/mappaint/styleelement/LineElement.java (modified) (1 diff)
• gui/mappaint/styleelement/RepeatImageElement.java (modified) (1 diff)
• gui/mappaint/styleelement/StyleElement.java (modified) (1 diff)
• gui/tagging/ac/AutoCompletionManager.java (modified) (1 diff)
• gui/tagging/presets/items/Check.java (modified) (1 diff)
• gui/tagging/presets/items/Combo.java (modified) (1 diff)
• gui/tagging/presets/items/ComboMultiSelect.java (modified) (1 diff)
• gui/tagging/presets/items/Text.java (modified) (1 diff)
• gui/widgets/JMultilineLabel.java (modified) (1 diff)
• io/NameFinder.java (modified) (3 diffs)
• io/imagery/ImageryReader.java (modified) (1 diff)
• io/remotecontrol/AddTagsDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -414 +414 @@
                 } else
                     continue;
-                if (candidateWay.equals(lastWay) && candidateComingToHead)
+                if (candidateComingToHead && candidateWay.equals(lastWay))
                     continue;
 

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -252 +252 @@
             list.addListSelectionListener(e -> {
                 final Way selected = list.getSelectedValue();
-                if (Main.isDisplayingMapView() && selected != null && selected.getNodesCount() > 1) {
+                if (selected != null && Main.isDisplayingMapView() && selected.getNodesCount() > 1) {
                     final Collection<WaySegment> segments = new ArrayList<>(selected.getNodesCount() - 1);
                     final Iterator<Node> it = selected.getNodes().iterator();

trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java

@@ -36 +36 @@
         URL url = AudioPlayer.url();
         try {
-            if (AudioPlayer.paused() && url != null) {
+            if (url != null && AudioPlayer.paused()) {
                 AudioPlayer.play(url);
             } else if (AudioPlayer.playing()) {

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -229 +229 @@
         // update selection to reflect which way being modified
         OsmDataLayer editLayer = getLayerManager().getEditLayer();
-        if (getCurrentBaseNode() != null && editLayer != null && !editLayer.data.selectionEmpty()) {
+        if (editLayer != null && getCurrentBaseNode() != null && !editLayer.data.selectionEmpty()) {
             DataSet currentDataSet = editLayer.data;
             Way continueFrom = getWayForNode(getCurrentBaseNode());
@@ -1124 +1124 @@
 
         // This happens when nothing is selected, but we still want to highlight the "target node"
-        if (mouseOnExistingNode == null && getLayerManager().getEditDataSet().selectionEmpty() && mousePos != null) {
+        if (mouseOnExistingNode == null && mousePos != null && getLayerManager().getEditDataSet().selectionEmpty()) {
             mouseOnExistingNode = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive::isSelectable);
         }
@@ -1161 +1161 @@
         if (Main.map.mapView == null || mousePos == null
                 // don't draw line if we don't know where from or where to
-                || getCurrentBaseNode() == null || currentMouseEastNorth == null
+                || currentMouseEastNorth == null || getCurrentBaseNode() == null
                 // don't draw line if mouse is outside window
                 || !Main.map.mapView.getBounds().contains(mousePos))
@@ -1238 +1238 @@
          * Check whether a connection will be made
          */
-        if (getCurrentBaseNode() != null && !wayIsFinished) {
+        if (!wayIsFinished && getCurrentBaseNode() != null) {
             if (alt) {
                 rv.append(' ').append(tr("Start new way from last node."));

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -586 +586 @@
 
             // Select Draw Tool if no selection has been made
-            if (getLayerManager().getEditDataSet().selectionEmpty() && !cancelDrawMode) {
+            if (!cancelDrawMode && getLayerManager().getEditDataSet().selectionEmpty()) {
                 Main.map.selectDrawTool(true);
                 updateStatusLine();
@@ -639 +639 @@
     @Override
     public void doKeyPressed(KeyEvent e) {
-        if (!Main.isDisplayingMapView() ||
-                !repeatedKeySwitchLassoOption || !getShortcut().isEvent(e)) return;
+        if (!repeatedKeySwitchLassoOption || !Main.isDisplayingMapView() || !getShortcut().isEvent(e))
+            return;
         if (Main.isDebugEnabled()) {
             Main.debug(getClass().getName()+" consuming event "+e);

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -776 +776 @@
                     mapCSSSearch == that.mapCSSSearch &&
                     allElements == that.allElements &&
-                    Objects.equals(text, that.text) &&
-                    mode == that.mode;
+                    mode == that.mode &&
+                    Objects.equals(text, that.text);
         }
 

trunk/src/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommand.java

@@ -86 +86 @@
         if (!super.equals(obj)) return false;
         CoordinateConflictResolveCommand that = (CoordinateConflictResolveCommand) obj;
-        return Objects.equals(conflict, that.conflict) &&
-                decision == that.decision;
+        return decision == that.decision && Objects.equals(conflict, that.conflict);
     }
 }

trunk/src/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommand.java

@@ -101 +101 @@
         if (!super.equals(obj)) return false;
         DeletedStateConflictResolveCommand that = (DeletedStateConflictResolveCommand) obj;
-        return Objects.equals(conflict, that.conflict) &&
-                decision == that.decision;
+        return decision == that.decision && Objects.equals(conflict, that.conflict);
     }
 }

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -444 +444 @@
         if (Main.isPlatformWindows()) {
             String appdata = System.getenv("APPDATA");
-            if (System.getenv("ALLUSERSPROFILE") != null && appdata != null
+            if (appdata != null && System.getenv("ALLUSERSPROFILE") != null
                     && appdata.lastIndexOf(File.separator) != -1) {
                 appdata = appdata.substring(appdata.lastIndexOf(File.separator));
@@ -613 +613 @@
 
         // Backup old preferences if there are old preferences
-        if (prefFile.exists() && prefFile.length() > 0 && initSuccessful) {
+        if (initSuccessful && prefFile.exists() && prefFile.length() > 0) {
             Utils.copyFile(prefFile, backupFile);
         }

trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java

@@ -225 +225 @@
     public String getDistText(final double dist, final NumberFormat format, final double threshold) {
         double a = dist / aValue;
-        if (!Main.pref.getBoolean("system_of_measurement.use_only_lower_unit", false) && a > bValue / aValue)
+        if (a > bValue / aValue && !Main.pref.getBoolean("system_of_measurement.use_only_lower_unit", false))
             return formatText(dist / bValue, bName, format);
         else if (a < threshold)

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -183 +183 @@
                     handleNoTileAtZoom();
                     int httpStatusCode = attributes.getResponseCode();
-                    if (!isNoTileAtZoom() && httpStatusCode >= 400) {
+                    if (httpStatusCode >= 400 && !isNoTileAtZoom()) {
                         if (attributes.getErrorMessage() == null) {
                             tile.setError(tr("HTTP error {0} when loading tiles", httpStatusCode));

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

@@ -296 +296 @@
         if (changesetId < 0)
             throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' >= 0 expected, got {1}", "changesetId", changesetId));
-        if (isNew() && changesetId > 0)
+        if (changesetId > 0 && isNew())
             throw new IllegalStateException(tr("Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is {0}", changesetId));
 
@@ -380 +380 @@
     @Override
     public void setVisible(boolean visible) {
-        if (isNew() && !visible)
+        if (!visible && isNew())
             throw new IllegalStateException(tr("A primitive with ID = 0 cannot be invisible."));
         updateFlags(FLAG_VISIBLE, visible);

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

@@ -313 +313 @@
      */
     public boolean isInWorld() {
-        return isValid() && xmin >= -180.0 && xmax <= 180.0 && ymin >= -90.0 && ymax <= 90.0;
+        return xmin >= -180.0 && xmax <= 180.0 && ymin >= -90.0 && ymax <= 90.0 && isValid();
     }
 

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

@@ -1170 +1170 @@
      */
     public boolean hasEqualTechnicalAttributes(OsmPrimitive other) {
-        if (other == null) return false;
-
-        return isDeleted() == other.isDeleted()
-                && isModified() == other.isModified()
-                && timestamp == other.timestamp
-                && version == other.version
-                && isVisible() == other.isVisible()
-                && Objects.equals(user, other.user)
-                && changesetId == other.changesetId;
+        return other != null
+            && timestamp == other.timestamp
+            && version == other.version
+            && changesetId == other.changesetId
+            && isDeleted() == other.isDeleted()
+            && isModified() == other.isModified()
+            && isVisible() == other.isVisible()
+            && Objects.equals(user, other.user);
     }
 

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

@@ -274 +274 @@
             }
             doAddContent(o);
-            if (isLeaf() && content.size() > MAX_OBJECTS_PER_NODE && level < QuadTiling.NR_LEVELS) {
+            if (level < QuadTiling.NR_LEVELS && isLeaf() && content.size() > MAX_OBJECTS_PER_NODE) {
                 doSplit();
             }

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

@@ -107 +107 @@
         RelationMemberData that = (RelationMemberData) obj;
         return memberId == that.memberId &&
-                Objects.equals(role, that.role) &&
-                memberType == that.memberType;
+               memberType == that.memberType &&
+               Objects.equals(role, that.role);
     }
 }

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

@@ -1089 +1089 @@
                 } else if (m.isNode()) {
                     Node n = m.getNode();
-                    if ("via".equals(m.getRole()) && via == null) {
+                    if (via == null && "via".equals(m.getRole())) {
                         via = n;
                     }

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

@@ -297 +297 @@
         /* head only takes over control if the option is true,
            the direction should be shown at all and not only because it's selected */
-        boolean showOnlyHeadArrowOnly = showThisDirectionArrow && !ds.isSelected(w) && showHeadArrowOnly;
+        boolean showOnlyHeadArrowOnly = showThisDirectionArrow && showHeadArrowOnly && !ds.isSelected(w);
         Color wayColor;
 

trunk/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java

@@ -463 +463 @@
 
         int slash2Count = countToken("//", path);
-        if (isOff(ALLOW_2_SLASHES) && (slash2Count > 0)) {
+        if (slash2Count > 0 && isOff(ALLOW_2_SLASHES)) {
             return false;
         }

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

@@ -65 +65 @@
             RelMember relMember = (RelMember) obj;
             return relId == relMember.relId &&
+                    type == relMember.type &&
                     Objects.equals(role, relMember.role) &&
-                    type == relMember.type &&
                     Objects.equals(tags, relMember.tags) &&
                     Objects.equals(coor, relMember.coor);

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

@@ -319 +319 @@
                                     "Unexpected '='. Please only specify the key to remove!");
                             check.fixCommands.add(FixCommand.fixRemove(ai.val));
-                        } else if ("fixChangeKey".equals(ai.key) && val != null) {
+                        } else if (val != null && "fixChangeKey".equals(ai.key)) {
                             CheckParameterUtil.ensureThat(val.contains("=>"), "Separate old from new key by '=>'!");
                             final String[] x = val.split("=>", 2);
                             check.fixCommands.add(FixCommand.fixChangeKey(Tag.removeWhiteSpaces(x[0]), Tag.removeWhiteSpaces(x[1])));
-                        } else if ("fixDeleteObject".equals(ai.key) && val != null) {
+                        } else if (val != null && "fixDeleteObject".equals(ai.key)) {
                             CheckParameterUtil.ensureThat("this".equals(val), "fixDeleteObject must be followed by 'this'");
                             check.deletion = true;
-                        } else if ("suggestAlternative".equals(ai.key) && val != null) {
+                        } else if (val != null && "suggestAlternative".equals(ai.key)) {
                             check.alternatives.add(val);
-                        } else if ("assertMatch".equals(ai.key) && val != null) {
+                        } else if (val != null && "assertMatch".equals(ai.key)) {
                             check.assertions.put(val, Boolean.TRUE);
-                        } else if ("assertNoMatch".equals(ai.key) && val != null) {
+                        } else if (val != null && "assertNoMatch".equals(ai.key)) {
                             check.assertions.put(val, Boolean.FALSE);
-                        } else if ("group".equals(ai.key) && val != null) {
+                        } else if (val != null && "group".equals(ai.key)) {
                             check.group = val;
                         } else {

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

@@ -211 +211 @@
                     continue;
                 }
-                if (endnodesHighway.contains(en) && !s.highway && !s.w.concernsArea()) {
+                if (!s.highway && endnodesHighway.contains(en) && !s.w.concernsArea()) {
                     map.put(en, s.w);
                 } else if (endnodes.contains(en) && !s.w.concernsArea()) {

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

@@ -616 +616 @@
             double den = 100 * getScale();
             double scaleMin = 0.01 * den / dm / 100;
-            if (!Double.isInfinite(scaleMin) && newScale < scaleMin) {
+            if (newScale < scaleMin && !Double.isInfinite(scaleMin)) {
                 newScale = scaleMin;
             }

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java

@@ -130 +130 @@
     @Override
     public void mouseDragged(MouseEvent e) {
-        if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == MouseEvent.BUTTON1_DOWN_MASK &&
-                !(Main.isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK) && iStartSelectionPoint != null) {
+        if (iStartSelectionPoint != null && (e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == MouseEvent.BUTTON1_DOWN_MASK
+                && !(Main.isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK)) {
             iEndSelectionPoint = e.getPoint();
             iSlippyMapChooser.setSelection(iStartSelectionPoint, iEndSelectionPoint);

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

@@ -83 +83 @@
         RelationMemberConflictDecision that = (RelationMemberConflictDecision) obj;
         return pos == that.pos &&
-                Objects.equals(relation, that.relation) &&
-                Objects.equals(originalPrimitive, that.originalPrimitive) &&
-                Objects.equals(role, that.role) &&
-                decision == that.decision;
+               decision == that.decision &&
+               Objects.equals(relation, that.relation) &&
+               Objects.equals(originalPrimitive, that.originalPrimitive) &&
+               Objects.equals(role, that.role);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

@@ -246 +246 @@
             for (int i = 0; i < n; ++i) {
                 final ToggleDialog dlg = allDialogs.get(i);
-                if (dlg.isDialogInDefaultView() && dlg != triggeredBy) {
+                if (dlg != triggeredBy && dlg.isDialogInDefaultView()) {
                     final int ha = dlg.getSize().height;                              // current
                     final int h0 = ha * r / sumA;                                     // proportional shrinking
@@ -261 +261 @@
             for (int i = 0; i < n; ++i) {
                 final ToggleDialog dlg = allDialogs.get(i);
-                if (dlg.isDialogInDefaultView() && dlg != triggeredBy) {
+                if (dlg != triggeredBy && dlg.isDialogInDefaultView()) {
                     final int ha = dlg.getHeight();
                     final int h0 = ha * r / sumA;

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java

@@ -118 +118 @@
         }
 
-        if (Main.isDisplayingMapView() && changed) {
+        if (changed && Main.isDisplayingMapView()) {
             Main.map.mapView.repaint();
             Main.map.filterDialog.updateDialogHeader();

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java

@@ -159 +159 @@
                 txtMappaint.append(tr("The 2 selected objects have different style caches."));
             }
-            if (sc1.equals(sc2) && sc1 != sc2) {
+            if (sc1 != sc2 && sc1.equals(sc2)) {
                 txtMappaint.append(tr("Warning: The 2 selected objects have equal, but not identical style caches."));
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/MinimapDialog.java

@@ -55 +55 @@
     @Override
     public void zoomChanged() {
-        if (Main.isDisplayingMapView() && !skipEvents) {
+        if (!skipEvents && Main.isDisplayingMapView()) {
             MapView mv = Main.map.mapView;
             final Bounds currentBounds = new Bounds(

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerListTransferHandler.java

@@ -96 +96 @@
             boolean isSameLayerManager = tableModel.getLayerManager() == layers.getManager();
 
-            if (support.getDropAction() == MOVE && isSameLayerManager) {
+            if (isSameLayerManager && support.getDropAction() == MOVE) {
                 for (Layer layer : layers.getLayers()) {
                     boolean wasBeforeInsert = layers.getManager().getLayers().indexOf(layer) <= dropLocation;

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -1207 +1207 @@
                          *  content lengths, so we have to be fuzzy.. (this is UGLY, recode if u know better)
                          */
-                        if (conn.getContentLength() != -1 && osize > -1 && Math.abs(conn.getContentLength() - osize) > 200) {
+                        if (osize > -1 && conn.getContentLength() != -1 && Math.abs(conn.getContentLength() - osize) > 200) {
                             Main.info("{0} is a mediawiki redirect", u);
                             conn.disconnect();

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java

@@ -98 +98 @@
             }
 
-            if (!RelationSortUtils.isOneway(m) && lastWct != null) {
+            if (lastWct != null && !RelationSortUtils.isOneway(m)) {
                 wct.direction = determineDirection(i-1, lastWct.direction, i);
                 wct.linkPrev = wct.direction != NONE;
@@ -307 +307 @@
                         return FORWARD;
                 }
-                if (n == RelationNodeMap.lastOnewayNode(m) && reversed) {
+                if (reversed && n == RelationNodeMap.lastOnewayNode(m)) {
                     if (RelationSortUtils.isBackward(m))
                         return FORWARD;

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -643 +643 @@
         Collection<String> history = Main.pref.getCollection(historyKey, def);
         int age = (int) (System.currentTimeMillis() / 1000 - Main.pref.getInteger(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0));
-        if (age < Main.pref.getLong(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, TimeUnit.HOURS.toMillis(4))
-                && history != null && !history.isEmpty()) {
+        if (history != null && age < Main.pref.getLong(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, TimeUnit.HOURS.toMillis(4))
+                && !history.isEmpty()) {
             return history.iterator().next();
         } else {

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -1584 +1584 @@
             List<Tile> newlyMissedTiles = new LinkedList<>();
             for (Tile missed : missedTiles) {
-                if ("no-tile".equals(missed.getValue("tile-info")) && zoomOffset > 0) {
+                if (zoomOffset > 0 && "no-tile".equals(missed.getValue("tile-info"))) {
                     // Don't try to paint from higher zoom levels when tile is overzoomed
                     newlyMissedTiles.add(missed);

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -1071 +1071 @@
             }
 
-            if (e.isTagged() && e.getExifCoor() == null && !tagged) {
+            if (!tagged && e.isTagged() && e.getExifCoor() == null) {
                 continue;
             }
@@ -1202 +1202 @@
             }
 
-            if (curImg.tmp.getPos() == null && prevWp != null) {
+            if (prevWp != null && curImg.tmp.getPos() == null) {
                 // The values of timeDiff are between 0 and 1, it is not seconds but a dimensionless variable
                 double timeDiff = (double) (imgTime - prevWpTime) / interval;

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -306 +306 @@
             imageChanged = currentEntry != entry;
 
-            if (centerView && Main.isDisplayingMapView() && entry != null && entry.getPos() != null) {
+            if (centerView && entry != null && Main.isDisplayingMapView() && entry.getPos() != null) {
                 Main.map.mapView.zoomTo(entry.getPos());
             }

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;

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

@@ -166 +166 @@
 
         // (a) try explicit timestamped waypoints - unless suppressed
-        if (Main.pref.getBoolean("marker.audiofromexplicitwaypoints", true) && hasWaypoints) {
+        if (hasWaypoints && Main.pref.getBoolean("marker.audiofromexplicitwaypoints", true)) {
             for (WayPoint w : layer.data.waypoints) {
                 if (w.time > firstTime) {
@@ -177 +177 @@
 
         // (b) try explicit waypoints without timestamps - unless suppressed
-        if (Main.pref.getBoolean("marker.audiofromuntimedwaypoints", true) && hasWaypoints) {
+        if (hasWaypoints && Main.pref.getBoolean("marker.audiofromuntimedwaypoints", true)) {
             for (WayPoint w : layer.data.waypoints) {
                 if (waypoints.contains(w)) {
@@ -197 +197 @@
 
         // (c) use explicitly named track points, again unless suppressed
-        if ((Main.pref.getBoolean("marker.audiofromnamedtrackpoints", false)) && layer.data.tracks != null
+        if (layer.data.tracks != null && Main.pref.getBoolean("marker.audiofromnamedtrackpoints", false)
                 && !layer.data.tracks.isEmpty()) {
             for (GpxTrack track : layer.data.tracks) {
@@ -211 +211 @@
 
         // (d) use timestamp of file as location on track
-        if ((Main.pref.getBoolean("marker.audiofromwavtimestamps", false)) && hasTracks) {
+        if (hasTracks && Main.pref.getBoolean("marker.audiofromwavtimestamps", false)) {
             double lastModified = wavFile.lastModified() / 1000.0; // lastModified is in
             // milliseconds

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/BoxTextElement.java

@@ -282 +282 @@
         if (!super.equals(obj)) return false;
         BoxTextElement that = (BoxTextElement) obj;
-        return Objects.equals(text, that.text) &&
-                Objects.equals(boxProvider, that.boxProvider) &&
-                Objects.equals(box, that.box) &&
-                hAlign == that.hAlign &&
-                vAlign == that.vAlign;
+        return hAlign == that.hAlign &&
+               vAlign == that.vAlign &&
+               Objects.equals(text, that.text) &&
+               Objects.equals(boxProvider, that.boxProvider) &&
+               Objects.equals(box, that.box);
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java

@@ -160 +160 @@
             return false;
         final LineElement other = (LineElement) obj;
-        return Objects.equals(line, other.line) &&
-            Objects.equals(color, other.color) &&
-            Objects.equals(dashesLine, other.dashesLine) &&
-            Objects.equals(dashesBackground, other.dashesBackground) &&
-            offset == other.offset &&
-            realWidth == other.realWidth &&
-            wayDirectionArrows == other.wayDirectionArrows;
+        return offset == other.offset &&
+               realWidth == other.realWidth &&
+               wayDirectionArrows == other.wayDirectionArrows &&
+               Objects.equals(line, other.line) &&
+               Objects.equals(color, other.color) &&
+               Objects.equals(dashesLine, other.dashesLine) &&
+               Objects.equals(dashesBackground, other.dashesBackground);
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java

@@ -96 +96 @@
         if (!super.equals(obj)) return false;
         RepeatImageElement that = (RepeatImageElement) obj;
-        return Float.compare(that.offset, offset) == 0 &&
-                Float.compare(that.spacing, spacing) == 0 &&
-                Float.compare(that.phase, phase) == 0 &&
-                Objects.equals(pattern, that.pattern) &&
-                align == that.align;
+        return align == that.align &&
+               Float.compare(that.offset, offset) == 0 &&
+               Float.compare(that.spacing, spacing) == 0 &&
+               Float.compare(that.phase, phase) == 0 &&
+               Objects.equals(pattern, that.pattern);
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java

@@ -199 +199 @@
         if (o == null || getClass() != o.getClass()) return false;
         StyleElement that = (StyleElement) o;
-        return Float.compare(that.majorZIndex, majorZIndex) == 0 &&
-                Float.compare(that.zIndex, zIndex) == 0 &&
-                Float.compare(that.objectZIndex, objectZIndex) == 0 &&
-                isModifier == that.isModifier;
+        return isModifier == that.isModifier &&
+               Float.compare(that.majorZIndex, majorZIndex) == 0 &&
+               Float.compare(that.zIndex, zIndex) == 0 &&
+               Float.compare(that.objectZIndex, objectZIndex) == 0;
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

@@ -94 +94 @@
             }
             final UserInputTag other = (UserInputTag) obj;
-            return Objects.equals(this.key, other.key)
-                && Objects.equals(this.value, other.value)
-                && this.defaultKey == other.defaultKey;
+            return this.defaultKey == other.defaultKey
+                && Objects.equals(this.key, other.key)
+                && Objects.equals(this.value, other.value);
         }
     }

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

@@ -92 +92 @@
     public void addCommands(List<Tag> changedTags) {
         // if the user hasn't changed anything, don't create a command.
-        if (check.getState() == initialState && def == null) return;
+        if (def == null && check.getState() == initialState) return;
 
         // otherwise change things according to the selected value.

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

@@ -85 +85 @@
             // all items were unset (and so is default)
             originalValue = lhm.get("");
-            if ("force".equals(use_last_as_default) && LAST_VALUES.containsKey(key) && !presetInitiallyMatches) {
+            if (!presetInitiallyMatches && "force".equals(use_last_as_default) && LAST_VALUES.containsKey(key)) {
                 combobox.setSelectedItem(lhm.get(LAST_VALUES.get(key)));
             } else {

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

@@ -492 +492 @@
         }
 
-        if (Main.pref.getBoolean("taggingpreset.sortvalues", true) && values_sort) {
+        if (values_sort && Main.pref.getBoolean("taggingpreset.sortvalues", true)) {
             Collections.sort(entries);
         }

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

@@ -88 +88 @@
             } else if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
                 // selected osm primitives are untagged or filling default values feature is enabled
-                if (!"false".equals(use_last_as_default) && LAST_VALUES.containsKey(key) && !presetInitiallyMatches) {
+                if (!presetInitiallyMatches && !"false".equals(use_last_as_default) && LAST_VALUES.containsKey(key)) {
                     textField.setText(LAST_VALUES.get(key));
                 } else {

trunk/src/org/openstreetmap/josm/gui/widgets/JMultilineLabel.java

@@ -66 +66 @@
 
     /**
-     * Tries to determine a suitable height for the given contents and return
-     * that dimension.
+     * Tries to determine a suitable height for the given contents and return that dimension.
      */
     @Override
     public Dimension getPreferredSize() {
-        // Without this check it will result in an infinite loop calling
-        // getPreferredSize. Remember the old bounds and only recalculate if
-        // the size actually changed.
-        if (this.getBounds().equals(oldbounds) && oldPreferred != null) {
+        // Without this check it will result in an infinite loop calling getPreferredSize.
+        // Remember the old bounds and only recalculate if the size actually changed.
+        if (oldPreferred != null && this.getBounds().equals(oldbounds)) {
             return oldPreferred;
         }

trunk/src/org/openstreetmap/josm/io/NameFinder.java

@@ -197 +197 @@
                 if ("searchresults".equals(qName)) {
                     // do nothing
-                } else if ("named".equals(qName) && (depth == 2)) {
+                } else if (depth == 2 && "named".equals(qName)) {
                     currentResult = new SearchResult();
                     currentResult.name = atts.getValue("name");
@@ -208 +208 @@
                     currentResult.zoom = Integer.parseInt(atts.getValue("zoom"));
                     data.add(currentResult);
-                } else if ("description".equals(qName) && (depth == 3)) {
+                } else if (depth == 3 && "description".equals(qName)) {
                     description = new StringBuilder();
-                } else if ("named".equals(qName) && (depth == 4)) {
+                } else if (depth == 4 && "named".equals(qName)) {
                     // this is a "named" place in the nearest places list.
                     String info = atts.getValue("info");
@@ -252 +252 @@
         @Override
         public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
-            if ("description".equals(qName) && description != null) {
+            if (description != null && "description".equals(qName)) {
                 currentResult.description = description.toString();
                 description = null;

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

@@ -291 +291 @@
                 break;
             case MIRROR:
-                if ("mirror".equals(qName) && mirrorEntry != null) {
+                if (mirrorEntry != null && "mirror".equals(qName)) {
                     entry.addMirror(mirrorEntry);
                     mirrorEntry = null;

trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

@@ -251 +251 @@
     protected void buttonAction(int buttonIndex, ActionEvent evt) {
         // if layer all layers were closed, ignore all actions
-        if (Main.getLayerManager().getEditDataSet() != null && buttonIndex != 2) {
+        if (buttonIndex != 2 && Main.getLayerManager().getEditDataSet() != null) {
             TableModel tm = propertyTable.getModel();
             for (int i = 0; i < tm.getRowCount(); i++) {