Ignore:
Timestamp:
2015-06-27T21:43:35+02:00 (5 years ago)
Author:
Don-vip
Message:

fix remaining checkstyle issues

Location:
trunk/src/org/openstreetmap/josm/actions
Files:
13 edited

Legend:

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

    r8533 r8540  
    221221     * Returns a {@link Pair} of a multipolygon creating/modifying {@link Command} as well as the multipolygon {@link Relation}.
    222222     */
    223     public static Pair<SequenceCommand, Relation> createMultipolygonCommand(Collection<Way> selectedWays, Relation selectedMultipolygonRelation) {
     223    public static Pair<SequenceCommand, Relation> createMultipolygonCommand(Collection<Way> selectedWays,
     224            Relation selectedMultipolygonRelation) {
    224225
    225226        final Pair<Relation, Relation> rr = selectedMultipolygonRelation == null
  • trunk/src/org/openstreetmap/josm/actions/DownloadAction.java

    r8510 r8540  
    3333    public DownloadAction() {
    3434        super(tr("Download from OSM..."), "download", tr("Download map data from the OSM server."),
     35                // CHECKSTYLE.OFF: LineLength
    3536                Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM...")), KeyEvent.VK_DOWN, Shortcut.CTRL_SHIFT), true);
     37                // CHECKSTYLE.ON: LineLength
    3638        putValue("help", ht("/Action/Download"));
    3739    }
  • trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java

    r8404 r8540  
    184184            HelpAwareOptionPane.showMessageDialogInEDT(
    185185                    Main.parent,
    186                     tr("<html>Could not load session file ''{0}''.<br>Error is:<br>{1}</html>", uri != null ? uri : file.getName(), e.getMessage()),
     186                    tr("<html>Could not load session file ''{0}''.<br>Error is:<br>{1}</html>",
     187                            uri != null ? uri : file.getName(), e.getMessage()),
    187188                    dialogTitle,
    188189                    JOptionPane.ERROR_MESSAGE,
  • trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

    r8510 r8540  
    205205        cmds.add(new DeleteCommand(delNodes));
    206206        w.getDataSet().clearSelection(delNodes);
    207         return new SequenceCommand(trn("Simplify Way (remove {0} node)", "Simplify Way (remove {0} nodes)", delNodes.size(), delNodes.size()), cmds);
     207        return new SequenceCommand(
     208                trn("Simplify Way (remove {0} node)", "Simplify Way (remove {0} nodes)", delNodes.size(), delNodes.size()), cmds);
    208209    }
    209210
  • trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

    r8510 r8540  
    5858
    5959        /**
    60          * @param command The command to be performed to split the way (which is saved for later retrieval by the {@link #getCommand} method)
    61          * @param newSelection The new list of selected primitives ids (which is saved for later retrieval by the {@link #getNewSelection} method)
    62          * @param originalWay The original way being split (which is saved for later retrieval by the {@link #getOriginalWay} method)
    63          * @param newWays The resulting new ways (which is saved for later retrieval by the {@link #getOriginalWay} method)
     60         * @param command The command to be performed to split the way (which is saved for later retrieval with {@link #getCommand})
     61         * @param newSelection The new list of selected primitives ids (which is saved for later retrieval with {@link #getNewSelection})
     62         * @param originalWay The original way being split (which is saved for later retrieval with {@link #getOriginalWay})
     63         * @param newWays The resulting new ways (which is saved for later retrieval with {@link #getOriginalWay})
    6464         */
    6565        public SplitWayResult(Command command, List<? extends PrimitiveId> newSelection, Way originalWay, List<Way> newWays) {
     
    342342     * @return the result from the split operation
    343343     */
    344     public static SplitWayResult splitWay(OsmDataLayer layer, Way way, List<List<Node>> wayChunks, Collection<? extends OsmPrimitive> selection) {
     344    public static SplitWayResult splitWay(OsmDataLayer layer, Way way, List<List<Node>> wayChunks,
     345            Collection<? extends OsmPrimitive> selection) {
    345346        // build a list of commands, and also a new selection list
    346347        Collection<Command> commandList = new ArrayList<>(wayChunks.size());
  • trunk/src/org/openstreetmap/josm/actions/ToggleAction.java

    r8509 r8540  
    7979            return (Boolean) selected;
    8080        } else {
    81             Main.warn(getClass().getName()+" does not define a boolean for SELECTED_KEY but "+selected+". You should report it to JOSM developers.");
     81            Main.warn(getClass().getName() + " does not define a boolean for SELECTED_KEY but " + selected +
     82                    ". You should report it to JOSM developers.");
    8283            return false;
    8384        }
  • trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

    r8513 r8540  
    4949                "uploadselection",
    5050                tr("Upload all changes in the current selection to the OSM server."),
     51                // CHECKSTYLE.OFF: LineLength
    5152                Shortcut.registerShortcut("file:uploadSelection", tr("File: {0}", tr("Upload selection")), KeyEvent.VK_U, Shortcut.ALT_CTRL_SHIFT),
     53                // CHECKSTYLE.ON: LineLength
    5254                true);
    5355        putValue("help", ht("/Action/UploadSelection"));
  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

    r8510 r8540  
    338338            if (dataSet.allPrimitives().isEmpty()) {
    339339                rememberErrorMessage(tr("No data found in this area."));
    340                 // need to synthesize a download bounds lest the visual indication of downloaded
    341                 // area doesn't work
    342                 dataSet.dataSources.add(new DataSource(currentBounds != null ? currentBounds : new Bounds(new LatLon(0, 0)), "OpenStreetMap server"));
     340                // need to synthesize a download bounds lest the visual indication of downloaded area doesn't work
     341                dataSet.dataSources.add(new DataSource(currentBounds != null ? currentBounds :
     342                    new Bounds(new LatLon(0, 0)), "OpenStreetMap server"));
    343343            }
    344344
  • trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

    r8510 r8540  
    296296    @Override
    297297    public String getModeHelpText() {
     298        // CHECKSTYLE.OFF: LineLength
    298299        return tr("Click to delete. Shift: delete way segment. Alt: do not delete unused nodes when deleting a way. Ctrl: delete referring objects.");
     300        // CHECKSTYLE.ON: LineLength
    299301    }
    300302
  • trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

    r8510 r8540  
    915915
    916916        // find out the movement distance, in metres
    917         double distance = Main.getProjection().eastNorth2latlon(initialN1en).greatCircleDistance(Main.getProjection().eastNorth2latlon(n1movedEn));
     917        double distance = Main.getProjection().eastNorth2latlon(initialN1en).greatCircleDistance(
     918                Main.getProjection().eastNorth2latlon(n1movedEn));
    918919        Main.map.statusLine.setDist(distance);
    919920        updateStatusLine();
  • trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java

    r8513 r8540  
    192192        switch (mode) {
    193193        case normal:
     194            // CHECKSTYLE.OFF: LineLength
    194195            return tr("Select ways as in Select mode. Drag selected ways or a single way to create a parallel copy (Alt toggles tag preservation)");
     196            // CHECKSTYLE.ON: LineLength
    195197        case dragging:
    196198            return tr("Hold Ctrl to toggle snapping");
  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r8512 r8540  
    827827            ed.setContent(
    828828                    /* for correct i18n of plural forms - see #9110 */
    829                     trn(
    830                             "You moved more than {0} element. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
    831                             "You moved more than {0} elements. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
    832                             max, max));
     829                    trn("You moved more than {0} element. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
     830                        "You moved more than {0} elements. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
     831                        max, max));
    833832            ed.setCancelButton(2);
    834833            ed.toggleEnable("movedManyElements");
  • trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

    r8510 r8540  
    403403                .addKeyword("child <i>expr</i>", "child ", tr("all children of objects matching the expression"), "child building")
    404404                .addKeyword("parent <i>expr</i>", "parent ", tr("all parents of objects matching the expression"), "parent bus_stop")
    405                 .addKeyword("nth:<i>7</i>", "nth: ", tr("n-th member of relation and/or n-th node of way"), "nth:5 (child type:relation)", "nth:-1")
    406                 .addKeyword("nth%:<i>7</i>", "nth%: ", tr("every n-th member of relation and/or every n-th node of way"), "nth%:100 (child waterway)")
     405                .addKeyword("nth:<i>7</i>", "nth: ",
     406                        tr("n-th member of relation and/or n-th node of way"), "nth:5 (child type:relation)", "nth:-1")
     407                .addKeyword("nth%:<i>7</i>", "nth%: ",
     408                        tr("every n-th member of relation and/or every n-th node of way"), "nth%:100 (child waterway)")
    407409                , GBC.eol());
    408410            right.add(new SearchKeywordRow(hcbSearchString)
Note: See TracChangeset for help on using the changeset viewer.