Index: applications/editors/josm/oldplugins/public_transport_layer/src/ptl/DistanceBetweenStops.java
===================================================================
--- applications/editors/josm/oldplugins/public_transport_layer/src/ptl/DistanceBetweenStops.java	(revision 36100)
+++ applications/editors/josm/oldplugins/public_transport_layer/src/ptl/DistanceBetweenStops.java	(revision 36122)
@@ -14,5 +14,4 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.SystemOfMeasurement;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.Node;
@@ -46,7 +45,7 @@
         final List<Node> routeNodes = new ArrayList<>();
         for (final RelationMember member : route.getMembers()) {
-            if (member.hasRole("stop", "stop_exit_only", "stop_entry_only") && OsmPrimitiveType.NODE.equals(member.getType())) {
+            if (member.hasRole("stop", "stop_exit_only", "stop_entry_only") && OsmPrimitiveType.NODE == member.getType()) {
                 stopNodes.add(member.getNode());
-            } else if (member.hasRole("") && OsmPrimitiveType.WAY.equals(member.getType())) {
+            } else if (member.hasRole("") && OsmPrimitiveType.WAY == member.getType()) {
                 routeSegments.add(member);
             }
@@ -123,10 +122,6 @@
         Node lastN = null;
         for (Node n : nodes) {
-            if (lastN != null) {
-                LatLon lastNcoor = lastN.getCoor();
-                LatLon coor = n.getCoor();
-                if (lastNcoor != null && coor != null) {
-                    length += coor.greatCircleDistance(lastNcoor);
-                }
+            if (lastN != null && n != null && lastN.isLatLonKnown() && n.isLatLonKnown()) {
+                length += n.greatCircleDistance(lastN);
             }
             lastN = n;
@@ -153,17 +148,14 @@
         }
 
-        new ExtendedDialog(MainApplication.getMainFrame(), getValue(NAME).toString(), new String[]{tr("Close")}) {
-            {
-                setButtonIcons(new String[]{"ok.png"});
-                final JosmTextArea jte = new JosmTextArea();
-                jte.setFont(GuiHelper.getMonospacedFont(jte));
-                jte.setEditable(false);
-                jte.append(sb.toString());
-                jte.setSelectionStart(0);
-                jte.setSelectionEnd(0);
-                setContent(jte);
-            }
-
-        }.showDialog();
+        ExtendedDialog extendedDialog = new ExtendedDialog(MainApplication.getMainFrame(), getValue(NAME).toString(), tr("Close"));
+        extendedDialog.setButtonIcons("ok");
+        final JosmTextArea jte = new JosmTextArea();
+        jte.setFont(GuiHelper.getMonospacedFont(jte));
+        jte.setEditable(false);
+        jte.append(sb.toString());
+        jte.setSelectionStart(0);
+        jte.setSelectionEnd(0);
+        extendedDialog.setContent(jte);
+        extendedDialog.showDialog();
     }
 }
Index: applications/editors/josm/oldplugins/public_transport_layer/src/ptl/PublicTransportLayer.java
===================================================================
--- applications/editors/josm/oldplugins/public_transport_layer/src/ptl/PublicTransportLayer.java	(revision 36100)
+++ applications/editors/josm/oldplugins/public_transport_layer/src/ptl/PublicTransportLayer.java	(revision 36122)
@@ -38,5 +38,4 @@
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -71,5 +70,5 @@
             Node previousNode = null;
             for (final RelationMember member : relation.getMembers()) {
-                if (OsmPrimitiveType.NODE.equals(member.getType()) && "stop".equals(member.getRole())) {
+                if (OsmPrimitiveType.NODE == member.getType() && "stop".equals(member.getRole())) {
                     way.addNode(member.getNode());
                     if (previousNode != null) {
@@ -83,6 +82,6 @@
             try {
                 color = ColorHelper.html2color(relation.get("colour"));
-            } catch (RuntimeException ignore) {
-                Logging.trace(ignore);
+            } catch (RuntimeException runtimeException) {
+                Logging.trace(runtimeException);
             }
             renderer.drawWay(way, color, new BasicStroke(1), null, null, 0, doDrawArrows, false, false, false);
@@ -103,5 +102,5 @@
 
         for (Pair<Node, Node> nodePair : segmentRefs.keySet()) {
-            final String label = Utils.join(tr(", "), new TreeSet<>(segmentRefs.get(nodePair)));
+            final String label = String.join(", ", new TreeSet<>(segmentRefs.get(nodePair)));
             c.put(StyleKeys.TEXT, label);
             final TextLabel text = TextLabel.create(env, color, false);