Changeset 200 in josm for src/org/openstreetmap/josm/tools/ImageProvider.java

Timestamp:

2007-02-14T16:21:14+01:00 (18 years ago)

Author:

imi

Message:

• new MarkerLayer code from Frederik. Supports Audio, Image and WebMarker (links)

File:

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

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

@@ -52 +52 @@
          */
         public static ImageIcon get(String subdir, String name) {
-                if (subdir != "")
+                ImageIcon icon = getIfAvailable(subdir, name);
+                if (icon == null) {
+                        String ext = name.indexOf('.') != -1 ? "" : ".png";
+                        throw new NullPointerException("/images/"+subdir+name+ext+" not found");
+                }
+                return icon;
+        }
+
+        /**
+         * 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.
+         */
+        public static ImageIcon getIfAvailable(String subdir, String name) {
+                if (name == null)
+                        return null;
+                if (subdir == null || subdir != "")
                         subdir += "/";
                 String ext = name.indexOf('.') != -1 ? "" : ".png";