Fixed the failure of a compability with new JOSM version

Fixed the failure of a compability with JOSM versions released after the February of 2022 year Small fixes
bwr57 · Nov 27, 2022 · ee33d9a · ee33d9a
1 parent 6d61f31
commit ee33d9a
Show file tree

Hide file tree

Showing 26 changed files with 29 additions and 6 deletions.
diff --git a/JOSM-CustomizePublicTransportStop.iml b/JOSM-CustomizePublicTransportStop.iml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/bin" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/images" type="java-resource" relativeOutputPath="images" />
+      <sourceFolder url="file://$MODULE_DIR$/data" type="java-resource" relativeOutputPath="data" />
+    </content>
+    <orderEntry type="jdk" jdkName="17" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../josm-tested (2).jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>
diff --git a/...openstreetmap/josm/plugins/CustomizePublicTransportStop/CreateNewStopPointOperation.class b/...openstreetmap/josm/plugins/CustomizePublicTransportStop/CreateNewStopPointOperation.class
diff --git a/...josm/plugins/CustomizePublicTransportStop/CreateStopAreaFromSelectedObjectOperation.class b/...josm/plugins/CustomizePublicTransportStop/CreateStopAreaFromSelectedObjectOperation.class
diff --git a/...eetmap/josm/plugins/CustomizePublicTransportStop/CustomizePublicTransportStopDialog.class b/...eetmap/josm/plugins/CustomizePublicTransportStop/CustomizePublicTransportStopDialog.class
diff --git a/...eetmap/josm/plugins/CustomizePublicTransportStop/CustomizePublicTransportStopPlugin.class b/...eetmap/josm/plugins/CustomizePublicTransportStop/CustomizePublicTransportStopPlugin.class
diff --git a/...rodsoft/openstreetmap/josm/plugins/CustomizePublicTransportStop/CustomizeStopAction.class b/...rodsoft/openstreetmap/josm/plugins/CustomizePublicTransportStop/CustomizeStopAction.class
diff --git a/.../openstreetmap/josm/plugins/CustomizePublicTransportStop/CustomizeStopAreaOperation.class b/.../openstreetmap/josm/plugins/CustomizePublicTransportStop/CustomizeStopAreaOperation.class
diff --git a/...rodsoft/openstreetmap/josm/plugins/CustomizePublicTransportStop/IStopAreaCustomizer.class b/...rodsoft/openstreetmap/josm/plugins/CustomizePublicTransportStop/IStopAreaCustomizer.class
diff --git a/bin/ru/rodsoft/openstreetmap/josm/plugins/CustomizePublicTransportStop/MessageBox.class b/bin/ru/rodsoft/openstreetmap/josm/plugins/CustomizePublicTransportStop/MessageBox.class
diff --git a/...u/rodsoft/openstreetmap/josm/plugins/CustomizePublicTransportStop/NearestWaySegment.class b/...u/rodsoft/openstreetmap/josm/plugins/CustomizePublicTransportStop/NearestWaySegment.class
diff --git a/bin/ru/rodsoft/openstreetmap/josm/plugins/CustomizePublicTransportStop/OSMTags.class b/bin/ru/rodsoft/openstreetmap/josm/plugins/CustomizePublicTransportStop/OSMTags.class
diff --git a/bin/ru/rodsoft/openstreetmap/josm/plugins/CustomizePublicTransportStop/StopArea.class b/bin/ru/rodsoft/openstreetmap/josm/plugins/CustomizePublicTransportStop/StopArea.class
diff --git a/...dsoft/openstreetmap/josm/plugins/CustomizePublicTransportStop/StopAreaOperationBase.class b/...dsoft/openstreetmap/josm/plugins/CustomizePublicTransportStop/StopAreaOperationBase.class
diff --git a/data/cs.lang b/data/cs.lang
diff --git a/data/fr.lang b/data/fr.lang
diff --git a/data/hu.lang b/data/hu.lang
diff --git a/data/id.lang b/data/id.lang
diff --git a/data/it.lang b/data/it.lang
diff --git a/data/ko.lang b/data/ko.lang
diff --git a/data/lt.lang b/data/lt.lang
diff --git a/data/sk.lang b/data/sk.lang
diff --git a/data/uk.lang b/data/uk.lang
diff --git a/data/zh_CN.lang b/data/zh_CN.lang
diff --git a/data/zh_TW.lang b/data/zh_TW.lang
diff --git a/.../openstreetmap/josm/plugins/customizepublictransportstop/CreateNewStopPointOperation.java b/.../openstreetmap/josm/plugins/customizepublictransportstop/CreateNewStopPointOperation.java
@@ -268,7 +268,7 @@ protected NearestWaySegment getNearestWaySegment(LatLon platformCoord, StopArea
             dist_waySegments = getNearestWaySegmentsImpl(p);
         for (Map.Entry<Double, List<WaySegment>> entry : dist_waySegments.entrySet()) {
             for (WaySegment waySegment : entry.getValue()) {
-                if (testWay(waySegment.way, stopArea)) {
+                if (testWay(waySegment.getWay(), stopArea)) {
                     Node n = waySegment.getFirstNode();
                     Node lastN = waySegment.getSecondNode();
 
@@ -298,11 +298,11 @@ protected NearestWaySegment getNearestWaySegment(LatLon platformCoord, StopArea
      */
     protected Node createNodeOnWay(Node newStopNode, WaySegment waySegment) {
         UndoRedoHandler.getInstance().add(new AddCommand(MainApplication.getLayerManager().getEditDataSet(), newStopNode));
-        List<Node> wayNodes = waySegment.way.getNodes();
-        wayNodes.add(waySegment.lowerIndex + 1, newStopNode);
-        Way newWay = new Way(waySegment.way);
+        List<Node> wayNodes = waySegment.getWay().getNodes();
+        wayNodes.add(waySegment.getLowerIndex() + 1, newStopNode);
+        Way newWay = new Way(waySegment.getWay());
         newWay.setNodes(wayNodes);
-        UndoRedoHandler.getInstance().add(new ChangeCommand(waySegment.way, newWay));
+        UndoRedoHandler.getInstance().add(new ChangeCommand(waySegment.getWay(), newWay));
         return newStopNode;
     }
 

diff --git a/...g/openstreetmap/josm/plugins/customizepublictransportstop/CustomizeStopAreaOperation.java b/...g/openstreetmap/josm/plugins/customizepublictransportstop/CustomizeStopAreaOperation.java
@@ -252,7 +252,7 @@ else if (isFirst && !stopArea.isBusStation)
             commands = assignTag(commands, target, OSMTags.AREA_TAG, stopArea.isArea ? OSMTags.YES_TAG_VALUE : null,
                     OSMTags.NO_TAG_VALUE, stopArea.isSetDefaultValues);
             commands = assignTag(commands, target, OSMTags.LAYER_TAG,
-                    null == stopArea.layer || "0".equals(stopArea.layer) ? null : stopArea.service);
+                    null == stopArea.layer || "0".equals(stopArea.layer) ? null : stopArea.layer);
             commands = assignTag(commands, target, OSMTags.SURFACE_TAG,
                     null == stopArea.surface || OSMTags.UNKNOWN_TAG_VALUE.equals(stopArea.surface) ? null :
                             stopArea.surface,