Changeset 8056 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

Timestamp:

2015-02-13T15:25:19+01:00 (9 years ago)

Author:

bastiK

Message:

fixed #11096 - png -> svg

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -623 +623 @@
 
         public CopyAllLeft() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallleft.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallleft");
             putValue(Action.SMALL_ICON, icon);
             putValue(Action.SHORT_DESCRIPTION, tr("Copy all my elements to the target"));
@@ -652 +652 @@
 
         public CopyAllRight() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallright.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallright");
             putValue(Action.SMALL_ICON, icon);
             putValue(Action.SHORT_DESCRIPTION, tr("Copy all their elements to the target"));
@@ -681 +681 @@
 
         public MoveUpMergedAction() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "moveup.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "moveup");
             putValue(Action.SMALL_ICON, icon);
             if (icon == null) {
@@ -715 +715 @@
 
         public MoveDownMergedAction() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "movedown.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "movedown");
             putValue(Action.SMALL_ICON, icon);
             if (icon == null) {
@@ -749 +749 @@
 
         public RemoveMergedAction() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "remove.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "remove");
             putValue(Action.SMALL_ICON, icon);
             if (icon == null) {