Changeset 8065 in josm for trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
- Timestamp:
- 2015-02-14T22:32:42+01:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
r7759 r8065 166 166 private ImageryBounds bounds = null; 167 167 private List<String> serverProjections; 168 private String description; 168 169 private String attributionText; 169 170 private String attributionLinkURL; … … 200 201 @pref String projections; 201 202 @pref String icon; 203 @pref String description; 202 204 203 205 /** … … 229 231 cookies = i.cookies; 230 232 icon = i.icon; 233 description = i.description; 231 234 if (i.bounds != null) { 232 235 bounds = i.bounds.encodeAsString(","); … … 332 335 id = e.id; 333 336 url = e.url; 337 description = e.description; 334 338 cookies = e.cookies; 335 339 eulaAcceptanceRequired = e.eula; … … 389 393 this.countryCode = i.countryCode; 390 394 this.icon = i.icon; 395 this.description = i.description; 391 396 } 392 397 … … 472 477 return false; 473 478 } 479 if (!Objects.equals(this.description, other.description)) { 480 return false; 481 } 474 482 return true; 475 483 } 476 477 484 478 485 @Override … … 774 781 775 782 /** 783 * Returns the description text when existing. 784 * @return The description 785 * @since 8064 786 */ 787 public String getDescription() { 788 return this.description; 789 } 790 791 /** 792 * Sets the description text when existing. 793 * @param description the imagery description text 794 * @since 8064 795 */ 796 public void setDescription(String description) { 797 this.description = description; 798 } 799 800 /** 801 * Returns a tool tip text for display. 802 * @return The text 803 * @since 8064 804 */ 805 public String getToolTipText() { 806 String desc = getDescription(); 807 if (desc != null && !desc.isEmpty()) { 808 return "<html>" + getName() + "<br>" + desc + "</html>"; 809 } 810 return getName(); 811 } 812 813 /** 776 814 * Returns the EULA acceptance URL, if any. 777 815 * @return The URL to an EULA text that has to be accepted before use, or {@code null}
Note:
See TracChangeset
for help on using the changeset viewer.