Changeset 8047 in josm for trunk

Timestamp:

2015-02-11T17:48:05+01:00 (9 years ago)

Author:

bastiK

Message:

see #11096 - fix png -> svg

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

@@ -265 +265 @@
     class KeepMineAction extends AbstractAction implements ListSelectionListener {
         public KeepMineAction() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeepmine.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeepmine");
             if (icon != null) {
                 putValue(Action.SMALL_ICON, icon);
@@ -297 +297 @@
     class KeepTheirAction extends AbstractAction implements ListSelectionListener {
         public KeepTheirAction() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeeptheir.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeeptheir");
             if (icon != null) {
                 putValue(Action.SMALL_ICON, icon);
@@ -395 +395 @@
 
         public UndecideAction() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagundecide.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagundecide");
             if (icon != null) {
                 putValue(Action.SMALL_ICON, icon);