Changeset 1711 in josm for trunk

Timestamp:

2009-06-28T14:40:12+02:00 (15 years ago)

Author:

stoecker

Message:

support URL's for preset images

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/MirroredInputStream.java (modified) (3 diffs)
• tools/ImageProvider.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java

@@ -21 +21 @@
 public class MirroredInputStream extends InputStream {
     InputStream fs = null;
+    File file = null;
 
     public MirroredInputStream(String name) throws IOException {
@@ -30 +31 @@
     }
 
+    public MirroredInputStream(String name, String destDir) throws IOException {
+        this(name, destDir, -1L);
+    }
+
     public MirroredInputStream(String name, String destDir, long maxTime) throws IOException {
         URL url;
-        File file = null;
         try {
             url = new URL(name);
@@ -53 +57 @@
             throw new IOException();
         fs = new FileInputStream(file);
+    }
+
+    public File getFile()
+    {
+       return file;
     }
 

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

@@ -15 +15 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -28 +29 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.io.MirroredInputStream;
 
 /**
@@ -85 +87 @@
         if (name == null)
             return null;
+        if (name.startsWith("http://"))
+        {
+            Image img = cache.get(name);
+            if(img == null)
+            {
+                try
+                {
+                    MirroredInputStream is = new MirroredInputStream(name,
+                    new File(Main.pref.getPreferencesDir(), "images").toString());
+                    if(is != null)
+                    {
+                      img = Toolkit.getDefaultToolkit().createImage(is.getFile().toURI().toURL());
+                      cache.put(name, img);
+                    }
+                }
+                catch(IOException e) {
+                }
+            }
+            return img == null ? null : new ImageIcon(img);
+        }
         if (subdir == null)
             subdir = "";