Changeset 17484 in josm


Ignore:
Timestamp:
2021-02-01T20:30:11+01:00 (4 weeks 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

    r16680 r17484  
    580580        // CHECKSTYLE.OFF: BooleanExpressionComplexity
    581581        return super.equalsPref(realOther) &&
    582                 Objects.equals(this.bestMarked, realOther.bestMarked) &&
    583                 Objects.equals(this.overlay, realOther.overlay) &&
    584                 Objects.equals(this.isGeoreferenceValid, realOther.isGeoreferenceValid) &&
    585                 Objects.equals(this.defaultMaxZoom, realOther.defaultMaxZoom) &&
    586                 Objects.equals(this.defaultMinZoom, realOther.defaultMinZoom) &&
     582                this.bestMarked == realOther.bestMarked &&
     583                this.overlay == realOther.overlay &&
     584                this.isGeoreferenceValid == realOther.isGeoreferenceValid &&
     585                this.defaultMaxZoom == realOther.defaultMaxZoom &&
     586                this.defaultMinZoom == realOther.defaultMinZoom &&
    587587                Objects.equals(this.serverProjections, realOther.serverProjections) &&
    588                 Objects.equals(this.transparent, realOther.transparent) &&
    589                 Objects.equals(this.minimumTileExpire, realOther.minimumTileExpire);
     588                this.transparent == realOther.transparent &&
     589                this.minimumTileExpire == realOther.minimumTileExpire;
    590590        // CHECKSTYLE.ON: BooleanExpressionComplexity
    591591    }
  • trunk/src/org/openstreetmap/josm/data/sources/SourceInfo.java

    r16605 r17484  
    165165                Objects.equals(this.id, other.id) &&
    166166                Objects.equals(this.url, other.url) &&
    167                 Objects.equals(this.modTileFeatures, other.modTileFeatures) &&
     167                this.modTileFeatures == other.modTileFeatures &&
    168168                Objects.equals(this.cookies, other.cookies) &&
    169169                Objects.equals(this.eulaAcceptanceRequired, other.eulaAcceptanceRequired) &&
Note: See TracChangeset for help on using the changeset viewer.