Changeset 29637 in osm for applications/editors/josm/plugins/osmarender/src/org

Timestamp:

2013-06-07T00:51:31+02:00 (12 years ago)

Author:

donvip

Message:

[josm_osmarenderer] fix #josm6790 - osmarender plugin fails on null dataset

File:

• applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java (modified) (3 diffs)

applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java

@@ -26 +26 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -53 +54 @@
         @Override
                 public void actionPerformed(ActionEvent e) {
+            DataSet ds = Main.main.getCurrentDataSet();
+            if (ds == null) {
+                return;
+            }
+            
             // get all stuff visible on screen
             LatLon bottomLeft = Main.map.mapView.getLatLon(0,Main.map.mapView.getHeight());
@@ -73 +79 @@
                 // Write nodes, make list of ways and relations
                 Set<OsmPrimitive> parents = new HashSet<OsmPrimitive>();
-                for (Node n : Main.main.getCurrentDataSet().getNodes()) {
+                for (Node n : ds.getNodes()) {
                     if (n.isUsable() && n.getCoor().isWithin(b)) {
                         parents.addAll(n.getReferrers());