Changeset 21433 in osm for applications/editors/josm/plugins/remotecontrol/src

Timestamp:

2010-05-24T17:52:53+02:00 (15 years ago)

Author:

stoecker

Message:

fix exception when data loading fails, add rel shortcut for selection

File:

• applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java (modified) (1 diff)

applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java

@@ -196 +196 @@
                                 } else if (item.startsWith("relation")) {
                                     relations.add(Long.parseLong(item.substring(8)));
+                                } else if (item.startsWith("rel")) {
+                                    relations.add(Long.parseLong(item.substring(3)));
                                 } else {
                                     System.out.println("RemoteControl: invalid selection '"+item+"' ignored");
                                 }
                             }
-                            for (Way w : Main.main.getCurrentDataSet().getWays()) if (ways.contains(w.getId())) newSel.add(w);
-                            for (Node n : Main.main.getCurrentDataSet().getNodes()) if (nodes.contains(n.getId())) newSel.add(n);
-                            for (Relation r : Main.main.getCurrentDataSet().getRelations()) if (relations.contains(r.getId())) newSel.add(r);
-                            Main.main.getCurrentDataSet().setSelected(newSel);
+                            DataSet ds = Main.main.getCurrentDataSet();
+                            if(ds == null) // e.g. download failed
+                                return;
+                            for (Way w : ds.getWays()) if (ways.contains(w.getId())) newSel.add(w);
+                            for (Node n : ds.getNodes()) if (nodes.contains(n.getId())) newSel.add(n);
+                            for (Relation r : ds.getRelations()) if (relations.contains(r.getId())) newSel.add(r);
+                            ds.setSelected(newSel);
                             if (Main.pref.getBoolean("remotecontrol.permission.change-viewport", true))
                                 new AutoScaleAction("selection").actionPerformed(null);