Changeset 36375 in osm for applications/editors/josm/plugins/utilsplugin2/src/org

Timestamp:

2025-01-28T17:01:13+01:00 (2 weeks ago)

Author:

taylor.smock

Message:

Fix build issues for Java 17+

It still fails to build with Java 11 -- errorprone needs to be an older version
for Java 11, and I suspect the ant maven library is not calculating the right
profiles.

File:

• applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java

@@ -106 +106 @@
         if (firstNode.isNew() && !secondNode.isNew())
             return buildReplaceNodeCommand(secondNode, firstNode);
-        else if (!firstNode.isNew() && secondNode.isNew())
-            return buildReplaceNodeCommand(firstNode, secondNode);
-        else
+        else // if (!firstNode.isNew() && secondNode.isNew()) -- merge same code branches
             // both nodes are new OR uploaded, act like MergeNodes, moving first
             // node to second