Changeset 11508 in josm for trunk/src/org

Timestamp:

2017-01-29T04:29:01+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14282 - add robustness to GPX settings panel (patch by kidelo)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

@@ -7 +7 @@
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionListener;
@@ -281 +282 @@
 
         colorTypeHeatMapTune.addPropertyChangeListener(e -> {
-            // get image size of environment
-            final int iconSize = (int) colorTypeHeatMapTune.getPreferredSize().getHeight();
-            // ask the GPX draw for the correct color of that layer
-            final Color color = GpxDrawHelper.DEFAULT_COLOR.getChildColor(layerName != null ? layerName : "").get();
-            colorTypeHeatIconLabel.setIcon(GpxDrawHelper.getColorMapImageIcon(color, colorTypeHeatMapTune.getSelectedIndex(), iconSize));
+            final Dimension dim = colorTypeHeatMapTune.getPreferredSize();
+            if (null != dim) {
+                // get image size of environment
+                final int iconSize = (int) dim.getHeight();
+                final Color color;
+                // ask the GPX draw for the correct color of that layer ( if there is one )
+                if (null != layerName) {
+                    color = GpxDrawHelper.DEFAULT_COLOR.getChildColor(layerName).get();
+                } else {
+                    color = GpxDrawHelper.DEFAULT_COLOR.getDefaultValue();
+                }
+                colorTypeHeatIconLabel.setIcon(GpxDrawHelper.getColorMapImageIcon(color, colorTypeHeatMapTune.getSelectedIndex(), iconSize));
+            }
         });