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

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/gui

Files:

• NavigatableComponent.java (modified) (1 diff)
• bbox/SlippyMapControler.java (modified) (1 diff)
• conflict/tags/RelationMemberConflictDecision.java (modified) (1 diff)
• dialogs/DialogsPanel.java (modified) (2 diffs)
• dialogs/FilterTableModel.java (modified) (1 diff)
• dialogs/InspectPrimitiveDialog.java (modified) (1 diff)
• dialogs/MinimapDialog.java (modified) (1 diff)
• dialogs/layer/LayerListTransferHandler.java (modified) (1 diff)
• dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• dialogs/relation/sort/WayConnectionTypeCalculator.java (modified) (2 diffs)
• io/UploadDialog.java (modified) (1 diff)
• layer/AbstractTileSourceLayer.java (modified) (1 diff)
• layer/geoimage/CorrelateGpxWithImages.java (modified) (2 diffs)
• layer/geoimage/ImageViewerDialog.java (modified) (1 diff)
• layer/gpx/GpxDrawHelper.java (modified) (2 diffs)
• layer/gpx/ImportAudioAction.java (modified) (4 diffs)
• mappaint/styleelement/BoxTextElement.java (modified) (1 diff)
• mappaint/styleelement/LineElement.java (modified) (1 diff)
• mappaint/styleelement/RepeatImageElement.java (modified) (1 diff)
• mappaint/styleelement/StyleElement.java (modified) (1 diff)
• tagging/ac/AutoCompletionManager.java (modified) (1 diff)
• tagging/presets/items/Check.java (modified) (1 diff)
• tagging/presets/items/Combo.java (modified) (1 diff)
• tagging/presets/items/ComboMultiSelect.java (modified) (1 diff)
• tagging/presets/items/Text.java (modified) (1 diff)
• widgets/JMultilineLabel.java (modified) (1 diff)

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