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

Timestamp:

2010-01-24T14:20:12+01:00 (14 years ago)

Author:

stoecker

Message:

close #4418 - support zip files for styles and presets

File:

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

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

@@ -17 +17 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.io.InputStream;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -26 +27 @@
 import java.util.List;
 import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 import javax.swing.Icon;
@@ -88 +91 @@
      */
     public static ImageIcon getIfAvailable(Collection<String> dirs, String id, String subdir, String name) {
+        return getIfAvailable(dirs, id, subdir, name, null);
+    }
+
+    public static ImageIcon getIfAvailable(Collection<String> dirs, String id, String subdir, String name, File archive) {
         if (name == null)
             return null;
@@ -116 +123 @@
         if (dirs != null && dirs.size() > 0) {
             cache_name = "id:" + id + ":" + full_name;
+            if(archive != null)
+                cache_name += ":" + archive.getName();
         }
 
         Image img = cache.get(cache_name);
         if (img == null) {
+            if(archive != null)
+            {
+                try
+                {
+                    ZipFile zipFile = new ZipFile(archive);
+                    ZipEntry entry = zipFile.getEntry(full_name);
+                    if(entry != null)
+                    {
+                        int size = (int)entry.getSize();
+                        int offs = 0;
+                        byte[] buf = new byte[size];
+                        InputStream is = zipFile.getInputStream(entry);
+                        while(size > 0)
+                        {
+                            int l = is.read(buf, offs, size);
+                            offs += l;
+                            size -= l;
+                        }
+                        img = Toolkit.getDefaultToolkit().createImage(buf);
+                    }
+                } catch (Exception e) {
+                    System.err.println(tr("Warning: failed to handle zip file ''{0}''. Exception was: {1}", archive.getName(), e.toString()));
+                }
+            }
             // getImageUrl() does a ton of "stat()" calls and gets expensive
             // and redundant when you have a whole ton of objects. So,
@@ -125 +158 @@
             // and don't bother to create a URL unless we're actually
             // creating the image.
-            URL path = getImageUrl(full_name, dirs);
-            if (path == null)
-                return null;
-            img = Toolkit.getDefaultToolkit().createImage(path);
+            if(img == null)
+            {
+                URL path = getImageUrl(full_name, dirs);
+                if (path == null)
+                    return null;
+                img = Toolkit.getDefaultToolkit().createImage(path);
+            }
             cache.put(cache_name, img);
         }