Changeset 18427 in osm for applications/editors

Timestamp:

2009-11-02T21:12:54+01:00 (15 years ago)

Author:

jttt

Message:

Replace Dataset.nodes with getNodes(), etc

Location:

applications/editors/josm/plugins

Files:

• routes/build.xml (modified) (1 diff)
• routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java (modified) (3 diffs)
• surveyor/build.xml (modified) (1 diff)
• surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java (modified) (1 diff)

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

@@ -35 +35 @@
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be defined in routes.xml file in plugin directory"/>
-                <attribute name="Plugin-Mainversion" value="2263"/>
+                <attribute name="Plugin-Mainversion" value="2388"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.routes;
 
-import java.awt.Stroke;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.Stroke;
 import java.util.ArrayList;
 import java.util.List;
@@ -105 +105 @@
                 pathBuilder.clear();
 
-                for (Relation relation:dataset.relations) {
+                for (Relation relation:dataset.getRelations()) {
                         for (RouteDefinition route:routes) {
                                 if (route.matches(relation)) {
@@ -113 +113 @@
                 }
 
-                for (Way way:dataset.ways) {
+                for (Way way:dataset.getWays()) {
                         for (RouteDefinition route:routes) {
                                 if (route.matches(way)) {

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

@@ -37 +37 @@
                 <attribute name="Plugin-Description" value="Allow adding markers/nodes on current gps positions."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Surveyor"/>
-                <attribute name="Plugin-Mainversion" value="2012"/>
+                <attribute name="Plugin-Mainversion" value="2388"/>
                 <attribute name="Plugin-Requires" value="livegps"/>
                 <attribute name="Plugin-Stage" value="60"/>

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java

@@ -70 +70 @@
         node.put("created_by", "JOSM-surveyor-plugin");
         synchronized(LiveGpsLock.class) {
-            Main.map.mapView.getEditLayer().data.nodes.add(node);
+            Main.map.mapView.getEditLayer().data.addPrimitive(node);
             Main.main.getCurrentDataSet().setSelected(node);
         }