Changeset 8047 in josm for trunk/src/org/openstreetmap


Ignore:
Timestamp:
2015-02-11T17:48:05+01:00 (5 years ago)
Author:
bastiK
Message:

see #11096 - fix png -> svg

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

    r7005 r8047  
    265265    class KeepMineAction extends AbstractAction implements ListSelectionListener {
    266266        public KeepMineAction() {
    267             ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeepmine.png");
     267            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeepmine");
    268268            if (icon != null) {
    269269                putValue(Action.SMALL_ICON, icon);
     
    297297    class KeepTheirAction extends AbstractAction implements ListSelectionListener {
    298298        public KeepTheirAction() {
    299             ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeeptheir.png");
     299            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeeptheir");
    300300            if (icon != null) {
    301301                putValue(Action.SMALL_ICON, icon);
     
    395395
    396396        public UndecideAction() {
    397             ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagundecide.png");
     397            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagundecide");
    398398            if (icon != null) {
    399399                putValue(Action.SMALL_ICON, icon);
Note: See TracChangeset for help on using the changeset viewer.