Merge pull request #26 from tsmock/auto-tools-17177

auto-tools: update for compatibility with JOSM r17896
JOSM · May 18, 2021 · 3901945 · 3901945
2 parents c466b59 + 1d9cd18
commit 3901945
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/build.xml b/build.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="auto_tools" default="dist" basedir=".">
     <property name="commit.message" value="Auto Tools"/>
-    <property name="plugin.main.version" value="14960"/>
-    <property name="plugin.version" value="v1.3.2"/>
+    <property name="plugin.main.version" value="17896"/>
+    <property name="plugin.version" value="v1.3.3"/>
     <property name="plugin.author" value="Rub21,samely"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.auto_tools.AutoTools"/>   
     <property name="plugin.description" value="Automatic tools to help on common issues"/>
@@ -14,6 +14,8 @@
         <manifest file="MANIFEST" mode="update">
             <attribute name="13265_Plugin-Url" value="v1.2;https://github.com/JOSM/auto-tools/releases/download/v1.2/auto_tools.jar" />
             <attribute name="13922_Plugin-Url" value="v1.3;https://github.com/JOSM/auto-tools/releases/download/v1.3/auto_tools.jar" />
+            <attribute name="14960_Plugin-Url" value="v1.3.2;https://github.com/JOSM/auto-tools/releases/download/v1.3.2/auto_tools.jar" />
+
         </manifest>
     </target>
     <import file="../build-common.xml"/>

diff --git a/src/org/openstreetmap/josm/plugins/auto_tools/actions/SplittingTool.java b/src/org/openstreetmap/josm/plugins/auto_tools/actions/SplittingTool.java
@@ -28,6 +28,7 @@
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.IWaySegment;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -185,17 +186,17 @@ public void keyReleased(KeyEvent e) {
     }
 
     private void insertNodeIntoAllNearbySegments(List<WaySegment> wss, Node n, Collection<OsmPrimitive> newSelection,
-            Collection<Command> cmds, List<Way> replacedWays, List<Way> reuseWays) {
+                                                 Collection<Command> cmds, List<Way> replacedWays, List<Way> reuseWays) {
         Map<Way, List<Integer>> insertPoints = new HashMap<>();
-        for (WaySegment ws : wss) {
+        for (IWaySegment<Node, Way> ws : wss) {
             List<Integer> is;
-            if (insertPoints.containsKey(ws.way)) {
-                is = insertPoints.get(ws.way);
+            if (insertPoints.containsKey(ws.getWay())) {
+                is = insertPoints.get(ws.getWay());
             } else {
                 is = new ArrayList<>();
-                insertPoints.put(ws.way, is);
+                insertPoints.put(ws.getWay(), is);
             }
-            is.add(ws.lowerIndex);
+            is.add(ws.getLowerIndex());
         }
 
         Set<Pair<Node, Node>> segSet = new HashSet<>();