Changeset 33263 in osm for applications

Timestamp:

2017-04-17T19:15:26+02:00 (8 years ago)

Author:

donvip

Message:

fix #josm14400 - NPE

File:

• applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java (modified) (5 diffs)

applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java

@@ -65 +65 @@
                         History h = HistoryDataSet.getInstance().getHistory(id, type);
 
+                        if (h == null) {
+                            Main.warn("Cannot find history for " + type + " " + id);
+                            return;
+                        }
+
                         HistoryOsmPrimitive hPrimitive1 = h.getLatest();
                         HistoryOsmPrimitive hPrimitive2;
@@ -117 +122 @@
 
                                 Relation rel = new Relation(id, (int) hPrimitive1.getVersion());
-
                                 HistoryRelation hRel = (HistoryRelation) hPrimitive2;
 
@@ -142 +146 @@
                                         members.add(new RelationMember(m.getRole(), p));
                                     }
-
                                     rel.setMembers(members);
                                 }
-
                                 primitive = rel;
                             }
@@ -166 +168 @@
                                   ? tr("Unable to undelete relation {0}. Object has likely been redacted", id)
                                   : null;
-                                GuiHelper.runInEDT(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        new Notification(msg).setIcon(JOptionPane.WARNING_MESSAGE).show();
-                                    }
-                                });
+                                GuiHelper.runInEDT(() -> new Notification(msg).setIcon(JOptionPane.WARNING_MESSAGE).show());
                                 Main.warn(msg);
                             }
@@ -187 +184 @@
                 Main.map.repaint();
             }
-            GuiHelper.runInEDT(new Runnable() {
-                @Override
-                public void run() {
-                    AutoScaleAction.zoomTo(layer.data.allNonDeletedPrimitives());
-                }
-            });
+            GuiHelper.runInEDT(() -> AutoScaleAction.zoomTo(layer.data.allNonDeletedPrimitives()));
         }
     }