Changeset 12722 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java
- Timestamp:
- 2017-09-04T18:52:06+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java
r12630 r12722 32 32 * ImageIcon can change while the image is loading. 33 33 */ 34 private BufferedImage img;34 private Image img; 35 35 36 36 /** … … 102 102 * @return the image 103 103 */ 104 public BufferedImage getImage(boolean disabled) {104 public Image getImage(boolean disabled) { 105 105 if (disabled) { 106 106 return getDisabled(); … … 110 110 } 111 111 112 private BufferedImage getDisabled() {112 private Image getDisabled() { 113 113 if (disabledImgCache != null) 114 114 return disabledImgCache; … … 127 127 } 128 128 129 private BufferedImage getImage() {129 private Image getImage() { 130 130 if (img != null) 131 131 return img; … … 144 144 source.logWarning(tr("Failed to locate image ''{0}''", name)); 145 145 ImageIcon noIcon = MapPaintStyles.getNoIconIcon(source); 146 img = noIcon == null ? null : (BufferedImage)noIcon.getImage();146 img = noIcon == null ? null : noIcon.getImage(); 147 147 } else { 148 img = (BufferedImage)rescale(result.getImage());148 img = rescale(result.getImage()); 149 149 } 150 150 if (temporary) { … … 160 160 synchronized (this) { 161 161 if (img == null) { 162 img = (BufferedImage)ImageProvider.get("clock").getImage();162 img = ImageProvider.get("clock").getImage(); 163 163 temporary = true; 164 164 }
Note:
See TracChangeset
for help on using the changeset viewer.