Changeset 11621 in josm


Ignore:
Timestamp:
2017-02-25T21:21:27+01:00 (8 months ago)
Author:
Don-vip
Message:

checkstyle - fix CommentsIndentation errors

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/DownloadAction.java

    r8540 r11621  
    3333    public DownloadAction() {
    3434        super(tr("Download from OSM..."), "download", tr("Download map data from the OSM server."),
    35                 // CHECKSTYLE.OFF: LineLength
    36                 Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM...")), KeyEvent.VK_DOWN, Shortcut.CTRL_SHIFT), true);
    37                 // CHECKSTYLE.ON: LineLength
     35              Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM...")), KeyEvent.VK_DOWN, Shortcut.CTRL_SHIFT),
     36              true);
    3837        putValue("help", ht("/Action/Download"));
    3938    }
  • trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

    r11608 r11621  
    443443    @Override
    444444    public void visit(Way w) {
    445         if (w.getNodesCount() > 0 // do not consider empty ways
    446                 && !w.hasKey("addr:interpolation") // ignore addr:interpolation ways as they are not physical features and most of
    447                                                    // the time very near the associated highway, which is perfectly normal, see #9332
    448                 && !w.hasTag("highway", "platform") && !w.hasTag("railway", "platform") // similarly for public transport platforms
     445        // do not consider empty ways
     446        if (w.getNodesCount() > 0
     447                // ignore addr:interpolation ways as they are not physical features and most of
     448                // the time very near the associated highway, which is perfectly normal, see #9332
     449                && !w.hasKey("addr:interpolation")
     450                // similarly for public transport platforms
     451                && !w.hasTag("highway", "platform") && !w.hasTag("railway", "platform")
    449452                ) {
    450453            ways.addAll(getWaySegments(w));
  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java

    r11452 r11621  
    277277        }
    278278
    279         /* we must have got at least one waypoint now */
    280 
     279        // we must have got at least one waypoint now
    281280        ((ArrayList<WayPoint>) waypoints).sort(Comparator.comparingDouble(o -> o.time));
    282281
    283         firstTime = -1.0; /* this time of the first waypoint, not first trackpoint */
     282        firstTime = -1.0; // this time of the first waypoint, not first trackpoint
    284283        for (WayPoint w : waypoints) {
    285284            if (firstTime < 0.0) {
     
    288287            double offset = w.time - firstTime;
    289288            AudioMarker am = new AudioMarker(w.getCoor(), w, url, ml, w.time, offset);
    290             /*
    291              * timeFromAudio intended for future use to shift markers of this type on synchronization
    292              */
     289            // timeFromAudio intended for future use to shift markers of this type on synchronization
    293290            if (w == wayPointFromTimeStamp) {
    294291                am.timeFromAudio = true;
     
    298295
    299296        if (timedMarkersOmitted && !markers.timedMarkersOmitted) {
    300             JOptionPane
    301             .showMessageDialog(
    302                     Main.parent,
    303                     // CHECKSTYLE.OFF: LineLength
    304                     tr("Some waypoints with timestamps from before the start of the track or after the end were omitted or moved to the start."));
    305                     // CHECKSTYLE.ON: LineLength
     297            JOptionPane.showMessageDialog(Main.parent,
     298                tr("Some waypoints with timestamps from before the start of the track or after the end were omitted or moved to the start."));
    306299            markers.timedMarkersOmitted = timedMarkersOmitted;
    307300        }
    308301        if (untimedMarkersOmitted && !markers.untimedMarkersOmitted) {
    309             JOptionPane
    310             .showMessageDialog(
    311                     Main.parent,
    312                     tr("Some waypoints which were too far from the track to sensibly estimate their time were omitted."));
     302            JOptionPane.showMessageDialog(Main.parent,
     303                tr("Some waypoints which were too far from the track to sensibly estimate their time were omitted."));
    313304            markers.untimedMarkersOmitted = untimedMarkersOmitted;
    314305        }
  • trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java

    r10338 r11621  
    267267        }
    268268        // RFC3490 3.1. 1)
    269 //      Whenever dots are used as label separators, the following
    270 //      characters MUST be recognized as dots: U+002E (full stop), U+3002
    271 //      (ideographic full stop), U+FF0E (fullwidth full stop), U+FF61
    272 //      (halfwidth ideographic full stop).
     269        // Whenever dots are used as label separators, the following
     270        // characters MUST be recognized as dots: U+002E (full stop), U+3002
     271        // (ideographic full stop), U+FF0E (fullwidth full stop), U+FF61
     272        // (halfwidth ideographic full stop).
    273273        final String[][] otherDots = {
    274274                {"b\u3002", "b."},
  • trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java

    r10756 r11621  
    189189        final Map<String, String[]> info = new HashMap<>();
    190190
    191 //        <td><span class="domain tld"><a href="/domains/root/db/ax.html">.ax</a></span></td>
    192191        final Pattern domain = Pattern.compile(".*<a href=\"/domains/root/db/([^.]+)\\.html");
    193 //        <td>country-code</td>
    194192        final Pattern type = Pattern.compile("\\s+<td>([^<]+)</td>");
    195 //        <!-- <td>Åland Islands<br/><span class="tld-table-so">Ålands landskapsregering</span></td> </td> -->
    196 //        <td>Ålands landskapsregering</td>
    197193        final Pattern comment = Pattern.compile("\\s+<td>([^<]+)</td>");
    198194
     
    228224                        }
    229225                        // Don't save unused entries
    230                         if (com.contains("Not assigned") || com.contains("Retired") || typ.equals("test")) {
    231     //                        System.out.println("Ignored: " + typ + " " + dom + " " +com);
    232                         } else {
     226                        if (!com.contains("Not assigned") && !com.contains("Retired") && !typ.equals("test")) {
    233227                            info.put(dom.toLowerCase(Locale.ENGLISH), new String[]{typ, com});
    234     //                        System.out.println("Storing: " + typ + " " + dom + " " +com);
    235228                        }
    236229                    } else {
  • trunk/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java

    r10378 r11621  
    408408        UrlValidator validator = new UrlValidator();
    409409        assertTrue(validator.isValid("http://xn--h1acbxfam.idn.icann.org/"));
    410 //        assertTrue(validator.isValid("http://xn--e1afmkfd.xn--80akhbyknj4f"));
    411410        // Internationalized country code top-level domains
    412411        assertTrue(validator.isValid("http://test.xn--lgbbat1ad8j")); //Algeria
     
    441440        assertTrue(validator.isValid("http://test.xn--pgbs0dh")); // Tunisia
    442441        assertTrue(validator.isValid("http://test.xn--mgbaam7a8h")); // United Arab Emirates
    443         // Proposed internationalized ccTLDs
    444 //        assertTrue(validator.isValid("http://test.xn--54b7fta0cc")); // Bangladesh
    445 //        assertTrue(validator.isValid("http://test.xn--90ae")); // Bulgaria
    446 //        assertTrue(validator.isValid("http://test.xn--node")); // Georgia
    447 //        assertTrue(validator.isValid("http://test.xn--4dbrk0ce")); // Israel
    448 //        assertTrue(validator.isValid("http://test.xn--mgb9awbf")); // Oman
    449 //        assertTrue(validator.isValid("http://test.xn--j1amh")); // Ukraine
    450 //        assertTrue(validator.isValid("http://test.xn--mgb2ddes")); // Yemen
    451         // Test TLDs
    452 //        assertTrue(validator.isValid("http://test.xn--kgbechtv")); // Arabic
    453 //        assertTrue(validator.isValid("http://test.xn--hgbk6aj7f53bba")); // Persian
    454 //        assertTrue(validator.isValid("http://test.xn--0zwm56d")); // Chinese
    455 //        assertTrue(validator.isValid("http://test.xn--g6w251d")); // Chinese
    456 //        assertTrue(validator.isValid("http://test.xn--80akhbyknj4f")); // Russian
    457 //        assertTrue(validator.isValid("http://test.xn--11b5bs3a9aj6g")); // Hindi
    458 //        assertTrue(validator.isValid("http://test.xn--jxalpdlp")); // Greek
    459 //        assertTrue(validator.isValid("http://test.xn--9t4b11yi5a")); // Korean
    460 //        assertTrue(validator.isValid("http://test.xn--deba0ad")); // Yiddish
    461 //        assertTrue(validator.isValid("http://test.xn--zckzah")); // Japanese
    462 //        assertTrue(validator.isValid("http://test.xn--hlcj6aya9esc7a")); // Tamil
    463442    }
    464443
  • trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java

    r10974 r11621  
    8787    public void testRequestParameter4() throws RequestHandlerBadRequestException {
    8888        assertEquals(Collections.singletonMap("/?:@-._~!$'()* ,;", "/?:@-._~!$'()* ,;=="), getRequestParameter(
    89                 // CHECKSTYLE.OFF: LineLength
    90                 "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$'()*+,;=/?:@-._~!$'()*+,;==#/?:@-._~!$&'()*+,;="));
    91                 // CHECKSTYLE.ON: LineLength
     89            "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$'()*+,;=/?:@-._~!$'()*+,;==#/?:@-._~!$&'()*+,;="
     90        ));
    9291    }
    9392
Note: See TracChangeset for help on using the changeset viewer.