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) 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; } Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java (revision 11620) +++ /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java (revision 11621) @@ -267,8 +267,8 @@ } // RFC3490 3.1. 1) -// Whenever dots are used as label separators, the following -// characters MUST be recognized as dots: U+002E (full stop), U+3002 -// (ideographic full stop), U+FF0E (fullwidth full stop), U+FF61 -// (halfwidth ideographic full stop). + // Whenever dots are used as label separators, the following + // characters MUST be recognized as dots: U+002E (full stop), U+3002 + // (ideographic full stop), U+FF0E (fullwidth full stop), U+FF61 + // (halfwidth ideographic full stop). final String[][] otherDots = { {"b\u3002", "b."}, Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java (revision 11620) +++ /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java (revision 11621) @@ -189,10 +189,6 @@ final Map info = new HashMap<>(); -// .ax final Pattern domain = Pattern.compile(".*country-code final Pattern type = Pattern.compile("\\s+([^<]+)"); -// -// Ålands landskapsregering final Pattern comment = Pattern.compile("\\s+([^<]+)"); @@ -228,9 +224,6 @@ } // Don't save unused entries - if (com.contains("Not assigned") || com.contains("Retired") || typ.equals("test")) { - // System.out.println("Ignored: " + typ + " " + dom + " " +com); - } else { + if (!com.contains("Not assigned") && !com.contains("Retired") && !typ.equals("test")) { info.put(dom.toLowerCase(Locale.ENGLISH), new String[]{typ, com}); - // System.out.println("Storing: " + typ + " " + dom + " " +com); } } else { Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java (revision 11620) +++ /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java (revision 11621) @@ -408,5 +408,4 @@ UrlValidator validator = new UrlValidator(); assertTrue(validator.isValid("http://xn--h1acbxfam.idn.icann.org/")); -// assertTrue(validator.isValid("http://xn--e1afmkfd.xn--80akhbyknj4f")); // Internationalized country code top-level domains assertTrue(validator.isValid("http://test.xn--lgbbat1ad8j")); //Algeria @@ -441,24 +440,4 @@ assertTrue(validator.isValid("http://test.xn--pgbs0dh")); // Tunisia assertTrue(validator.isValid("http://test.xn--mgbaam7a8h")); // United Arab Emirates - // Proposed internationalized ccTLDs -// assertTrue(validator.isValid("http://test.xn--54b7fta0cc")); // Bangladesh -// assertTrue(validator.isValid("http://test.xn--90ae")); // Bulgaria -// assertTrue(validator.isValid("http://test.xn--node")); // Georgia -// assertTrue(validator.isValid("http://test.xn--4dbrk0ce")); // Israel -// assertTrue(validator.isValid("http://test.xn--mgb9awbf")); // Oman -// assertTrue(validator.isValid("http://test.xn--j1amh")); // Ukraine -// assertTrue(validator.isValid("http://test.xn--mgb2ddes")); // Yemen - // Test TLDs -// assertTrue(validator.isValid("http://test.xn--kgbechtv")); // Arabic -// assertTrue(validator.isValid("http://test.xn--hgbk6aj7f53bba")); // Persian -// assertTrue(validator.isValid("http://test.xn--0zwm56d")); // Chinese -// assertTrue(validator.isValid("http://test.xn--g6w251d")); // Chinese -// assertTrue(validator.isValid("http://test.xn--80akhbyknj4f")); // Russian -// assertTrue(validator.isValid("http://test.xn--11b5bs3a9aj6g")); // Hindi -// assertTrue(validator.isValid("http://test.xn--jxalpdlp")); // Greek -// assertTrue(validator.isValid("http://test.xn--9t4b11yi5a")); // Korean -// assertTrue(validator.isValid("http://test.xn--deba0ad")); // Yiddish -// assertTrue(validator.isValid("http://test.xn--zckzah")); // Japanese -// assertTrue(validator.isValid("http://test.xn--hlcj6aya9esc7a")); // Tamil } Index: /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java (revision 11620) +++ /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java (revision 11621) @@ -87,7 +87,6 @@ public void testRequestParameter4() throws RequestHandlerBadRequestException { assertEquals(Collections.singletonMap("/?:@-._~!$'()* ,;", "/?:@-._~!$'()* ,;=="), getRequestParameter( - // CHECKSTYLE.OFF: LineLength - "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$'()*+,;=/?:@-._~!$'()*+,;==#/?:@-._~!$&'()*+,;=")); - // CHECKSTYLE.ON: LineLength + "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$'()*+,;=/?:@-._~!$'()*+,;==#/?:@-._~!$&'()*+,;=" + )); }