Changeset 4616 in josm

Timestamp:

Nov 27, 2011 11:10:38 PM (18 months ago)

Author:

bastiK

Message:

see #7088 - avoid NPE

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• MapPaintPreference.java (modified) (1 diff)
• TaggingPresetPreference.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java

@@ -255 +255 @@
         @Override
         public Collection<String> serialize(SourceEntry entry) {
-            return Arrays.asList(new String[] {entry.url, entry.name, entry.title, Boolean.toString(entry.active)});
+            return Arrays.asList(new String[] {
+                    entry.url,
+                    entry.name == null ? "" : entry.name,
+                    entry.title == null ? "" : entry.title,
+                    Boolean.toString(entry.active)
+            });
         }
 

trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java

@@ -336 +336 @@
         @Override
         public Collection<String> serialize(SourceEntry entry) {
-            return Arrays.asList(new String[] {entry.url, entry.title});
+            return Arrays.asList(new String[] {entry.url, entry.title == null ? "" : entry.title});
         }