Index: /applications/editors/josm/plugins/public_transport_layer/.checkstyle
===================================================================
--- /applications/editors/josm/plugins/public_transport_layer/.checkstyle	(revision 32538)
+++ /applications/editors/josm/plugins/public_transport_layer/.checkstyle	(revision 32538)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="JOSM" location="/JOSM/tools/checkstyle/josm_checks.xml" type="project" description="">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="JOSM" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="DerivedFiles" enabled="true"/>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="data"/>
+    <filter-data value="images"/>
+    <filter-data value="styles"/>
+    <filter-data value="resources"/>
+    <filter-data value="scripts"/>
+  </filter>
+</fileset-config>
Index: /applications/editors/josm/plugins/public_transport_layer/.project
===================================================================
--- /applications/editors/josm/plugins/public_transport_layer/.project	(revision 32537)
+++ /applications/editors/josm/plugins/public_transport_layer/.project	(revision 32538)
@@ -16,7 +16,13 @@
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>
Index: /applications/editors/josm/plugins/public_transport_layer/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/public_transport_layer/.settings/org.eclipse.jdt.core.prefs	(revision 32537)
+++ /applications/editors/josm/plugins/public_transport_layer/.settings/org.eclipse.jdt.core.prefs	(revision 32538)
@@ -81,4 +81,5 @@
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
Index: /applications/editors/josm/plugins/public_transport_layer/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- /applications/editors/josm/plugins/public_transport_layer/.settings/org.eclipse.jdt.ui.prefs	(revision 32538)
+++ /applications/editors/josm/plugins/public_transport_layer/.settings/org.eclipse.jdt.ui.prefs	(revision 32538)
@@ -0,0 +1,60 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
Index: /applications/editors/josm/plugins/public_transport_layer/build.xml
===================================================================
--- /applications/editors/josm/plugins/public_transport_layer/build.xml	(revision 32537)
+++ /applications/editors/josm/plugins/public_transport_layer/build.xml	(revision 32538)
@@ -3,5 +3,5 @@
 
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10353"/>
+    <property name="plugin.main.version" value="10420"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/public_transport_layer/src/ptl/DistanceBetweenStops.java
===================================================================
--- /applications/editors/josm/plugins/public_transport_layer/src/ptl/DistanceBetweenStops.java	(revision 32537)
+++ /applications/editors/josm/plugins/public_transport_layer/src/ptl/DistanceBetweenStops.java	(revision 32538)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package ptl;
 
@@ -54,10 +55,10 @@
             final List<Node> nodes = routeSegments.get(i).getWay().getNodes();
             switch (link.direction) {
-                case BACKWARD:
-                    Collections.reverse(nodes);
-                    // fall through
-                case FORWARD:
-                    routeNodes.addAll(link.linkPrev ? nodes.subList(1, nodes.size()) : nodes);
-                    break;
+            case BACKWARD:
+                Collections.reverse(nodes);
+                // fall through
+            case FORWARD:
+                routeNodes.addAll(link.linkPrev ? nodes.subList(1, nodes.size()) : nodes);
+                break;
             }
         }
@@ -137,6 +138,6 @@
             if (!isRouteSupported(relation)) {
                 JOptionPane.showMessageDialog(Main.parent, "<html>" + tr("A valid public_transport:version=2 route is required")
-                        + Utils.joinAsHtmlUnorderedList(Collections.singleton(relation.getDisplayName(DefaultNameFormatter.getInstance()))),
-                        tr("Invalid selection"), JOptionPane.WARNING_MESSAGE);
+                + Utils.joinAsHtmlUnorderedList(Collections.singleton(relation.getDisplayName(DefaultNameFormatter.getInstance()))),
+                tr("Invalid selection"), JOptionPane.WARNING_MESSAGE);
                 continue;
             }
Index: /applications/editors/josm/plugins/public_transport_layer/src/ptl/Plugin.java
===================================================================
--- /applications/editors/josm/plugins/public_transport_layer/src/ptl/Plugin.java	(revision 32537)
+++ /applications/editors/josm/plugins/public_transport_layer/src/ptl/Plugin.java	(revision 32538)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package ptl;
 
Index: /applications/editors/josm/plugins/public_transport_layer/src/ptl/PublicTransportLayer.java
===================================================================
--- /applications/editors/josm/plugins/public_transport_layer/src/ptl/PublicTransportLayer.java	(revision 32537)
+++ /applications/editors/josm/plugins/public_transport_layer/src/ptl/PublicTransportLayer.java	(revision 32538)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package ptl;
 
@@ -75,4 +76,5 @@
                 color = ColorHelper.html2color(relation.get("colour"));
             } catch (RuntimeException ignore) {
+                Main.trace(ignore);
             }
             renderer.drawWay(way, color, new BasicStroke(1), null, null, 0, doDrawArrows, false, false, false);
@@ -87,5 +89,6 @@
         for (Pair<Node, Node> nodePair : segmentRefs.keySet()) {
             final String label = Utils.join(tr(", "), new TreeSet<>(segmentRefs.get(nodePair)));
-            final TextLabel text = new TextLabel(new LabelCompositionStrategy.StaticLabelCompositionStrategy(label), new Font("SansSerif", Font.PLAIN, 16), 0, 0, new Color(0x80FFFFFF, true), 0f, null);
+            final TextLabel text = new TextLabel(new LabelCompositionStrategy.StaticLabelCompositionStrategy(label),
+                    new Font("SansSerif", Font.PLAIN, 16), 0, 0, new Color(0x80FFFFFF, true), 0f, null);
             final Way way = new Way();
             way.addNode(nodePair.a);