Changeset 11621 in josm for trunk/src


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

checkstyle - fix CommentsIndentation errors

Location:
trunk/src/org/openstreetmap/josm
Files:
3 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        }
Note: See TracChangeset for help on using the changeset viewer.