Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java	(revision 16520)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java	(revision 16630)
@@ -50,13 +50,13 @@
 
 	public Iterable<Node> getNodes() {
-		return new FilteredOsmPrimitiveIterable<Node>(Main.ds.nodes);
+		return new FilteredOsmPrimitiveIterable<Node>(Main.main.getCurrentDataSet().nodes);
 	}
 
 	public Iterable<Relation> getRelations() {
-		return new FilteredRelationIterable(Main.ds.relations);
+		return new FilteredRelationIterable(Main.main.getCurrentDataSet().relations);
 	}
 
 	public Iterable<Way> getWays() {
-		return new FilteredOsmPrimitiveIterable<Way>(Main.ds.ways);
+		return new FilteredOsmPrimitiveIterable<Way>(Main.main.getCurrentDataSet().ways);
 	}