Changeset 16630 in osm

Timestamp:

2009-07-21T22:12:17+02:00 (15 years ago)

Author:

jttt

Message:

Make it work without Main.ds

Location:

applications/editors/josm/plugins/graphview

Files:

• .classpath (modified) (1 diff)
• .project (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java (modified) (1 diff)

applications/editors/josm/plugins/graphview/.classpath

@@ -2 +2 @@
 <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>

applications/editors/josm/plugins/graphview/.project

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-        <name>validator</name>
+        <name>JOSM-graphview</name>
         <comment></comment>
         <projects>

applications/editors/josm/plugins/graphview/build.xml

@@ -57 +57 @@
                 <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>

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java

@@ -50 +50 @@
 
         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);
         }