Index: applications/editors/josm/plugins/graphview/.classpath
===================================================================
--- applications/editors/josm/plugins/graphview/.classpath	(revision 16629)
+++ applications/editors/josm/plugins/graphview/.classpath	(revision 16630)
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/josm"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
Index: applications/editors/josm/plugins/graphview/.project
===================================================================
--- applications/editors/josm/plugins/graphview/.project	(revision 16629)
+++ applications/editors/josm/plugins/graphview/.project	(revision 16630)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>validator</name>
+	<name>JOSM-graphview</name>
 	<comment></comment>
 	<projects>
Index: applications/editors/josm/plugins/graphview/build.xml
===================================================================
--- applications/editors/josm/plugins/graphview/build.xml	(revision 16629)
+++ applications/editors/josm/plugins/graphview/build.xml	(revision 16630)
@@ -57,5 +57,5 @@
                 <attribute name="Plugin-Description" value="Visualizes routing information as a routing graph."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Graphview"/>
-                <attribute name="Plugin-Mainversion" value="1788"/>
+                <attribute name="Plugin-Mainversion" value="1815"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
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 16629)
+++ 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);
 	}