Changeset 31040 in osm for applications/editors/josm/plugins/utilsplugin2

Timestamp:

2015-03-01T23:34:35+01:00 (9 years ago)

Author:

donvip

Message:

[josm_utilsplugin2] fix #josm11188 - NPE

File:

• applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/PasteRelationsAction.java (modified) (3 diffs)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/PasteRelationsAction.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.utilsplugin2.actions;
 
-import org.openstreetmap.josm.data.osm.*;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.command.*;
-import java.util.*;
-import java.awt.event.KeyEvent;
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.PrimitiveData;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.tools.Shortcut;
-import java.awt.event.ActionEvent;
-import org.openstreetmap.josm.actions.JosmAction;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -33 +44 @@
         for( PrimitiveData pdata : Main.pasteBuffer.getDirectlyAdded() ) {
             OsmPrimitive p = getCurrentDataSet().getPrimitiveById(pdata.getUniqueId(), pdata.getType());
-            for( Relation r : OsmPrimitive.getFilteredList(p.getReferrers(), Relation.class)) {
-                String role = relations.get(r);
-                for( RelationMember m : r.getMembers() ) {
-                    if( m.getMember().equals(p) ) {
-                        String newRole = m.getRole();
-                        if( newRole != null && role == null )
-                            role = newRole;
-                        else if( newRole != null ? !newRole.equals(role) : role != null ) {
-                            role = "";
-                            break;
-                        }
-                    }
-                }
-                relations.put(r, role);
+            if (p != null) {
+                    for( Relation r : OsmPrimitive.getFilteredList(p.getReferrers(), Relation.class)) {
+                        String role = relations.get(r);
+                        for( RelationMember m : r.getMembers() ) {
+                            if( m.getMember().equals(p) ) {
+                                String newRole = m.getRole();
+                                if( newRole != null && role == null )
+                                    role = newRole;
+                                else if( newRole != null ? !newRole.equals(role) : role != null ) {
+                                    role = "";
+                                    break;
+                                }
+                            }
+                        }
+                        relations.put(r, role);
+                    }
             }
         }
@@ -56 +69 @@
             for( OsmPrimitive p : selection ) {
                 if( !r.getMemberPrimitives().contains(p) && !r.equals(p) ) {
-                    String role = relations.get(rel);              
+                    String role = relations.get(rel);
                     if ("associatedStreet".equals(r.get("type"))) {
                         if (p.get("highway") != null) {