Index: trunk/src/org/openstreetmap/josm/actions/DownloadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DownloadAction.java	(revision 11620)
+++ trunk/src/org/openstreetmap/josm/actions/DownloadAction.java	(revision 11621)
@@ -33,7 +33,6 @@
     public DownloadAction() {
         super(tr("Download from OSM..."), "download", tr("Download map data from the OSM server."),
-                // CHECKSTYLE.OFF: LineLength
-                Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM...")), KeyEvent.VK_DOWN, Shortcut.CTRL_SHIFT), true);
-                // CHECKSTYLE.ON: LineLength
+              Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM...")), KeyEvent.VK_DOWN, Shortcut.CTRL_SHIFT),
+              true);
         putValue("help", ht("/Action/Download"));
     }
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java	(revision 11620)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java	(revision 11621)
@@ -443,8 +443,11 @@
     @Override
     public void visit(Way w) {
-        if (w.getNodesCount() > 0 // do not consider empty ways
-                && !w.hasKey("addr:interpolation") // ignore addr:interpolation ways as they are not physical features and most of
-                                                   // the time very near the associated highway, which is perfectly normal, see #9332
-                && !w.hasTag("highway", "platform") && !w.hasTag("railway", "platform") // similarly for public transport platforms
+        // do not consider empty ways
+        if (w.getNodesCount() > 0
+                // ignore addr:interpolation ways as they are not physical features and most of
+                // the time very near the associated highway, which is perfectly normal, see #9332
+                && !w.hasKey("addr:interpolation")
+                // similarly for public transport platforms
+                && !w.hasTag("highway", "platform") && !w.hasTag("railway", "platform")
                 ) {
             ways.addAll(getWaySegments(w));
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java	(revision 11620)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java	(revision 11621)
@@ -277,9 +277,8 @@
         }
 
-        /* we must have got at least one waypoint now */
-
+        // we must have got at least one waypoint now
         ((ArrayList<WayPoint>) waypoints).sort(Comparator.comparingDouble(o -> o.time));
 
-        firstTime = -1.0; /* this time of the first waypoint, not first trackpoint */
+        firstTime = -1.0; // this time of the first waypoint, not first trackpoint
         for (WayPoint w : waypoints) {
             if (firstTime < 0.0) {
@@ -288,7 +287,5 @@
             double offset = w.time - firstTime;
             AudioMarker am = new AudioMarker(w.getCoor(), w, url, ml, w.time, offset);
-            /*
-             * timeFromAudio intended for future use to shift markers of this type on synchronization
-             */
+            // timeFromAudio intended for future use to shift markers of this type on synchronization
             if (w == wayPointFromTimeStamp) {
                 am.timeFromAudio = true;
@@ -298,17 +295,11 @@
 
         if (timedMarkersOmitted && !markers.timedMarkersOmitted) {
-            JOptionPane
-            .showMessageDialog(
-                    Main.parent,
-                    // CHECKSTYLE.OFF: LineLength
-                    tr("Some waypoints with timestamps from before the start of the track or after the end were omitted or moved to the start."));
-                    // CHECKSTYLE.ON: LineLength
+            JOptionPane.showMessageDialog(Main.parent,
+                tr("Some waypoints with timestamps from before the start of the track or after the end were omitted or moved to the start."));
             markers.timedMarkersOmitted = timedMarkersOmitted;
         }
         if (untimedMarkersOmitted && !markers.untimedMarkersOmitted) {
-            JOptionPane
-            .showMessageDialog(
-                    Main.parent,
-                    tr("Some waypoints which were too far from the track to sensibly estimate their time were omitted."));
+            JOptionPane.showMessageDialog(Main.parent,
+                tr("Some waypoints which were too far from the track to sensibly estimate their time were omitted."));
             markers.untimedMarkersOmitted = untimedMarkersOmitted;
         }