Changeset 5390 in josm
- Timestamp:
- 2012-08-04T13:17:04+02:00 (13 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java
r4172 r5390 92 92 removeAll(); 93 93 94 // for each configured WMSInfo, add a menu entry.94 // for each configured ImageryInfo, add a menu entry. 95 95 for (final ImageryInfo u : ImageryLayerInfo.instance.getLayers()) { 96 96 add(new AddImageryLayerAction(u)); -
trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
r5186 r5390 42 42 43 43 public abstract class ImageryLayer extends Layer { 44 protected static final Icon icon = ImageProvider.get("imagery_small");45 44 46 45 public static final IntegerProperty PROP_FADE_AMOUNT = new IntegerProperty("imagery.fade_amount", 0); … … 62 61 protected final ImageryInfo info; 63 62 63 protected Icon icon; 64 64 65 protected double dx = 0.0; 65 66 protected double dy = 0.0; … … 79 80 super(info.getName()); 80 81 this.info = info; 82 if (info.getIcon() != null) { 83 icon = new ImageProvider(info.getIcon()).setOptional(true). 84 setMaxHeight(ICON_SIZE).setMaxWidth(ICON_SIZE).get(); 85 if (icon == null) { 86 icon = ImageProvider.get("imagery_small"); 87 } 88 } 81 89 this.sharpenLevel = PROP_SHARPEN_LEVEL.get(); 82 90 if (OffsetServer.PROP_SERVER_ENABLED.get()) { -
trunk/src/org/openstreetmap/josm/gui/layer/Layer.java
r5266 r5390 83 83 static public final String NAME_PROP = Layer.class.getName() + ".name"; 84 84 85 static public final int ICON_SIZE = 16; 86 85 87 /** keeps track of property change listeners */ 86 88 protected PropertyChangeSupport propertyChangeSupport;
Note:
See TracChangeset
for help on using the changeset viewer.