Changeset 9632 in josm

Timestamp:

2016-01-25T23:42:17+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12443 - NPE (regression from r9588, see #12412)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModelTest.java (added)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -441 +441 @@
 
     RelationMember getRelationMemberForPrimitive(final OsmPrimitive primitive) {
-        final Collection<TaggingPreset> presets = TaggingPresets.getMatchingPresets(EnumSet.of(TaggingPresetType.forPrimitive(relation)),
+        final Collection<TaggingPreset> presets = TaggingPresets.getMatchingPresets(
+                EnumSet.of(relation != null ? TaggingPresetType.forPrimitive(relation) : TaggingPresetType.RELATION),
                 presetHandler.getSelection().iterator().next().getKeys(), false);
         Collection<String> potentialRoles = new TreeSet<>();