Changeset 15902 in josm for trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
- Timestamp:
- 2020-02-22T19:40:25+01:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
r15739 r15902 397 397 min_zoom = i.defaultMinZoom; 398 398 cookies = i.cookies; 399 icon = i.icon ;399 icon = i.icon == null ? null : i.icon.intern(); 400 400 description = i.description; 401 401 category = i.category != null ? i.category.getCategoryString() : null; … … 568 568 termsOfUseURL = e.terms_of_use_url; 569 569 countryCode = e.country_code; 570 icon = e.icon ;570 icon = e.icon == null ? null : e.icon.intern(); 571 571 if (e.noTileHeaders != null) { 572 572 noTileHeaders = e.noTileHeaders.toMap(); … … 633 633 this.overlay = i.overlay; 634 634 // do not copy field {@code mirrors} 635 this.icon = i.icon ;635 this.icon = i.icon == null ? null : i.icon.intern(); 636 636 this.isGeoreferenceValid = i.isGeoreferenceValid; 637 637 this.defaultLayers = i.defaultLayers; … … 1190 1190 */ 1191 1191 public void setIcon(String icon) { 1192 this.icon = icon ;1192 this.icon = icon == null ? null : icon.intern(); 1193 1193 } 1194 1194
Note:
See TracChangeset
for help on using the changeset viewer.