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

Timestamp:

2014-11-02T01:19:59+01:00 (9 years ago)

Author:

stoecker

Message:

see #10684 - no double loading of images, cleanup action icons - menu icon size defaults now to 16x16 (previously most time 24x24) with some errors - maybe 24x24 should be default?

File:

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

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

@@ -163 +163 @@
     private static final ExecutorService IMAGE_FETCHER = Executors.newSingleThreadExecutor();
 
+    /**
+     * Callback interface for asynchronous image loading.
+     */
     public interface ImageCallback {
         void finished(ImageIcon result);
+    }
+
+    /**
+     * Callback interface for asynchronous image loading (with delayed scaling possibility).
+     * @since 7693
+     */
+    public interface ImageResourceCallback {
+        void finished(ImageResource result);
     }
 
@@ -237 +248 @@
      * @since 7687
      */
-    public Dimension getImageSizes(ImageSizes size) {
+    static public Dimension getImageSizes(ImageSizes size) {
         int sizeval;
         switch(size) {
@@ -382 +393 @@
 
     /**
+     * Execute the image request and scale result.
+     * @return the requested image or null if the request failed
+     */
+    public ImageIcon get() {
+        ImageResource ir = getResource();
+        if (maxWidth != -1 || maxHeight != -1)
+            return ir.getImageIconBounded(new Dimension(maxWidth, maxHeight));
+        else
+            return ir.getImageIcon(new Dimension(width, height));
+    }
+
+    /**
      * Execute the image request.
      * @return the requested image or null if the request failed
-     */
-    public ImageIcon get() {
+     * @since 7693
+     */
+    public ImageResource getResource() {
         ImageResource ir = getIfAvailableImpl(additionalClassLoaders);
         if (ir == null) {
@@ -398 +422 @@
             }
         }
-        if (maxWidth != -1 || maxHeight != -1)
-            return ir.getImageIconBounded(new Dimension(maxWidth, maxHeight));
-        else
-            return ir.getImageIcon(new Dimension(width, height));
+        return ir;
     }
 
@@ -428 +449 @@
             ImageIcon result = get();
             callback.finished(result);
+        }
+    }
+
+    /**
+     * Load the image in a background thread.
+     *
+     * This method returns immediately and runs the image request
+     * asynchronously.
+     *
+     * @param callback a callback. It is called, when the image is ready.
+     * This can happen before the call to this method returns or it may be
+     * invoked some time (seconds) later. If no image is available, a null
+     * value is returned to callback (just like {@link #get}).
+     * @since 7693
+     */
+    public void getInBackground(final ImageResourceCallback callback) {
+        if (name.startsWith("http://") || name.startsWith("wiki://")) {
+            Runnable fetch = new Runnable() {
+                @Override
+                public void run() {
+                    callback.finished(getResource());
+                }
+            };
+            IMAGE_FETCHER.submit(fetch);
+        } else {
+            callback.finished(getResource());
         }
     }