Changeset 10357 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

Timestamp:

2016-06-12T00:26:29+02:00 (8 years ago)

Author:

stoecker

Message:

see #9995, see #10684 - remove more hardcoded places of images

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -367 +367 @@
             putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution"));
             putValue(Action.NAME, tr("Cancel"));
-            putValue(Action.SMALL_ICON, ImageProvider.get("", "cancel"));
+            new ImageProvider("cancel").getResource().getImageIcon(this);
             setEnabled(true);
         }
@@ -382 +382 @@
             putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts"));
             putValue(Action.NAME, tr("Apply"));
-            putValue(Action.SMALL_ICON, ImageProvider.get("ok"));
+            new ImageProvider("ok").getResource().getImageIcon(this);
             updateEnabledState();
         }