Changeset 4960 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

Timestamp:

2012-02-16T20:58:54+01:00 (12 years ago)

Author:

stoecker

Message:

mv jump to action from G to key J

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -27 +27 @@
 import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.ImageProvider.SanitizeMode;
 
 /**
@@ -89 +88 @@
 
     public static ImageIcon getIcon(IconReference ref, int width, int height) {
-        return getIcon(ref, width, height, SanitizeMode.OFF);
-    }
-
-    public static ImageIcon getIcon(IconReference ref, int width, int height, SanitizeMode sanitize) {
         final String namespace = ref.source.getPrefName();
         ImageIcon i = new ImageProvider(ref.iconName)
@@ -100 +95 @@
                 .setWidth(width)
                 .setHeight(height)
-                .setSanitize(sanitize)
                 .setOptional(true).get();
         if(i == null)
@@ -108 +102 @@
         }
         return i;
-    }
-
-    public static ImageIcon getNoIcon_Icon(StyleSource source) {
-        return getNoIcon_Icon(source, SanitizeMode.OFF);
     }
 
@@ -122 +112 @@
      *  can be null if the defaults are turned off by user
      */
-    public static ImageIcon getNoIcon_Icon(StyleSource source, SanitizeMode sanitize) {
+    public static ImageIcon getNoIcon_Icon(StyleSource source) {
         return new ImageProvider("misc/no_icon.png")
                 .setDirs(getIconSourceDirs(source))
                 .setId("mappaint."+source.getPrefName())
                 .setArchive(source.zipIcons)
-                .setSanitize(sanitize)
                 .setOptional(true).get();
     }