Changeset 13821 in josm for trunk

Timestamp:

2018-05-23T02:59:51+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16308, see #16047 - remove blank png icon. With jdk-11-ea+14 JOSM fails to load it (ImageProvider returns null). JDK bugs:

• ​https://bugs.openjdk.java.net/browse/JDK-6574555
• ​https://bugs.openjdk.java.net/browse/JDK-6788458

Location:

trunk

Files:

• images/dialogs/layerlist/blank.png (deleted)
• src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -13 +13 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -80 +81 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.InputMapUtils;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -392 +394 @@
     }
 
+    static ImageIcon createBlankIcon() {
+        return new ImageIcon(new BufferedImage(
+                ImageSizes.LAYER.getAdjustedWidth(), ImageSizes.LAYER.getAdjustedHeight(), BufferedImage.TYPE_INT_ARGB));
+    }
+
     private static class ActiveLayerCheckBox extends JCheckBox {
         ActiveLayerCheckBox() {
             setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-            ImageIcon blank = ImageProvider.get("dialogs/layerlist", "blank");
+            ImageIcon blank = createBlankIcon();
             ImageIcon active = ImageProvider.get("dialogs/layerlist", "active");
             setIcon(blank);
@@ -446 +453 @@
         NativeScaleLayerCheckBox() {
             setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-            ImageIcon blank = ImageProvider.get("dialogs/layerlist", "blank");
+            ImageIcon blank = createBlankIcon();
             ImageIcon active = ImageProvider.get("dialogs/layerlist", "scale");
             setIcon(blank);
@@ -456 +463 @@
         OffsetLayerCheckBox() {
             setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-            ImageIcon blank = ImageProvider.get("dialogs/layerlist", "blank");
+            ImageIcon blank = createBlankIcon();
             ImageIcon withOffset = ImageProvider.get("dialogs/layerlist", "offset");
             setIcon(blank);