Changeset 5541 in josm for trunk/src/org

Timestamp:

2012-10-28T12:43:17+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8159 - NPE in imagery providers panel

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryInfo.java (modified) (1 diff)
• gui/preferences/imagery/ImageryPreference.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -276 +276 @@
         if (imageryType != that.imageryType) return false;
         if (url != null ? !url.equals(that.url) : that.url != null) return false;
+        if (name != null ? !name.equals(that.name) : that.name != null) return false;
 
         return true;

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

@@ -219 +219 @@
                 JLabel label = (JLabel) super.getTableCellRendererComponent(
                         table, value, isSelected, hasFocus, row, column);
-                String t = value.toString();
                 label.setBackground(Main.pref.getUIColor("Table.background"));
                 if (isSelected) {
                     label.setForeground(Main.pref.getUIColor("Table.foreground"));
                 }
-                for(ImageryInfo l : layers)
-                {
-                    if(l.getExtendedUrl().equals(t)) {
-                        label.setBackground(Main.pref.getColor(
-                                marktr("Imagery Background: Default"),
-                                new Color(200,255,200)));
-                        break;
+                if (value != null) { // Fix #8159
+                    String t = value.toString();
+                    for (ImageryInfo l : layers) {
+                        if (l.getExtendedUrl().equals(t)) {
+                            label.setBackground(Main.pref.getColor(
+                                    marktr("Imagery Background: Default"),
+                                    new Color(200,255,200)));
+                            break;
+                        }
                     }
                 }