Changeset 10926 in josm for trunk


Ignore:
Timestamp:
2016-09-01T16:30:34+02:00 (3 years ago)
Author:
michael2402
Message:

fix #13506 - Do not show deprecated.svg icon in add/edit tag dialog

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

    r10748 r10926  
    5454             "application/xml, text/xml, text/plain; q=0.8, application/zip, application/octet-stream; q=0.5";
    5555
     56    private static final Collection<String> DEPRECATED_IMAGE_NAMES = Arrays.asList(
     57            "presets/misc/deprecated.svg",
     58            "misc/deprecated.png");
     59
    5660    private static ElemStyles styles = new ElemStyles();
    5761
     
    203207                        MapImage mapImage = ((NodeElement) style).mapImage;
    204208                        if (mapImage != null) {
    205                             if (includeDeprecatedIcon || mapImage.name == null || !"misc/deprecated.png".equals(mapImage.name)) {
     209                            if (includeDeprecatedIcon || mapImage.name == null || !DEPRECATED_IMAGE_NAMES.contains(mapImage.name)) {
    206210                                return new ImageIcon(mapImage.getImage(false));
    207211                            } else {
Note: See TracChangeset for help on using the changeset viewer.