Changeset 4893 in josm

Timestamp:

02.02.2012 19:38:08 (4 months ago)

Author:

stoecker

Message:

remove deprecation

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -265 +265 @@
     public static ImageIcon getIfAvailable(String subdir, String name) {
         return new ImageProvider(subdir, name).setOptional(true).get();
-    }
-
-    @Deprecated
-    public static ImageIcon getIfAvailable(String[] dirs, String id, String subdir, String name) {
-        return getIfAvailable(Arrays.asList(dirs), id, subdir, name);
-    }
-
-    /**
-     * Like {@link #get(String)}, but does not throw and return <code>null</code> in case of nothing
-     * is found. Use this, if the image to retrieve is optional. Nevertheless a warning will
-     * be printed on the console if the image could not be found.
-     */
-    @Deprecated
-    public static ImageIcon getIfAvailable(Collection<String> dirs, String id, String subdir, String name) {
-        return getIfAvailable(dirs, id, subdir, name, null);
-    }
-
-    @Deprecated
-    public static ImageIcon getIfAvailable(Collection<String> dirs, String id, String subdir, String name, File archive) {
-        return getIfAvailable(dirs, id, subdir, name, archive, SanitizeMode.OFF);
-    }
-
-    @Deprecated
-    public static ImageIcon getIfAvailable(Collection<String> dirs, String id, String subdir, String name, File archive, SanitizeMode sanitize) {
-        return getIfAvailable(dirs, id, subdir, name, archive, null, sanitize);
-    }
-
-    @Deprecated
-    public static ImageIcon getIfAvailable(Collection<String> dirs, String id, String subdir, String name, File archive, Dimension dim, SanitizeMode sanitize) {
-        return getIfAvailable(dirs, id, subdir, name, archive, dim, null, sanitize);
-    }
-
-    /**
-     * The full path of the image is either a url (starting with http://)
-     * or something like
-     *   dirs.get(i)+"/"+subdir+"/"+name+".png".
-     * @param dirs      Directories to look (may be null).
-     * @param id        An id used for caching. Id is not used for cache if name starts with http://. (URL is unique anyway.)
-     * @param subdir    Subdirectory the image lies in.
-     * @param name      The name of the image. If it does not end with '.png' or '.svg',
-     *                  it will try both extensions.
-     * @param archive   A zip file where the image is located (may be null).
-     * @param dim       The dimensions of the image if it should be scaled. null if the
-     *                  original size of the image should be returned. The width
-     *                  part of the dimension can be -1. Then it will scale the width
-     *                  in the same way as the height. (And the other way around.)
-     * @param maxSize   The maximum size of the image. It will shrink the image if necessary, and
-     *                  keep the aspect ratio. The given width or height can be -1 which means this
-     *                  direction is not bounded.
-     *                  If this parameter has a non-null value, the parameter 'dim' will be ignored.
-     * @param sanitize  If the image should be repainted to a new BufferedImage to work
-     *                  around certain issues.
-     */
-    @Deprecated
-    public static ImageIcon getIfAvailable(Collection<String> dirs, String id, String subdir, String name,
-            File archive, Dimension dim, Dimension maxSize, SanitizeMode sanitize) {
-        ImageProvider p = new ImageProvider(subdir, name).setDirs(dirs).setId(id).setArchive(archive).setSanitize(sanitize).setOptional(true);
-        if (dim != null) {
-            p.setSize(dim);
-        }
-        if (maxSize != null) {
-            p.setMaxSize(maxSize);
-        }
-        return p.get();
     }