Changeset 16060 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint
- Timestamp:
- 2020-03-07T20:20:26+01:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java
r14302 r16060 20 20 import org.openstreetmap.josm.gui.util.GuiHelper; 21 21 import org.openstreetmap.josm.tools.ImageProvider; 22 import org.openstreetmap.josm.tools.ImageResource; 22 23 import org.openstreetmap.josm.tools.Utils; 23 24 … … 33 34 */ 34 35 private Image img; 36 private ImageResource imageResource; 35 37 36 38 /** … … 108 110 return getImage(); 109 111 } 112 } 113 114 /** 115 * Get the image resource associated with this MapImage object. 116 * @return the image resource 117 */ 118 public ImageResource getImageResource() { 119 return imageResource; 110 120 } 111 121 … … 139 149 .setHeight(height) 140 150 .setOptional(true) 141 .get Async(result -> {151 .getResourceAsync(result -> { 142 152 synchronized (this) { 153 imageResource = result; 143 154 if (result == null) { 144 155 source.logWarning(tr("Failed to locate image ''{0}''", name)); … … 146 157 img = noIcon == null ? null : noIcon.getImage(); 147 158 } else { 148 img = rescale(result.getImage ());159 img = rescale(result.getImageIcon().getImage()); 149 160 } 150 161 if (temporary) {
Note:
See TracChangeset
for help on using the changeset viewer.