Index: trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 8540) @@ -221,5 +221,6 @@ * Returns a {@link Pair} of a multipolygon creating/modifying {@link Command} as well as the multipolygon {@link Relation}. */ - public static Pair createMultipolygonCommand(Collection selectedWays, Relation selectedMultipolygonRelation) { + public static Pair createMultipolygonCommand(Collection selectedWays, + Relation selectedMultipolygonRelation) { final Pair rr = selectedMultipolygonRelation == null Index: trunk/src/org/openstreetmap/josm/actions/DownloadAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (revision 8540) @@ -33,5 +33,7 @@ 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 putValue("help", ht("/Action/Download")); } Index: trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java (revision 8540) @@ -184,5 +184,6 @@ HelpAwareOptionPane.showMessageDialogInEDT( Main.parent, - tr("Could not load session file ''{0}''.
Error is:
{1}", uri != null ? uri : file.getName(), e.getMessage()), + tr("Could not load session file ''{0}''.
Error is:
{1}", + uri != null ? uri : file.getName(), e.getMessage()), dialogTitle, JOptionPane.ERROR_MESSAGE, Index: trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 8540) @@ -205,5 +205,6 @@ cmds.add(new DeleteCommand(delNodes)); w.getDataSet().clearSelection(delNodes); - return new SequenceCommand(trn("Simplify Way (remove {0} node)", "Simplify Way (remove {0} nodes)", delNodes.size(), delNodes.size()), cmds); + return new SequenceCommand( + trn("Simplify Way (remove {0} node)", "Simplify Way (remove {0} nodes)", delNodes.size(), delNodes.size()), cmds); } Index: trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 8540) @@ -58,8 +58,8 @@ /** - * @param command The command to be performed to split the way (which is saved for later retrieval by the {@link #getCommand} method) - * @param newSelection The new list of selected primitives ids (which is saved for later retrieval by the {@link #getNewSelection} method) - * @param originalWay The original way being split (which is saved for later retrieval by the {@link #getOriginalWay} method) - * @param newWays The resulting new ways (which is saved for later retrieval by the {@link #getOriginalWay} method) + * @param command The command to be performed to split the way (which is saved for later retrieval with {@link #getCommand}) + * @param newSelection The new list of selected primitives ids (which is saved for later retrieval with {@link #getNewSelection}) + * @param originalWay The original way being split (which is saved for later retrieval with {@link #getOriginalWay}) + * @param newWays The resulting new ways (which is saved for later retrieval with {@link #getOriginalWay}) */ public SplitWayResult(Command command, List newSelection, Way originalWay, List newWays) { @@ -342,5 +342,6 @@ * @return the result from the split operation */ - public static SplitWayResult splitWay(OsmDataLayer layer, Way way, List> wayChunks, Collection selection) { + public static SplitWayResult splitWay(OsmDataLayer layer, Way way, List> wayChunks, + Collection selection) { // build a list of commands, and also a new selection list Collection commandList = new ArrayList<>(wayChunks.size()); Index: trunk/src/org/openstreetmap/josm/actions/ToggleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ToggleAction.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/actions/ToggleAction.java (revision 8540) @@ -79,5 +79,6 @@ return (Boolean) selected; } else { - Main.warn(getClass().getName()+" does not define a boolean for SELECTED_KEY but "+selected+". You should report it to JOSM developers."); + Main.warn(getClass().getName() + " does not define a boolean for SELECTED_KEY but " + selected + + ". You should report it to JOSM developers."); return false; } Index: trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (revision 8540) @@ -49,5 +49,7 @@ "uploadselection", tr("Upload all changes in the current selection to the OSM server."), + // CHECKSTYLE.OFF: LineLength Shortcut.registerShortcut("file:uploadSelection", tr("File: {0}", tr("Upload selection")), KeyEvent.VK_U, Shortcut.ALT_CTRL_SHIFT), + // CHECKSTYLE.ON: LineLength true); putValue("help", ht("/Action/UploadSelection")); Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (revision 8540) @@ -338,7 +338,7 @@ if (dataSet.allPrimitives().isEmpty()) { rememberErrorMessage(tr("No data found in this area.")); - // need to synthesize a download bounds lest the visual indication of downloaded - // area doesn't work - dataSet.dataSources.add(new DataSource(currentBounds != null ? currentBounds : new Bounds(new LatLon(0, 0)), "OpenStreetMap server")); + // need to synthesize a download bounds lest the visual indication of downloaded area doesn't work + dataSet.dataSources.add(new DataSource(currentBounds != null ? currentBounds : + new Bounds(new LatLon(0, 0)), "OpenStreetMap server")); } Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 8540) @@ -296,5 +296,7 @@ @Override public String getModeHelpText() { + // CHECKSTYLE.OFF: LineLength return tr("Click to delete. Shift: delete way segment. Alt: do not delete unused nodes when deleting a way. Ctrl: delete referring objects."); + // CHECKSTYLE.ON: LineLength } Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 8540) @@ -915,5 +915,6 @@ // find out the movement distance, in metres - double distance = Main.getProjection().eastNorth2latlon(initialN1en).greatCircleDistance(Main.getProjection().eastNorth2latlon(n1movedEn)); + double distance = Main.getProjection().eastNorth2latlon(initialN1en).greatCircleDistance( + Main.getProjection().eastNorth2latlon(n1movedEn)); Main.map.statusLine.setDist(distance); updateStatusLine(); Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (revision 8540) @@ -192,5 +192,7 @@ switch (mode) { case normal: + // CHECKSTYLE.OFF: LineLength return tr("Select ways as in Select mode. Drag selected ways or a single way to create a parallel copy (Alt toggles tag preservation)"); + // CHECKSTYLE.ON: LineLength case dragging: return tr("Hold Ctrl to toggle snapping"); Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8540) @@ -827,8 +827,7 @@ ed.setContent( /* for correct i18n of plural forms - see #9110 */ - trn( - "You moved more than {0} element. " + "Moving a large number of elements is often an error.\n" + "Really move them?", - "You moved more than {0} elements. " + "Moving a large number of elements is often an error.\n" + "Really move them?", - max, max)); + trn("You moved more than {0} element. " + "Moving a large number of elements is often an error.\n" + "Really move them?", + "You moved more than {0} elements. " + "Moving a large number of elements is often an error.\n" + "Really move them?", + max, max)); ed.setCancelButton(2); ed.toggleEnable("movedManyElements"); Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8540) @@ -403,6 +403,8 @@ .addKeyword("child expr", "child ", tr("all children of objects matching the expression"), "child building") .addKeyword("parent expr", "parent ", tr("all parents of objects matching the expression"), "parent bus_stop") - .addKeyword("nth:7", "nth: ", tr("n-th member of relation and/or n-th node of way"), "nth:5 (child type:relation)", "nth:-1") - .addKeyword("nth%:7", "nth%: ", tr("every n-th member of relation and/or every n-th node of way"), "nth%:100 (child waterway)") + .addKeyword("nth:7", "nth: ", + tr("n-th member of relation and/or n-th node of way"), "nth:5 (child type:relation)", "nth:-1") + .addKeyword("nth%:7", "nth%: ", + tr("every n-th member of relation and/or every n-th node of way"), "nth%:100 (child waterway)") , GBC.eol()); right.add(new SearchKeywordRow(hcbSearchString) Index: trunk/src/org/openstreetmap/josm/command/DeleteCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 8540) @@ -477,5 +477,6 @@ } - public static boolean checkAndConfirmOutlyingDelete(Collection primitives, Collection ignore) { + public static boolean checkAndConfirmOutlyingDelete(Collection primitives, + Collection ignore) { return Command.checkAndConfirmOutlyingOperation("delete", tr("Delete confirmation"), Index: trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java (revision 8540) @@ -159,5 +159,6 @@ boolean lowerOnly = Main.pref.getBoolean("system_of_measurement.use_only_lower_unit", false); boolean customAreaOnly = Main.pref.getBoolean("system_of_measurement.use_only_custom_area_unit", false); - if ((!lowerOnly && areaCustomValue > 0 && a > areaCustomValue / (aValue*aValue) && a < (bValue*bValue) / (aValue*aValue)) || customAreaOnly) + if ((!lowerOnly && areaCustomValue > 0 && a > areaCustomValue / (aValue*aValue) + && a < (bValue*bValue) / (aValue*aValue)) || customAreaOnly) return formatText(area / areaCustomValue, areaCustomName, format); else if (!lowerOnly && a >= (bValue*bValue) / (aValue*aValue)) Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 8540) @@ -335,5 +335,6 @@ // for further requests - use HEAD String serverKey = getServerKey(); - log.log(Level.INFO, "JCS - Host: {0} found not to return 304 codes for If-Modifed-Since or If-None-Match headers", serverKey); + log.log(Level.INFO, "JCS - Host: {0} found not to return 304 codes for If-Modifed-Since or If-None-Match headers", + serverKey); useHead.put(serverKey, Boolean.TRUE); } Index: trunk/src/org/openstreetmap/josm/data/coor/LatLon.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 8540) @@ -31,5 +31,5 @@ * where valid values are in the [-180,180] and positive values specify positions east of the prime meridian. *
- * lat/lon + * lat/lon *
* This class is immutable. Index: trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java (revision 8540) @@ -133,5 +133,7 @@ // E.g. [1] lists lat as first coordinate axis and lot as second, so it is switched for EPSG:4326. // For most other EPSG code there seems to be no difference. + // CHECKSTYLE.OFF: LineLength // [1] https://www.epsg-registry.org/report.htm?type=selection&entity=urn:ogc:def:crs:EPSG::4326&reportDetail=short&style=urn:uuid:report-style:default-with-code&style_name=OGP%20Default%20With%20Code&title=EPSG:4326 + // CHECKSTYLE.ON: LineLength boolean switchLatLon = false; if (baseUrl.toLowerCase().contains("crs=epsg:4326")) { Index: trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 8540) @@ -528,5 +528,6 @@ for (int i = 0; i < keys.length; i += 2) { if (keys[i].equals(key)) { - keys[i+1] = value; // This modifies the keys array but it doesn't make it invalidate for any time so its ok (see note no top) + // This modifies the keys array but it doesn't make it invalidate for any time so its ok (see note no top) + keys[i+1] = value; keysChangedImpl(originalKeys); return; Index: trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 8540) @@ -178,5 +178,6 @@ OsmPrimitive source = sourceDataSet.getPrimitiveById(target.getPrimitiveId()); if (source == null) - throw new RuntimeException(tr("Object of type {0} with id {1} was marked to be deleted, but it''s missing in the source dataset", + throw new RuntimeException( + tr("Object of type {0} with id {1} was marked to be deleted, but it''s missing in the source dataset", target.getType(), target.getUniqueId())); Index: trunk/src/org/openstreetmap/josm/data/osm/Node.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 8540) @@ -374,5 +374,6 @@ final boolean containsN = visited.contains(n); visited.add(n); - if (!containsN && (predicate == null || predicate.evaluate(n)) && n.isConnectedTo(otherNodes, hops - 1, predicate, visited)) { + if (!containsN && (predicate == null || predicate.evaluate(n)) + && n.isConnectedTo(otherNodes, hops - 1, predicate, visited)) { return true; } Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 8540) @@ -75,5 +75,6 @@ * @since 5440 */ - public HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) { + public HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp, + boolean checkHistoricParams) { ensurePositiveLong(id, "id"); ensurePositiveLong(version, "version"); Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (revision 8540) @@ -70,5 +70,6 @@ * @throws IllegalArgumentException if preconditions are violated */ - public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp, List members) { + public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp, + List members) { this(id, version, visible, user, changesetId, timestamp); if (members != null) { Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java (revision 8540) @@ -127,6 +127,5 @@ try { // print highlighted virtual nodes. Since only the color changes, simply - // drawing them over the existing ones works fine (at least in their current - // simple style) + // drawing them over the existing ones works fine (at least in their current simple style) path = new GeneralPath(); for (WaySegment wseg: data.getHighlightedVirtualNodes()) { @@ -141,7 +140,8 @@ // if the way has changed while being rendered (fix #7979) // TODO: proper solution ? - // Idea from bastiK: avoid the WaySegment class and add another data class with { Way way; Node firstNode, secondNode; int firstIdx; }. - // On read, it would first check, if the way still has firstIdx+2 nodes, then check if the corresponding way nodes are still the same - // and report changes in a more controlled manner. + // Idea from bastiK: + // avoid the WaySegment class and add another data class with { Way way; Node firstNode, secondNode; int firstIdx; }. + // On read, it would first check, if the way still has firstIdx+2 nodes, then check if the corresponding way nodes are still + // the same and report changes in a more controlled manner. if (Main.isTraceEnabled()) { Main.trace(e.getMessage()); Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 8540) @@ -250,5 +250,6 @@ if (!isRegistered(defaultRenderer)) throw new IllegalStateException( - MessageFormat.format("Class ''{0}'' not registered as renderer. Can''t activate default renderer.", defaultRenderer.getName()) + MessageFormat.format("Class ''{0}'' not registered as renderer. Can''t activate default renderer.", + defaultRenderer.getName()) ); activate(defaultRenderer); Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java (revision 8540) @@ -13,4 +13,6 @@ */ public class NTV2GridShiftFileWrapper { + + // CHECKSTYLE.OFF: LineLength /** @@ -29,4 +31,6 @@ */ public static final NTV2GridShiftFileWrapper ntf_rgf93 = new NTV2GridShiftFileWrapper("resource://data/projection/ntf_r93_b.gsb"); + + // CHECKSTYLE.ON: LineLength private NTV2GridShiftFile instance = null; Index: trunk/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java (revision 8540) @@ -20,4 +20,6 @@ import org.openstreetmap.josm.data.projection.ProjectionConfigurationException; +// CHECKSTYLE.OFF: LineLength + /** * Projection for the SwissGrid CH1903 / L03, see Wikipedia article.
@@ -32,4 +34,6 @@ */ public class SwissObliqueMercator implements Proj { + + // CHECKSTYLE.ON: LineLength private Ellipsoid ellps; Index: trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java (revision 8540) @@ -27,6 +27,7 @@ private final OpeningHourTest openingHourTest = new OpeningHourTest(); - private static final Set RESTRICTION_TYPES = new HashSet<>(Arrays.asList("oneway", "toll", "noexit", "maxspeed", "minspeed", "maxstay", - "maxweight", "maxaxleload", "maxheight", "maxwidth", "maxlength", "overtaking", "maxgcweight", "maxgcweightrating", "fee")); + private static final Set RESTRICTION_TYPES = new HashSet<>(Arrays.asList("oneway", "toll", "noexit", "maxspeed", "minspeed", + "maxstay", "maxweight", "maxaxleload", "maxheight", "maxwidth", "maxlength", "overtaking", "maxgcweight", "maxgcweightrating", + "fee")); private static final Set RESTRICTION_VALUES = new HashSet<>(Arrays.asList("yes", "official", "designated", "destination", "delivery", "permissive", "private", "agricultural", "forestry", "no")); Index: trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java (revision 8540) @@ -93,5 +93,6 @@ } if (n.hasKey("source:maxspeed")) { - // Check maxspeed but not context against highway for nodes as maxspeed is not set on highways here but on signs, speed cameras, etc. + // Check maxspeed but not context against highway for nodes + // as maxspeed is not set on highways here but on signs, speed cameras, etc. testSourceMaxspeed(n, false); } @@ -209,5 +210,6 @@ } if ((leftByPedestrians || leftByCyclists) && leftByCars) { - errors.add(new TestError(this, Severity.OTHER, tr("Missing pedestrian crossing information"), MISSING_PEDESTRIAN_CROSSING, n)); + errors.add(new TestError(this, Severity.OTHER, tr("Missing pedestrian crossing information"), + MISSING_PEDESTRIAN_CROSSING, n)); return; } @@ -244,5 +246,6 @@ String country = value.substring(0, index); if (!ISO_COUNTRIES.contains(country)) { - errors.add(new TestError(this, Severity.WARNING, tr("Unknown country code: {0}", country), SOURCE_MAXSPEED_UNKNOWN_COUNTRY_CODE, p)); + errors.add(new TestError(this, Severity.WARNING, + tr("Unknown country code: {0}", country), SOURCE_MAXSPEED_UNKNOWN_COUNTRY_CODE, p)); } // Check context Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 8540) @@ -431,5 +431,6 @@ final StringBuffer sb = new StringBuffer(); while (m.find()) { - final String argument = determineArgument((Selector.GeneralSelector) matchingSelector, Integer.parseInt(m.group(1)), m.group(2), p); + final String argument = determineArgument((Selector.GeneralSelector) matchingSelector, + Integer.parseInt(m.group(1)), m.group(2), p); try { // Perform replacement with null-safe + regex-safe handling Index: trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (revision 8540) @@ -192,5 +192,6 @@ * @return a list of {@link TestError} or an empty list */ - public List checkOpeningHourSyntax(final String key, final String value, CheckMode mode, boolean ignoreOtherSeverity) { + public List checkOpeningHourSyntax(final String key, final String value, CheckMode mode, + boolean ignoreOtherSeverity) { if (ENGINE == null || value == null || value.trim().isEmpty()) { return Collections.emptyList(); Index: trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java (revision 8540) @@ -71,5 +71,6 @@ /** - * Determines whether the key has been marked to be part of a bulk operation (in order to provide a "Do not show again (this operation)" option). + * Determines whether the key has been marked to be part of a bulk operation + * (in order to provide a "Do not show again (this operation)" option). * @param prefKey the preference key */ Index: trunk/src/org/openstreetmap/josm/gui/FileDrop.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/FileDrop.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/FileDrop.java (revision 8540) @@ -34,4 +34,6 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.OpenFileAction; + +// CHECKSTYLE.OFF: HideUtilityClassConstructor /** @@ -77,4 +79,6 @@ public class FileDrop { + // CHECKSTYLE.ON: HideUtilityClassConstructor + private Border normalBorder; private DropTargetListener dropListener; Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 8540) @@ -518,5 +518,6 @@ * @param actionToBeInserted the action that should get a menu item directly below {@code existingMenuEntryAction} * @param isExpert whether the entry should only be visible if the expert mode is activated - * @param existingMenuEntryAction an action already added to the menu {@code menu}, the action {@code actionToBeInserted} is added directly below + * @param existingMenuEntryAction an action already added to the menu {@code menu}, + * the action {@code actionToBeInserted} is added directly below * @return the created menu item */ Index: trunk/src/org/openstreetmap/josm/gui/MapMover.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapMover.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/MapMover.java (revision 8540) @@ -98,4 +98,5 @@ if (contentPane != null) { + // CHECKSTYLE.OFF: LineLength contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( Shortcut.registerShortcut("system:movefocusright", tr("Map: {0}", tr("Move right")), KeyEvent.VK_RIGHT, Shortcut.CTRL).getKeyStroke(), @@ -117,4 +118,5 @@ "MapMover.Zoomer.down"); contentPane.getActionMap().put("MapMover.Zoomer.down", new ZoomerAction("down")); + // CHECKSTYLE.ON: LineLength // see #10592 - Disable these alternate shortcuts on OS X because of conflict with system shortcut Index: trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 8540) @@ -197,5 +197,6 @@ * Task can run in background if returned value != null. Note that it's tasks responsibility * to ensure proper synchronization, PleaseWaitRunnable doesn't with it. - * @return If returned value is != null then task can run in background. TaskId could be used in future for "Always run in background" checkbox + * @return If returned value is != null then task can run in background. + * TaskId could be used in future for "Always run in background" checkbox */ public ProgressTaskId canRunInBackground() { Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 8540) @@ -608,10 +608,10 @@ final Collection primitives, final TagCollection normalizedTags) throws UserCancelException { - String conflicts = Utils.joinAsHtmlUnorderedList(Utils.transform(normalizedTags.getKeysWithMultipleValues(), new Function() { - + String conflicts = Utils.joinAsHtmlUnorderedList(Utils.transform(normalizedTags.getKeysWithMultipleValues(), + new Function() { @Override public String apply(String key) { - return tr("{0} ({1})", key, Utils.join(tr(", "), Utils.transform(normalizedTags.getValues(key), new Function() { - + return tr("{0} ({1})", key, Utils.join(tr(", "), Utils.transform(normalizedTags.getValues(key), + new Function() { @Override public String apply(String x) { Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (revision 8540) @@ -91,7 +91,8 @@ @Override public void processKeyEvent(KeyEvent e) { - if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_ENTER) { + int keyCode = e.getKeyCode(); + if (e.getID() == KeyEvent.KEY_PRESSED && keyCode == KeyEvent.VK_ENTER) { fireGotoNextDecision(); - } else if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_TAB) { + } else if (e.getID() == KeyEvent.KEY_PRESSED && keyCode == KeyEvent.VK_TAB) { if (e.isShiftDown()) { fireGotoPreviousDecision(); @@ -99,10 +100,10 @@ fireGotoNextDecision(); } - } else if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_DELETE || e.getKeyCode() == KeyEvent.VK_BACK_SPACE) { + } else if (e.getID() == KeyEvent.KEY_PRESSED && keyCode == KeyEvent.VK_DELETE || keyCode == KeyEvent.VK_BACK_SPACE) { if (editorModel.getIndexOf(MultiValueDecisionType.KEEP_NONE) > 0) { editorModel.setSelectedItem(MultiValueDecisionType.KEEP_NONE); fireGotoNextDecision(); } - } else if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_ESCAPE) { + } else if (e.getID() == KeyEvent.KEY_PRESSED && keyCode == KeyEvent.VK_ESCAPE) { cancelCellEditing(); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 8540) @@ -404,5 +404,6 @@ public SelectAndZoomAction() { putValue(NAME, tr("Select and zoom")); - putValue(SHORT_DESCRIPTION, tr("Selects the objects that take part in this command (unless currently deleted), then and zooms to it")); + putValue(SHORT_DESCRIPTION, + tr("Selects the objects that take part in this command (unless currently deleted), then and zooms to it")); putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale", "selection")); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 8540) @@ -126,5 +126,5 @@ */ JPanel p = panels.get(N-1); // current Panel (start with last one) - int k = -1; // indicates that the current Panel index is N-1, but no default-view-Dialog has been added to this Panel yet. + int k = -1; // indicates that current Panel index is N-1, but no default-view-Dialog has been added to this Panel yet. for (int i = N-1; i >= 0; --i) { final ToggleDialog dlg = allDialogs.get(i); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 8540) @@ -469,5 +469,6 @@ } - private static void setLatLon(final LatLonHolder latLon, final double coordDeg, final double coordMin, final double coordSec, final String card) { + private static void setLatLon(final LatLonHolder latLon, final double coordDeg, final double coordMin, final double coordSec, + final String card) { if (coordDeg < -180 || coordDeg > 180 || coordMin < 0 || coordMin >= 60 || coordSec < 0 || coordSec > 60) { throw new IllegalArgumentException("out of range"); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8540) @@ -948,5 +948,7 @@ setSelected(visible); setTranslucent(layer.getOpacity() < 1.0); - setToolTipText(visible ? tr("layer is currently visible (click to hide layer)") : tr("layer is currently hidden (click to show layer)")); + setToolTipText(visible ? + tr("layer is currently visible (click to hide layer)") : + tr("layer is currently hidden (click to show layer)")); } } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 8540) @@ -108,5 +108,6 @@ private final DuplicateRelationAction duplicateAction = new DuplicateRelationAction(); private final DownloadMembersAction downloadMembersAction = new DownloadMembersAction(); - private final DownloadSelectedIncompleteMembersAction downloadSelectedIncompleteMembersAction = new DownloadSelectedIncompleteMembersAction(); + private final DownloadSelectedIncompleteMembersAction downloadSelectedIncompleteMembersAction = + new DownloadSelectedIncompleteMembersAction(); private final SelectMembersAction selectMembersAction = new SelectMembersAction(false); private final SelectMembersAction addMembersToSelectionAction = new SelectMembersAction(true); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 8540) @@ -594,5 +594,6 @@ } // It is wanted to ignore an error if it said fixable, even if fixCommand was null - // This is to fix #5764 and #5773: a delete command, for example, may be null if all concerned primitives have already been deleted + // This is to fix #5764 and #5773: + // a delete command, for example, may be null if all concerned primitives have already been deleted error.setIgnored(true); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 8540) @@ -527,5 +527,6 @@ query.forUser(im.getUserId()); } else - throw new IllegalStateException(tr("Cannot restrict changeset query to the current user because the current user is anonymous")); + throw new IllegalStateException( + tr("Cannot restrict changeset query to the current user because the current user is anonymous")); } else if (rbRestrictToUid.isSelected()) { int uid = valUid.getUid(); @@ -536,5 +537,6 @@ } else if (rbRestrictToUserName.isSelected()) { if (!valUserName.isValid()) - throw new IllegalStateException(tr("Cannot restrict the changeset query to the user name ''{0}''", tfUserName.getText())); + throw new IllegalStateException( + tr("Cannot restrict the changeset query to the user name ''{0}''", tfUserName.getText())); query.forUser(tfUserName.getText()); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java (revision 8540) @@ -31,5 +31,6 @@ if (isSelected) { c.setForeground(Main.pref.getColor(marktr("Discardable key: selection Foreground"), Color.GRAY)); - c.setBackground(Main.pref.getColor(marktr("Discardable key: selection Background"), defaults.getColor("Table.selectionBackground"))); + c.setBackground(Main.pref.getColor(marktr("Discardable key: selection Background"), + defaults.getColor("Table.selectionBackground"))); } else { c.setForeground(Main.pref.getColor(marktr("Discardable key: foreground"), Color.GRAY)); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 8540) @@ -183,5 +183,6 @@ private final DownloadMembersAction downloadMembersAction = new DownloadMembersAction(); - private final DownloadSelectedIncompleteMembersAction downloadSelectedIncompleteMembersAction = new DownloadSelectedIncompleteMembersAction(); + private final DownloadSelectedIncompleteMembersAction downloadSelectedIncompleteMembersAction = + new DownloadSelectedIncompleteMembersAction(); private final SelectMembersAction selectMembersAction = new SelectMembersAction(false); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 8540) @@ -416,5 +416,6 @@ public static final BooleanProperty PROPERTY_FIX_TAG_LOCALE = new BooleanProperty("properties.fix-tag-combobox-locale", false); public static final BooleanProperty PROPERTY_REMEMBER_TAGS = new BooleanProperty("properties.remember-recently-added-tags", true); - public static final IntegerProperty PROPERTY_RECENT_TAGS_NUMBER = new IntegerProperty("properties.recently-added-tags", DEFAULT_LRU_TAGS_NUMBER); + public static final IntegerProperty PROPERTY_RECENT_TAGS_NUMBER = new IntegerProperty("properties.recently-added-tags", + DEFAULT_LRU_TAGS_NUMBER); abstract class AbstractTagsDialog extends ExtendedDialog { @@ -697,5 +698,7 @@ String actionShortcutKey = "properties:recent:"+count; String actionShortcutShiftKey = "properties:recent:shift:"+count; + // CHECKSTYLE.OFF: LineLength Shortcut sc = Shortcut.registerShortcut(actionShortcutKey, tr("Choose recent tag {0}", count), KeyEvent.VK_0+count, Shortcut.CTRL); + // CHECKSTYLE.ON: LineLength final JosmAction action = new JosmAction(actionShortcutKey, null, tr("Use this tag again"), sc, false) { @Override Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 8540) @@ -222,5 +222,7 @@ registerCopyPasteAction(tagEditorPanel.getPasteAction(), "PASTE_TAGS", + // CHECKSTYLE.OFF: LineLength Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.CTRL_SHIFT).getKeyStroke()); + // CHECKSTYLE.ON: LineLength registerCopyPasteAction(new PasteMembersAction(), "PASTE_MEMBERS", Shortcut.getPasteKeyStroke()); registerCopyPasteAction(new CopyMembersAction(), "COPY_MEMBERS", Shortcut.getCopyKeyStroke()); @@ -695,5 +697,6 @@ getRootPane().getActionMap().put(actionName, action); getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(shortcut, actionName); - // Assign also to JTables because they have their own Copy&Paste implementation (which is disabled in this case but eats key shortcuts anyway) + // Assign also to JTables because they have their own Copy&Paste implementation + // (which is disabled in this case but eats key shortcuts anyway) memberTable.getInputMap(JComponent.WHEN_FOCUSED).put(shortcut, actionName); memberTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(shortcut, actionName); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 8540) @@ -154,5 +154,5 @@ protected void realRun() throws SAXException, IOException, OsmTransferException { try { - OsmServerObjectReader reader = new OsmServerObjectReader(relation.getId(), OsmPrimitiveType.from(relation), true /* full load */); + OsmServerObjectReader reader = new OsmServerObjectReader(relation.getId(), OsmPrimitiveType.from(relation), true); ds = reader.parseOsm(progressMonitor .createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)); Index: trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java (revision 8540) @@ -91,5 +91,6 @@ * @param myVersion the version of the primitive in the local dataset */ - protected void handleUploadConflictForKnownConflict(final OsmPrimitiveType primitiveType, final long id, String serverVersion, String myVersion) { + protected void handleUploadConflictForKnownConflict(final OsmPrimitiveType primitiveType, final long id, String serverVersion, + String myVersion) { String lbl = ""; switch(primitiveType) { Index: trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 8540) @@ -238,9 +238,11 @@ } - @Override protected void realRun() { + @Override + protected void realRun() { try { uploadloop: while (true) { try { - getProgressMonitor().subTask(trn("Uploading {0} object...", "Uploading {0} objects...", toUpload.getSize(), toUpload.getSize())); + getProgressMonitor().subTask( + trn("Uploading {0} object...", "Uploading {0} objects...", toUpload.getSize(), toUpload.getSize())); synchronized (this) { writer = new OsmServerWriter(); Index: trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 8540) @@ -1399,11 +1399,11 @@ g.setFont(InfoFont); - // The current zoom tileset should have all of its tiles - // due to the loadAllTiles(), unless it to tooLarge() + // The current zoom tileset should have all of its tiles due to the loadAllTiles(), unless it to tooLarge() for (Tile t : ts.allExistingTiles()) { this.paintTileText(ts, t, g, mv, displayZoomLevel, t); } - attribution.paintAttribution(g, mv.getWidth(), mv.getHeight(), getShiftedCoord(topLeft), getShiftedCoord(botRight), displayZoomLevel, this); + attribution.paintAttribution(g, mv.getWidth(), mv.getHeight(), getShiftedCoord(topLeft), getShiftedCoord(botRight), + displayZoomLevel, this); //g.drawString("currentZoomLevel=" + currentZoomLevel, 120, 120); Index: trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (revision 8540) @@ -153,7 +153,8 @@ public static ImageryLayer create(ImageryInfo info) { - if (info.getImageryType() == ImageryType.WMS || info.getImageryType() == ImageryType.HTML) + ImageryType type = info.getImageryType(); + if (type == ImageryType.WMS || type == ImageryType.HTML) return new WMSLayer(info); - else if (info.getImageryType() == ImageryType.TMS || info.getImageryType() == ImageryType.BING || info.getImageryType() == ImageryType.SCANEX) + else if (type == ImageryType.TMS || type == ImageryType.BING || type == ImageryType.SCANEX) return new TMSLayer(info); else throw new AssertionError(); Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 8540) @@ -859,5 +859,6 @@ /** * Sets the "discouraged upload" flag. - * @param uploadDiscouraged {@code true} if upload of data managed by this layer is discouraged. This feature allows to use "private" data layers. + * @param uploadDiscouraged {@code true} if upload of data managed by this layer is discouraged. + * This feature allows to use "private" data layers. */ public final void setUploadDiscouraged(boolean uploadDiscouraged) { Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 8540) @@ -42,5 +42,6 @@ AbstractTileSourceLayer.PROP_MAX_ZOOM_LVL.get()); /** shall TMS layers be added to download dialog */ - public static final BooleanProperty PROP_ADD_TO_SLIPPYMAP_CHOOSER = new BooleanProperty(PREFERENCE_PREFIX + ".add_to_slippymap_chooser", true); + public static final BooleanProperty PROP_ADD_TO_SLIPPYMAP_CHOOSER = new BooleanProperty(PREFERENCE_PREFIX + ".add_to_slippymap_chooser", + true); /** loader factory responsible for loading tiles for this layer */ Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8540) @@ -1037,5 +1037,6 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (NavigatableComponent.PROPNAME_CENTER.equals(evt.getPropertyName()) || NavigatableComponent.PROPNAME_SCALE.equals(evt.getPropertyName())) { + if (NavigatableComponent.PROPNAME_CENTER.equals(evt.getPropertyName()) || + NavigatableComponent.PROPNAME_SCALE.equals(evt.getPropertyName())) { updateOffscreenBuffer = true; } Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java (revision 8540) @@ -44,5 +44,7 @@ JPanel msg = new JPanel(new GridBagLayout()); msg.add(new JLabel( + // CHECKSTYLE.OFF: LineLength tr("Upload of unprocessed GPS data as map data is considered harmful.
If you want to upload traces, look here:")), + // CHECKSTYLE.ON: LineLength GBC.eol()); msg.add(new UrlLabel(Main.getOSMWebsite() + "/traces", 2), GBC.eop()); Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (revision 8540) @@ -327,5 +327,6 @@ case TIME: double t = trkPnt.time; - if (t > 0 && t <= now && maxval - minval > minTrackDurationForTimeColoring) { // skip bad timestamps and very short tracks + // skip bad timestamps and very short tracks + if (t > 0 && t <= now && maxval - minval > minTrackDurationForTimeColoring) { color = dateScale.getColor(t); } else { Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java (revision 8540) @@ -110,5 +110,6 @@ names = ""; } - MarkerLayer ml = new MarkerLayer(new GpxData(), tr("Audio markers from {0}", layer.getName()) + names, layer.getAssociatedFile(), layer); + MarkerLayer ml = new MarkerLayer(new GpxData(), + tr("Audio markers from {0}", layer.getName()) + names, layer.getAssociatedFile(), layer); double firstStartTime = sel[0].lastModified() / 1000.0 - AudioUtil.getCalibratedDuration(sel[0]); Markers m = new Markers(); @@ -311,5 +312,7 @@ .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 markers.timedMarkersOmitted = timedMarkersOmitted; } Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (revision 8540) @@ -31,5 +31,6 @@ } - public ButtonMarker(LatLon ll, TemplateEngineDataProvider dataProvider, String buttonImage, MarkerLayer parentLayer, double time, double offset) { + public ButtonMarker(LatLon ll, TemplateEngineDataProvider dataProvider, String buttonImage, MarkerLayer parentLayer, double time, + double offset) { super(ll, dataProvider, buttonImage, parentLayer, time, offset); buttonRectangle = new Rectangle(0, 0, symbol.getIconWidth(), symbol.getIconHeight()); Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 8540) @@ -206,5 +206,5 @@ } - String urlString = url == null ? "" : url.toString(); + String urlStr = url == null ? "" : url.toString(); if (url == null) { String symbolName = wpt.getString("symbol"); @@ -213,5 +213,5 @@ } return new Marker(wpt.getCoor(), wpt, symbolName, parentLayer, time, offset); - } else if (urlString.endsWith(".wav")) { + } else if (urlStr.endsWith(".wav")) { AudioMarker audioMarker = new AudioMarker(wpt.getCoor(), wpt, url, parentLayer, time, offset); Extensions exts = (Extensions) wpt.get(GpxConstants.META_EXTENSIONS); @@ -224,5 +224,5 @@ } return audioMarker; - } else if (urlString.endsWith(".png") || urlString.endsWith(".jpg") || urlString.endsWith(".jpeg") || urlString.endsWith(".gif")) { + } else if (urlStr.endsWith(".png") || urlStr.endsWith(".jpg") || urlStr.endsWith(".jpeg") || urlStr.endsWith(".gif")) { return new ImageMarker(wpt.getCoor(), url, parentLayer, time, offset); } else { Index: trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java (revision 8540) @@ -231,5 +231,6 @@ @Override public String toString() { - return "BoxTextElemStyle{" + super.toString() + " " + text.toStringImpl() + " box=" + box + " hAlign=" + hAlign + " vAlign=" + vAlign + '}'; + return "BoxTextElemStyle{" + super.toString() + " " + text.toStringImpl() + + " box=" + box + " hAlign=" + hAlign + " vAlign=" + vAlign + '}'; } Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 8540) @@ -262,5 +262,6 @@ /** - * Creates a color value with the specified amounts of {@code r}ed, {@code g}reen, {@code b}lue, {@code alpha} (arguments from 0.0 to 1.0) + * Creates a color value with the specified amounts of {@code r}ed, {@code g}reen, {@code b}lue, {@code alpha} + * (arguments from 0.0 to 1.0) * @param r the red component * @param g the green component Index: trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 8540) @@ -317,5 +317,6 @@ SessionId sessionId = extractOsmSession(connection); if (sessionId == null) - throw new OsmOAuthAuthorizationException(tr("OSM website did not return a session cookie in response to ''{0}'',", url.toString())); + throw new OsmOAuthAuthorizationException( + tr("OSM website did not return a session cookie in response to ''{0}'',", url.toString())); return sessionId; } catch (IOException e) { @@ -347,5 +348,6 @@ sessionId.token = extractToken(connection); if (sessionId.token == null) - throw new OsmOAuthAuthorizationException(tr("OSM website did not return a session cookie in response to ''{0}'',", url.toString())); + throw new OsmOAuthAuthorizationException(tr("OSM website did not return a session cookie in response to ''{0}'',", + url.toString())); } catch (IOException e) { throw new OsmOAuthAuthorizationException(e); @@ -396,5 +398,6 @@ int retCode = connection.getResponseCode(); if (retCode != HttpURLConnection.HTTP_MOVED_TEMP) - throw new OsmOAuthAuthorizationException(tr("Failed to authenticate user ''{0}'' with password ''***'' as OAuth user", userName)); + throw new OsmOAuthAuthorizationException(tr("Failed to authenticate user ''{0}'' with password ''***'' as OAuth user", + userName)); } catch (OsmOAuthAuthorizationException e) { throw new OsmLoginFailedException(e.getCause()); Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 8540) @@ -159,5 +159,6 @@ // drawRawGpsMaxLineLengthLocal - drawRawGpsMaxLineLengthLocal.setToolTipText(tr("Maximum length (in meters) to draw lines for local files. Set to ''-1'' to draw all lines.")); + drawRawGpsMaxLineLengthLocal.setToolTipText( + tr("Maximum length (in meters) to draw lines for local files. Set to ''-1'' to draw all lines.")); label = new JLabel(tr("Maximum length for local files (meters)")); add(label, GBC.std().insets(40, 0, 0, 0)); Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java (revision 8540) @@ -42,9 +42,14 @@ public TMSSettingsPanel() { super(new GridBagLayout()); - minZoomLvl = new JSpinner(new SpinnerNumberModel(TMSLayer.PROP_MIN_ZOOM_LVL.get().intValue(), TMSLayer.MIN_ZOOM, TMSLayer.MAX_ZOOM, 1)); - maxZoomLvl = new JSpinner(new SpinnerNumberModel(TMSLayer.PROP_MAX_ZOOM_LVL.get().intValue(), TMSLayer.MIN_ZOOM, TMSLayer.MAX_ZOOM, 1)); - maxElementsOnDisk = new JSpinner(new SpinnerNumberModel(TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.get().intValue(), 0, Integer.MAX_VALUE, 1)); - maxConcurrentDownloads = new JSpinner(new SpinnerNumberModel(TMSCachedTileLoaderJob.THREAD_LIMIT.get().intValue(), 0, Integer.MAX_VALUE, 1)); - maxDownloadsPerHost = new JSpinner(new SpinnerNumberModel(TMSCachedTileLoader.HOST_LIMIT.get().intValue(), 0, Integer.MAX_VALUE, 1)); + minZoomLvl = new JSpinner(new SpinnerNumberModel( + TMSLayer.PROP_MIN_ZOOM_LVL.get().intValue(), TMSLayer.MIN_ZOOM, TMSLayer.MAX_ZOOM, 1)); + maxZoomLvl = new JSpinner(new SpinnerNumberModel( + TMSLayer.PROP_MAX_ZOOM_LVL.get().intValue(), TMSLayer.MIN_ZOOM, TMSLayer.MAX_ZOOM, 1)); + maxElementsOnDisk = new JSpinner(new SpinnerNumberModel( + TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.get().intValue(), 0, Integer.MAX_VALUE, 1)); + maxConcurrentDownloads = new JSpinner(new SpinnerNumberModel( + TMSCachedTileLoaderJob.THREAD_LIMIT.get().intValue(), 0, Integer.MAX_VALUE, 1)); + maxDownloadsPerHost = new JSpinner(new SpinnerNumberModel( + TMSCachedTileLoader.HOST_LIMIT.get().intValue(), 0, Integer.MAX_VALUE, 1)); add(new JLabel(tr("Auto zoom by default: ")), GBC.std()); Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 8540) @@ -354,5 +354,6 @@ Bounds b = proj.getWorldBoundsLatLon(); CoordinateFormat cf = CoordinateFormat.getDefaultFormat(); - bounds.setText(b.getMin().lonToString(cf)+", "+b.getMin().latToString(cf)+" : "+b.getMax().lonToString(cf)+", "+b.getMax().latToString(cf)); + bounds.setText(b.getMin().lonToString(cf) + ", " + b.getMin().latToString(cf) + " : " + + b.getMax().lonToString(cf) + ", " + b.getMax().latToString(cf)); boolean showCode = true; boolean showName = false; Index: trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 8540) @@ -61,8 +61,12 @@ // independent from the keyboard's labelling. But the operation system's locale // usually matches the keyboard. This even works with my English Windows and my German keyboard. - private static final String SHIFT = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.SHIFT_DOWN_MASK).getModifiers()); - private static final String CTRL = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.CTRL_DOWN_MASK).getModifiers()); - private static final String ALT = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.ALT_DOWN_MASK).getModifiers()); - private static final String META = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.META_DOWN_MASK).getModifiers()); + private static final String SHIFT = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, + KeyEvent.SHIFT_DOWN_MASK).getModifiers()); + private static final String CTRL = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, + KeyEvent.CTRL_DOWN_MASK).getModifiers()); + private static final String ALT = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, + KeyEvent.ALT_DOWN_MASK).getModifiers()); + private static final String META = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, + KeyEvent.META_DOWN_MASK).getModifiers()); // A list of keys to present the user. Sadly this really is a list of keys Java knows about, Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 8540) @@ -336,5 +336,6 @@ List directlyAdded = Main.pasteBuffer.getDirectlyAdded(); if (directlyAdded == null || directlyAdded.isEmpty()) return; - PasteTagsAction.TagPaster tagPaster = new PasteTagsAction.TagPaster(directlyAdded, Collections.singletonList(relation)); + PasteTagsAction.TagPaster tagPaster = new PasteTagsAction.TagPaster(directlyAdded, + Collections.singletonList(relation)); model.updateTags(tagPaster.execute()); } else { Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java (revision 8540) @@ -43,5 +43,6 @@ * @since 6867 */ - public static final String PRESET_MIME_TYPES = "application/xml, text/xml, text/plain; q=0.8, application/zip, application/octet-stream; q=0.5"; + public static final String PRESET_MIME_TYPES = + "application/xml, text/xml, text/plain; q=0.8, application/zip, application/octet-stream; q=0.5"; private TaggingPresetReader() { @@ -306,5 +307,6 @@ * @throws IOException if any I/O error occurs */ - static Collection readAll(String source, boolean validate, HashSetWithLast all) throws SAXException, IOException { + static Collection readAll(String source, boolean validate, HashSetWithLast all) + throws SAXException, IOException { Collection tp; CachedFile cf = new CachedFile(source).setHttpAccept(PRESET_MIME_TYPES); Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchPrimitiveDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchPrimitiveDialog.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchPrimitiveDialog.java (revision 8540) @@ -80,5 +80,6 @@ public Action() { super(tr("Search for objects by preset"), "dialogs/search", tr("Show preset search dialog"), - Shortcut.registerShortcut("preset:search-objects", tr("Search for objects by preset"), KeyEvent.VK_F3, Shortcut.SHIFT), false); + Shortcut.registerShortcut("preset:search-objects", tr("Search for objects by preset"), KeyEvent.VK_F3, Shortcut.SHIFT), + false); putValue("toolbar", "presets/search-objects"); Main.toolbar.register(this); Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java (revision 8540) @@ -397,7 +397,7 @@ boolean suitable = preset.typeMatches(presetTypes); - if (!suitable && preset.types.contains(TaggingPresetType.RELATION) && preset.roles != null && !preset.roles.roles.isEmpty()) { + if (!suitable && preset.types.contains(TaggingPresetType.RELATION) + && preset.roles != null && !preset.roles.roles.isEmpty()) { final Predicate memberExpressionMatchesOnePrimitive = new Predicate() { - @Override public boolean evaluate(Role object) { Index: trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java (revision 8540) @@ -49,4 +49,6 @@ } + // CHECKSTYLE.OFF: LineLength + /** * Creates a new {@code FileChooserManager}. @@ -75,4 +77,6 @@ : Main.pref.get(this.lastDirProperty); } + + // CHECKSTYLE.ON: LineLength /** Index: trunk/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java (revision 8540) @@ -107,4 +107,5 @@ @Override public void setFileSelectionMode(int selectionMode) { + // CHECKSTYLE.OFF: LineLength // TODO implement this after Oracle fixes JDK-6192906 / JDK-6699863 / JDK-6927978 / JDK-7125172: // https://bugs.openjdk.java.net/browse/JDK-6192906 : Add more features to java.awt.FileDialog @@ -116,4 +117,5 @@ // http://stackoverflow.com/questions/1224714/how-can-i-make-a-java-filedialog-accept-directories-as-its-filetype-in-os-x/1224744#1224744 // https://bugs.openjdk.java.net/browse/JDK-7161437 : [macosx] awt.FileDialog doesn't respond appropriately for mac when selecting folders + // CHECKSTYLE.ON: LineLength this.selectionMode = selectionMode; } @@ -164,8 +166,10 @@ switch (selectionMode) { case JFileChooser.FILES_AND_DIRECTORIES: + // CHECKSTYLE.OFF: LineLength // https://bugs.openjdk.java.net/browse/JDK-7125172 : FileDialog objects don't allow directory AND files selection simultaneously return false; case JFileChooser.DIRECTORIES_ONLY: // http://stackoverflow.com/questions/1224714/how-can-i-make-a-java-filedialog-accept-directories-as-its-filetype-in-os-x/1224744#1224744 + // CHECKSTYLE.ON: LineLength return Main.isPlatformOsx(); case JFileChooser.FILES_ONLY: Index: trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (revision 8540) @@ -126,5 +126,6 @@ DataSet ds2 = null; - try (InputStream in = getInputStream(getRequestForBbox(lon1, lat1, 180.0, lat2), progressMonitor.createSubTaskMonitor(9, false))) { + try (InputStream in = getInputStream(getRequestForBbox(lon1, lat1, 180.0, lat2), + progressMonitor.createSubTaskMonitor(9, false))) { if (in == null) return null; @@ -132,5 +133,6 @@ } - try (InputStream in = getInputStream(getRequestForBbox(-180.0, lat1, lon2, lat2), progressMonitor.createSubTaskMonitor(9, false))) { + try (InputStream in = getInputStream(getRequestForBbox(-180.0, lat1, lon2, lat2), + progressMonitor.createSubTaskMonitor(9, false))) { if (in == null) return null; @@ -143,5 +145,6 @@ } else { // Simple request - try (InputStream in = getInputStream(getRequestForBbox(lon1, lat1, lon2, lat2), progressMonitor.createSubTaskMonitor(9, false))) { + try (InputStream in = getInputStream(getRequestForBbox(lon1, lat1, lon2, lat2), + progressMonitor.createSubTaskMonitor(9, false))) { if (in == null) return null; @@ -161,5 +164,6 @@ @Override - public List parseNotes(int noteLimit, int daysClosed, ProgressMonitor progressMonitor) throws OsmTransferException, MoreNotesException { + public List parseNotes(int noteLimit, int daysClosed, ProgressMonitor progressMonitor) + throws OsmTransferException, MoreNotesException { progressMonitor.beginTask("Downloading notes"); CheckParameterUtil.ensureThat(noteLimit > 0, "Requested note limit is less than 1."); Index: trunk/src/org/openstreetmap/josm/io/GpxExporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/GpxExporter.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/io/GpxExporter.java (revision 8540) @@ -230,4 +230,6 @@ } } + + // CHECKSTYLE.OFF: ParameterNumber /** @@ -248,4 +250,5 @@ final JLabel warning) { + // CHECKSTYLE.ON: ParameterNumber ActionListener authorActionListener = new ActionListener() { @Override Index: trunk/src/org/openstreetmap/josm/io/JpgImporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/JpgImporter.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/io/JpgImporter.java (revision 8540) @@ -88,5 +88,6 @@ } - private void addRecursiveFiles(List files, Set visitedDirs, List sel, ProgressMonitor progressMonitor) throws IOException { + private void addRecursiveFiles(List files, Set visitedDirs, List sel, ProgressMonitor progressMonitor) + throws IOException { if (progressMonitor.isCanceled()) Index: trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 8540) @@ -513,5 +513,6 @@ * @throws OsmTransferException if an error occurs while communicating with the API server */ - protected FetchResult multiGetIdPackage(OsmPrimitiveType type, Set pkg, ProgressMonitor progressMonitor) throws OsmTransferException { + protected FetchResult multiGetIdPackage(OsmPrimitiveType type, Set pkg, ProgressMonitor progressMonitor) + throws OsmTransferException { String request = buildRequestString(type, pkg); FetchResult result = null; @@ -571,5 +572,6 @@ * @throws OsmTransferException if an error occurs while communicating with the API server */ - protected FetchResult singleGetIdPackage(OsmPrimitiveType type, Set pkg, ProgressMonitor progressMonitor) throws OsmTransferException { + protected FetchResult singleGetIdPackage(OsmPrimitiveType type, Set pkg, ProgressMonitor progressMonitor) + throws OsmTransferException { FetchResult result = new FetchResult(new DataSet(), new HashSet()); String baseUrl = OsmApi.getOsmApi().getBaseUrl(); Index: trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java (revision 8540) @@ -81,5 +81,7 @@ case "relation": if (currentModificationType == null) { + // CHECKSTYLE.OFF: LineLength throwException(tr("Illegal document structure. Found node, way, or relation outside of ''create'', ''modify'', or ''delete''.")); + // CHECKSTYLE.ON: LineLength } data.put(currentPrimitive, currentModificationType); Index: trunk/src/org/openstreetmap/josm/io/OsmReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 8540) @@ -317,5 +317,6 @@ id = Long.parseLong(value); } catch (NumberFormatException e) { - throwException(tr("Illegal value for attribute ''ref'' on member in relation {0}. Got {1}", Long.toString(r.getUniqueId()), value), e); + throwException(tr("Illegal value for attribute ''ref'' on member in relation {0}. Got {1}", Long.toString(r.getUniqueId()), + value), e); } value = parser.getAttributeValue(null, "type"); @@ -502,5 +503,6 @@ if (current.isNew()) { // for a new primitive we just log a warning - Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId())); + Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", + v, current.getUniqueId())); current.setChangesetId(0); } else { @@ -516,5 +518,6 @@ if (current.isNew()) { // for a new primitive we just log a warning - Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId())); + Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", + v, current.getUniqueId())); current.setChangesetId(0); } else { Index: trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (revision 8540) @@ -141,5 +141,6 @@ * @since 7704 */ - public List readChangesets(Collection ids, boolean includeDiscussion, ProgressMonitor monitor) throws OsmTransferException { + public List readChangesets(Collection ids, boolean includeDiscussion, ProgressMonitor monitor) + throws OsmTransferException { if (ids == null) return Collections.emptyList(); @@ -192,5 +193,6 @@ public ChangesetDataSet downloadChangeset(int id, ProgressMonitor monitor) throws OsmTransferException { if (id <= 0) - throw new IllegalArgumentException(MessageFormat.format("Expected value of type integer > 0 for parameter ''{0}'', got {1}", "id", id)); + throw new IllegalArgumentException( + MessageFormat.format("Expected value of type integer > 0 for parameter ''{0}'', got {1}", "id", id)); if (monitor == null) { monitor = NullProgressMonitor.INSTANCE; Index: trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java (revision 8540) @@ -125,5 +125,6 @@ userInfo.setUnreadMessages(Integer.parseInt(v)); } catch (NumberFormatException e) { - throw new XmlParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}.", "unread", "received", v), e); + throw new XmlParsingException( + tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}.", "unread", "received", v), e); } } Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 8540) @@ -128,5 +128,6 @@ this.sender = senderName; - final DefaultTableModel tm = new DefaultTableModel(new String[] {tr("Assume"), tr("Key"), tr("Value"), tr("Existing values")}, tags.length) { + final DefaultTableModel tm = new DefaultTableModel(new String[] {tr("Assume"), tr("Key"), tr("Value"), tr("Existing values")}, + tags.length) { private final Class[] types = {Boolean.class, String.class, Object.class, ExistingValues.class}; @Override Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (revision 8540) @@ -233,5 +233,7 @@ X509Certificate cert = generateCertificate("CN=localhost, OU=JOSM, O=OpenStreetMap", pair, 1825, "SHA256withRSA", // see #10033#comment:20: All browsers respect "ip" in SAN, except IE which only understands DNS entries: + // CHECKSTYLE.OFF: LineLength // https://connect.microsoft.com/IE/feedback/details/814744/the-ie-doesnt-trust-a-san-certificate-when-connecting-to-ip-address + // CHECKSTYLE.ON: LineLength "dns:localhost,ip:127.0.0.1,dns:127.0.0.1,ip:::1,uri:https://127.0.0.1:"+HTTPS_PORT+",uri:https://::1:"+HTTPS_PORT); Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java (revision 8540) @@ -64,6 +64,8 @@ public String[] getUsageExamples() { return new String[] { + // CHECKSTYLE.OFF: LineLength "/add_way?way=53.2,13.3;53.3,13.3;53.3,13.2", "/add_way?&addtags=building=yes&way=45.437213,-2.810792;45.437988,-2.455983;45.224080,-2.455036;45.223302,-2.809845;45.437213,-2.810792" + // CHECKSTYLE.ON: LineLength }; } Index: trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java (revision 8540) @@ -25,5 +25,6 @@ @Override - public Layer load(Element elem, SessionReader.ImportSupport support, ProgressMonitor progressMonitor) throws IOException, IllegalDataException { + public Layer load(Element elem, SessionReader.ImportSupport support, ProgressMonitor progressMonitor) + throws IOException, IllegalDataException { String version = elem.getAttribute("version"); if (!"0.1".equals(version)) { Index: trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java (revision 8540) @@ -23,5 +23,6 @@ @Override - public Layer load(Element elem, SessionReader.ImportSupport support, ProgressMonitor progressMonitor) throws IOException, IllegalDataException { + public Layer load(Element elem, SessionReader.ImportSupport support, ProgressMonitor progressMonitor) + throws IOException, IllegalDataException { String version = elem.getAttribute("version"); if (!"0.1".equals(version)) { Index: trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionImporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionImporter.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionImporter.java (revision 8540) @@ -39,5 +39,6 @@ OsmImporter importer = new OsmImporter(); try (InputStream in = support.getInputStream(fileStr)) { - OsmImporter.OsmImporterData importData = importer.loadLayer(in, support.getFile(fileStr), support.getLayerName(), progressMonitor); + OsmImporter.OsmImporterData importData = importer.loadLayer(in, support.getFile(fileStr), support.getLayerName(), + progressMonitor); support.addPostLayersTask(importData.getPostLayerTask()); Index: trunk/src/org/openstreetmap/josm/io/session/SessionReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 8540) @@ -308,5 +308,6 @@ if (centerEl != null && centerEl.hasAttribute("lat") && centerEl.hasAttribute("lon")) { try { - LatLon centerLL = new LatLon(Double.parseDouble(centerEl.getAttribute("lat")), Double.parseDouble(centerEl.getAttribute("lon"))); + LatLon centerLL = new LatLon(Double.parseDouble(centerEl.getAttribute("lat")), + Double.parseDouble(centerEl.getAttribute("lon"))); center = Projections.project(centerLL); } catch (NumberFormatException ex) { Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 8540) @@ -1482,5 +1482,6 @@ gc.fill = GridBagConstraints.HORIZONTAL; gc.weighty = 0.0; - add(cbDontShowAgain = new JCheckBox(tr("Do not ask again and remember my decision (go to Preferences->Plugins to change it later)")), gc); + add(cbDontShowAgain = new JCheckBox( + tr("Do not ask again and remember my decision (go to Preferences->Plugins to change it later)")), gc); cbDontShowAgain.setFont(cbDontShowAgain.getFont().deriveFont(Font.PLAIN)); } Index: trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (revision 8540) @@ -191,5 +191,6 @@ } - private void handleIOException(final ProgressMonitor monitor, IOException e, final String title, final String firstMessage, boolean displayMsg) { + private void handleIOException(final ProgressMonitor monitor, IOException e, final String title, final String firstMessage, + boolean displayMsg) { StringBuilder sb = new StringBuilder(); try (InputStream errStream = connection.getErrorStream()) { Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 8540) @@ -857,5 +857,7 @@ // See #10479: for PNG files, always enforce transparency to be sure tNRS chunk is used even not in paletted mode // This can be removed if someday Oracle fixes https://bugs.openjdk.java.net/browse/JDK-6788458 + // CHECKSTYLE.OFF: LineLength // hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/828c4fedd29f/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java#l656 + // CHECKSTYLE.ON: LineLength Image img = read(new ByteArrayInputStream(bytes), false, true); return img == null ? null : new ImageResource(img); @@ -1541,4 +1543,6 @@ } + // CHECKSTYLE.OFF: LineLength + /** * Returns the {@code TransparentColor} defined in image reader metadata. @@ -1551,4 +1555,5 @@ */ public static Color getTransparentColor(ColorModel model, ImageReader reader) throws IOException { + // CHECKSTYLE.ON: LineLength try { IIOMetadata metadata = reader.getImageMetadata(0); Index: trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java (revision 8540) @@ -51,5 +51,6 @@ Main.platform.openUrl(uri.toString()); } else { - // This is not the case with some Linux environments (see below), and not sure about Mac OS X, so we need to handle API failure + // This is not the case with some Linux environments (see below), + // and not sure about Mac OS X, so we need to handle API failure try { Desktop.getDesktop().browse(uri); Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 8540) @@ -261,5 +261,6 @@ if ("Linux".equalsIgnoreCase(osName)) { try { - // Try lsb_release (only available on LSB-compliant Linux systems, see https://www.linuxbase.org/lsb-cert/productdir.php?by_prod ) + // Try lsb_release (only available on LSB-compliant Linux systems, + // see https://www.linuxbase.org/lsb-cert/productdir.php?by_prod ) Process p = Runtime.getRuntime().exec("lsb_release -ds"); try (BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8))) { Index: trunk/src/org/openstreetmap/josm/tools/template_engine/ParseError.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/template_engine/ParseError.java (revision 8538) +++ trunk/src/org/openstreetmap/josm/tools/template_engine/ParseError.java (revision 8540) @@ -17,5 +17,6 @@ public ParseError(Token unexpectedToken, TokenType expected) { - super(tr("Unexpected token on position {0}. Expected {1}, found {2}", unexpectedToken.getPosition(), expected, unexpectedToken.getType())); + super(tr("Unexpected token on position {0}. Expected {1}, found {2}", + unexpectedToken.getPosition(), expected, unexpectedToken.getType())); this.unexpectedToken = unexpectedToken; }