Changeset 17484 in josm

Timestamp:

2021-02-01T20:30:11+01:00 (4 years ago)

Author:

Don-vip

Message:

see #19724 - fix issues reported by Error-Prone 2.5.1 before it crashes

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• imagery/ImageryInfo.java (modified) (1 diff)
• sources/SourceInfo.java (modified) (1 diff)

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

@@ -580 +580 @@
         // CHECKSTYLE.OFF: BooleanExpressionComplexity
         return super.equalsPref(realOther) &&
-                Objects.equals(this.bestMarked, realOther.bestMarked) &&
-                Objects.equals(this.overlay, realOther.overlay) &&
-                Objects.equals(this.isGeoreferenceValid, realOther.isGeoreferenceValid) &&
-                Objects.equals(this.defaultMaxZoom, realOther.defaultMaxZoom) &&
-                Objects.equals(this.defaultMinZoom, realOther.defaultMinZoom) &&
+                this.bestMarked == realOther.bestMarked &&
+                this.overlay == realOther.overlay &&
+                this.isGeoreferenceValid == realOther.isGeoreferenceValid &&
+                this.defaultMaxZoom == realOther.defaultMaxZoom &&
+                this.defaultMinZoom == realOther.defaultMinZoom &&
                 Objects.equals(this.serverProjections, realOther.serverProjections) &&
-                Objects.equals(this.transparent, realOther.transparent) &&
-                Objects.equals(this.minimumTileExpire, realOther.minimumTileExpire);
+                this.transparent == realOther.transparent &&
+                this.minimumTileExpire == realOther.minimumTileExpire;
         // CHECKSTYLE.ON: BooleanExpressionComplexity
     }

trunk/src/org/openstreetmap/josm/data/sources/SourceInfo.java

@@ -165 +165 @@
                 Objects.equals(this.id, other.id) &&
                 Objects.equals(this.url, other.url) &&
-                Objects.equals(this.modTileFeatures, other.modTileFeatures) &&
+                this.modTileFeatures == other.modTileFeatures &&
                 Objects.equals(this.cookies, other.cookies) &&
                 Objects.equals(this.eulaAcceptanceRequired, other.eulaAcceptanceRequired) &&