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

Timestamp:

2015-05-22T01:06:28+02:00 (9 years ago)

Author:

Don-vip

Message:

ExecutorService field doesn't ever get shutdown

File:

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

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

@@ -1612 +1612 @@
      * @return The same image as {@code bi} where all pixels of the given color are transparent.
      * This resulting image has also the special property {@link #PROP_TRANSPARENCY_FORCED} set to {@code color}
-     * @since 7132
      * @see BufferedImage#getProperty
      * @see #isTransparencyForced
+     * @since 7132
      */
     public static BufferedImage makeImageTransparent(BufferedImage bi, Color color) {
@@ -1653 +1653 @@
      * @param bi The {@code BufferedImage} to test
      * @return {@code true} if the transparency of {@code bi} has been enforced by a previous call to {@code makeImageTransparent}.
+     * @see #makeImageTransparent
      * @since 7132
-     * @see #makeImageTransparent
      */
     public static boolean isTransparencyForced(BufferedImage bi) {
@@ -1664 +1664 @@
      * @param bi The {@code BufferedImage} to test
      * @return {@code true} if {@code bi} has a transparent color determined by a previous call to {@code read}.
+     * @see #read
      * @since 7132
-     * @see #read
      */
     public static boolean hasTransparentColor(BufferedImage bi) {
         return bi != null && !bi.getProperty(PROP_TRANSPARENCY_COLOR).equals(Image.UndefinedProperty);
     }
+
+    /**
+     * Shutdown background image fetcher.
+     * @param now if {@code true}, attempts to stop all actively executing tasks, halts the processing of waiting tasks.
+     * if {@code false}, initiates an orderly shutdown in which previously submitted tasks are executed, but no new tasks will be accepted
+     * @since 8412
+     */
+    public static void shutdown(boolean now) {
+        if (now) {
+            IMAGE_FETCHER.shutdownNow();
+        } else {
+            IMAGE_FETCHER.shutdown();
+        }
+    }
 }