Changeset 10016 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-03-19T14:33:43+01:00 (8 years ago)

Author:

bastiK

Message:

fixed #12650 - Error when click on Imagery providers (see #6301)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -277 +277 @@
                 ImageryInfo info = (ImageryInfo) value;
                 JLabel label = (JLabel) super.getTableCellRendererComponent(
-                        table, info.getName(), isSelected, hasFocus, row, column);
+                        table, info == null ? null : info.getName(), isSelected, hasFocus, row, column);
                 GuiHelper.setBackgroundReadable(label, UIManager.getColor("Table.background"));
-                label.setToolTipText(info.getToolTipText());
+                if (info != null) {
+                    label.setToolTipText(info.getToolTipText());
+                }
                 return label;
             }