Changeset 34265 in osm for applications/editors/josm/plugins

Timestamp:

2018-06-11T03:23:10+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 13906

Location:

applications/editors/josm/plugins/public_transport

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/public_transport/actions/GTFSImporterAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/actions/RoutePatternAction.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java (modified) (2 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13665"/>
+    <property name="plugin.main.version" value="13906"/>
 
     <property name="plugin.author" value="Roland M. Olbricht"/>

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/GTFSImporterAction.java

@@ -30 +30 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.public_transport.commands.GTFSAddCommand;
@@ -311 +312 @@
             int j = consideredLines.elementAt(i);
             if (nodes.elementAt(j) != null)
-                nodes.elementAt(j).accept(box);
+                nodes.elementAt(j).accept((PrimitiveVisitor) box);
         }
         if (box.getBounds() == null)

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/RoutePatternAction.java

@@ -53 +53 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.public_transport.models.ItineraryTableModel;
@@ -1092 +1093 @@
                     if ((itineraryTable.isRowSelected(i))
                             && (itineraryData.ways.elementAt(i) != null)) {
-                        itineraryData.ways.elementAt(i).accept(box);
+                        itineraryData.ways.elementAt(i).accept((PrimitiveVisitor) box);
                     }
                 }
@@ -1098 +1099 @@
                 for (int i = 0; i < itineraryData.getRowCount(); ++i) {
                     if (itineraryData.ways.elementAt(i) != null) {
-                        itineraryData.ways.elementAt(i).accept(box);
+                        itineraryData.ways.elementAt(i).accept((PrimitiveVisitor) box);
                     }
                 }
@@ -1324 +1325 @@
                 for (int i = 0; i < stoplistData.getRowCount(); ++i) {
                     if (stoplistTable.isRowSelected(i)) {
-                        stoplistData.nodes.elementAt(i).accept(box);
+                        stoplistData.nodes.elementAt(i).accept((PrimitiveVisitor) box);
                     }
                 }
             } else {
                 for (int i = 0; i < stoplistData.getRowCount(); ++i) {
-                    stoplistData.nodes.elementAt(i).accept(box);
+                    stoplistData.nodes.elementAt(i).accept((PrimitiveVisitor) box);
                 }
             }

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java

@@ -34 +34 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.io.GpxReader;
@@ -342 +343 @@
             int j = consideredLines.elementAt(i);
             if (nodes.elementAt(j) != null)
-                nodes.elementAt(j).accept(box);
+                nodes.elementAt(j).accept((PrimitiveVisitor) box);
         }
         if (box.getBounds() == null)