Changeset 529 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2008-01-30T18:02:38+01:00 (18 years ago)

Author:

gebner

Message:

Part one of patch by Dave Hansen <dave@…>

• Remove unused imports
• Main.debug
• Make attribute merging aware of TIGER-import attributes
• Better upload progress information
• Retry uploads

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (2 diffs)

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

@@ -39 +39 @@
          * The icon cache
          */
-        private static Map<URL, Image> cache = new HashMap<URL, Image>();
+        private static Map<String, Image> cache = new HashMap<String, Image>();
 
         /**
@@ -75 +75 @@
                         subdir += "/";
                 String ext = name.indexOf('.') != -1 ? "" : ".png";
+                String full_name = subdir+name+ext;
 
-                URL path = getImageUrl(subdir+name+ext);
-                if (path == null)
-                        return null;
-                
-                Image img = cache.get(path);
+                Image img = cache.get(full_name);
                 if (img == null) {
+                        // getImageUrl() does a ton of "stat()" calls and gets expensive
+                        // and redundant when you have a whole ton of objects.  So,
+                        // index the cache by the name of the icon we're looking for
+                        // and don't bother to create a URL unless we're actually
+                        // creating the image.
+                        URL path = getImageUrl(full_name);
+                        if (path == null)
+                                return null;
                         img = Toolkit.getDefaultToolkit().createImage(path);
-                        cache.put(path, img);
+                        cache.put(full_name, img);
                 }
+        
                 return new ImageIcon(img);
         }