Index: /trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 10378) @@ -62,5 +62,5 @@ */ public static boolean confirmLaunchMultiple(int numBrowsers) { - String msg = /* for correct i18n of plural forms - see #9110 */ trn( + String msg = /* for correct i18n of plural forms - see #9110 */ trn( "You are about to launch {0} browser window.
" + "This may both clutter your screen with browser windows
" Index: /trunk/src/org/openstreetmap/josm/actions/AbstractSelectAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AbstractSelectAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/AbstractSelectAction.java (revision 10378) @@ -19,5 +19,5 @@ public AbstractSelectAction() { putValue(NAME, tr("Select")); - putValue(SHORT_DESCRIPTION, tr("Set the selected elements on the map to the selected items in the list above.")); + putValue(SHORT_DESCRIPTION, tr("Set the selected elements on the map to the selected items in the list above.")); new ImageProvider("dialogs", "select").getResource().attachImageIcon(this, true); } Index: /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 10378) @@ -271,5 +271,5 @@ delta = pcLast.angle - pcFirst.angle; if (delta < 0) // Assume each PolarCoor.angle is in range ]-pi; pi] - delta += 2*Math.PI; + delta += 2*Math.PI; delta /= j - i; } Index: /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 10378) @@ -336,5 +336,5 @@ return lines.get(0).projectionCommand(node); else if (lines.size() == 2) - return lines.get(0).intersectionCommand(node, lines.get(1)); + return lines.get(0).intersectionCommand(node, lines.get(1)); throw new InvalidSelection(); } Index: /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 10378) @@ -569,5 +569,5 @@ return null; Stack path = new Stack<>(); - Stack nextPairs = new Stack<>(); + Stack nextPairs = new Stack<>(); nextPairs.addAll(getOutboundPairs(startNode)); while (!nextPairs.isEmpty()) { Index: /trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (revision 10378) @@ -166,8 +166,8 @@ if (nodes.size() == 2) { // diameter: two single nodes needed or a way with two nodes - Node n1 = nodes.get(0); + Node n1 = nodes.get(0); double x1 = n1.getEastNorth().east(); double y1 = n1.getEastNorth().north(); - Node n2 = nodes.get(1); + Node n2 = nodes.get(1); double x2 = n2.getEastNorth().east(); double y2 = n2.getEastNorth().north(); Index: /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 10378) @@ -70,8 +70,8 @@ super(getName(update), /* ICON */ "multipoly_create", getName(update), /* atleast three lines for each shortcut or the server extractor fails */ - update ? Shortcut.registerShortcut("tools:multipoly_update", + update ? Shortcut.registerShortcut("tools:multipoly_update", tr("Tool: {0}", getName(true)), KeyEvent.VK_B, Shortcut.CTRL_SHIFT) - : Shortcut.registerShortcut("tools:multipoly_create", + : Shortcut.registerShortcut("tools:multipoly_create", tr("Tool: {0}", getName(false)), KeyEvent.VK_B, Shortcut.CTRL), Index: /trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java (revision 10378) @@ -31,5 +31,5 @@ @Override - protected String createInfoUrl(Object infoObject) { + protected String createInfoUrl(Object infoObject) { if (infoObject instanceof OsmPrimitive) { OsmPrimitive primitive = (OsmPrimitive) infoObject; Index: /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 10378) @@ -291,5 +291,5 @@ * @return The next way. */ - public WayInPolygon walk() { + public WayInPolygon walk() { Node headNode = getHeadNode(); Node prevNode = getPrevNode(); @@ -1217,5 +1217,5 @@ * @throws UserCancelException if user cancels the operation */ - private Multipolygon joinPolygon(AssembledMultipolygon polygon) throws UserCancelException { + private Multipolygon joinPolygon(AssembledMultipolygon polygon) throws UserCancelException { Multipolygon result = new Multipolygon(joinWays(polygon.outerWay.ways)); @@ -1440,5 +1440,5 @@ cmds.add(new ChangeCommand(r, newRel)); - RelationRole saverel = new RelationRole(r, rm.getRole()); + RelationRole saverel = new RelationRole(r, rm.getRole()); if (!result.contains(saverel)) { result.add(saverel); Index: /trunk/src/org/openstreetmap/josm/actions/MoveAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/MoveAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/MoveAction.java (revision 10378) @@ -34,9 +34,9 @@ private static String calltosupermustbefirststatementinconstructortext(Direction dir) { String directiontext; - if (dir == Direction.UP) { + if (dir == Direction.UP) { directiontext = tr("up"); - } else if (dir == Direction.DOWN) { + } else if (dir == Direction.DOWN) { directiontext = tr("down"); - } else if (dir == Direction.LEFT) { + } else if (dir == Direction.LEFT) { directiontext = tr("left"); } else { @@ -49,13 +49,15 @@ private static Shortcut calltosupermustbefirststatementinconstructor(Direction dir) { Shortcut sc; - if (dir == Direction.UP) { - sc = Shortcut.registerShortcut("core:moveup", tr("Move objects {0}", tr("up")), KeyEvent.VK_UP, Shortcut.SHIFT); - } else if (dir == Direction.DOWN) { - sc = Shortcut.registerShortcut("core:movedown", tr("Move objects {0}", tr("down")), KeyEvent.VK_DOWN, Shortcut.SHIFT); - } else if (dir == Direction.LEFT) { - sc = Shortcut.registerShortcut("core:moveleft", tr("Move objects {0}", tr("left")), KeyEvent.VK_LEFT, Shortcut.SHIFT); + // CHECKSTYLE.OFF: SingleSpaceSeparator + if (dir == Direction.UP) { + sc = Shortcut.registerShortcut("core:moveup", tr("Move objects {0}", tr("up")), KeyEvent.VK_UP, Shortcut.SHIFT); + } else if (dir == Direction.DOWN) { + sc = Shortcut.registerShortcut("core:movedown", tr("Move objects {0}", tr("down")), KeyEvent.VK_DOWN, Shortcut.SHIFT); + } else if (dir == Direction.LEFT) { + sc = Shortcut.registerShortcut("core:moveleft", tr("Move objects {0}", tr("left")), KeyEvent.VK_LEFT, Shortcut.SHIFT); } else { //dir == Direction.RIGHT sc = Shortcut.registerShortcut("core:moveright", tr("Move objects {0}", tr("right")), KeyEvent.VK_RIGHT, Shortcut.SHIFT); } + // CHECKSTYLE.ON: SingleSpaceSeparator return sc; } @@ -71,9 +73,9 @@ myDirection = dir; putValue("help", ht("/Action/Move")); - if (dir == Direction.UP) { + if (dir == Direction.UP) { putValue("toolbar", "action/move/up"); - } else if (dir == Direction.DOWN) { + } else if (dir == Direction.DOWN) { putValue("toolbar", "action/move/down"); - } else if (dir == Direction.LEFT) { + } else if (dir == Direction.LEFT) { putValue("toolbar", "action/move/left"); } else { //dir == Direction.RIGHT Index: /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 10378) @@ -191,5 +191,5 @@ } else if (wayDataList.isEmpty()) { throw new InvalidUserInputException("usage"); - } else { + } else { if (nodeList.size() == 2 || nodeList.isEmpty()) { OrthogonalizeAction.rememberMovements.clear(); @@ -401,5 +401,5 @@ EastNorth tmp = new EastNorth(nX.get(n), nY.get(n)); tmp = EN.rotateCC(pivot, tmp, headingAll); - final double dx = tmp.east() - n.getEastNorth().east(); + final double dx = tmp.east() - n.getEastNorth().east(); final double dy = tmp.north() - n.getEastNorth().north(); if (headingNodes.contains(n)) { // The heading nodes should not have changed @@ -467,5 +467,5 @@ for (int i = 0; i < nSeg; ++i) { EastNorth segment = EN.diff(en[i+1], en[i]); - if (segDirections[i] == Direction.RIGHT) { + if (segDirections[i] == Direction.RIGHT) { h = EN.sum(h, segment); } else if (segDirections[i] == Direction.UP) { @@ -544,6 +544,6 @@ double x = en.east() - pivot.east(); double y = en.north() - pivot.north(); - double nx = cosPhi * x - sinPhi * y + pivot.east(); - double ny = sinPhi * x + cosPhi * y + pivot.north(); + double nx = cosPhi * x - sinPhi * y + pivot.east(); + double ny = sinPhi * x + cosPhi * y + pivot.north(); return new EastNorth(nx, ny); } @@ -558,5 +558,5 @@ public static double polar(EastNorth en1, EastNorth en2) { - return Math.atan2(en2.north() - en1.north(), en2.east() - en1.east()); + return Math.atan2(en2.north() - en1.north(), en2.east() - en1.east()); } } @@ -572,12 +572,12 @@ private static int angleToDirectionChange(double a, double deltaMax) throws RejectedAngleException { a = standard_angle_mPI_to_PI(a); - double d0 = Math.abs(a); - double d90 = Math.abs(a - Math.PI / 2); + double d0 = Math.abs(a); + double d90 = Math.abs(a - Math.PI / 2); double dm90 = Math.abs(a + Math.PI / 2); int dirChange; if (d0 < deltaMax) { - dirChange = 0; + dirChange = 0; } else if (d90 < deltaMax) { - dirChange = 1; + dirChange = 1; } else if (dm90 < deltaMax) { dirChange = -1; Index: /trunk/src/org/openstreetmap/josm/actions/PasteAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/PasteAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/PasteAction.java (revision 10378) @@ -113,5 +113,5 @@ } - double offsetEast = mPosition.east() - (maxEast + minEast)/2.0; + double offsetEast = mPosition.east() - (maxEast + minEast)/2.0; double offsetNorth = mPosition.north() - (maxNorth + minNorth)/2.0; Index: /trunk/src/org/openstreetmap/josm/actions/PurgeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/PurgeAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/PurgeAction.java (revision 10378) @@ -64,5 +64,5 @@ public PurgeAction() { /* translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune" */ - super(tr("Purge..."), "purge", tr("Forget objects but do not delete them on server when uploading."), + super(tr("Purge..."), "purge", tr("Forget objects but do not delete them on server when uploading."), Shortcut.registerShortcut("system:purge", tr("Edit: {0}", tr("Purge")), KeyEvent.VK_P, Shortcut.CTRL_SHIFT), @@ -272,5 +272,5 @@ JButton addToSelection = new JButton(new AbstractAction() { { - putValue(SHORT_DESCRIPTION, tr("Add to selection")); + putValue(SHORT_DESCRIPTION, tr("Add to selection")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "select")); } Index: /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 10378) @@ -137,5 +137,5 @@ */ protected boolean isRequiredNode(Way way, Node node) { - boolean isRequired = Collections.frequency(way.getNodes(), node) > 1; + boolean isRequired = Collections.frequency(way.getNodes(), node) > 1; if (!isRequired) { List parents = new LinkedList<>(); Index: /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 10378) @@ -139,5 +139,5 @@ if (tmpNodes.isEmpty()) { if (selection.size() > 1) { - errMsg = tr("None of these nodes are glued to anything else."); + errMsg = tr("None of these nodes are glued to anything else."); } else { errMsg = tr("None of this way''s nodes are glued to anything else."); Index: /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java (revision 10378) @@ -126,5 +126,5 @@ Collection formerValidatedPrimitives) { super(tr("Validating"), false /*don't ignore exceptions */); - this.validatedPrimitives = validatedPrimitives; + this.validatedPrimitives = validatedPrimitives; this.formerValidatedPrimitives = formerValidatedPrimitives; this.tests = tests; @@ -142,5 +142,5 @@ // update GUI on Swing EDT // - GuiHelper.runInEDT(new Runnable() { + GuiHelper.runInEDT(new Runnable() { @Override public void run() { Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetQueryTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetQueryTask.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetQueryTask.java (revision 10378) @@ -71,5 +71,5 @@ // thrown if user cancel the authentication dialog setCanceled(true); - } catch (OsmTransferException e) { + } catch (OsmTransferException e) { if (isCanceled()) return; Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java (revision 10378) @@ -19,5 +19,5 @@ public class DownloadOsmCompressedTask extends DownloadOsmTask { - private static final String PATTERN_COMPRESS = "https?://.*/.*\\.osm.(gz|bz2?|zip)"; + private static final String PATTERN_COMPRESS = "https?://.*/.*\\.osm.(gz|bz2?|zip)"; @Override Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (revision 10378) @@ -37,8 +37,10 @@ public class DownloadOsmTask extends AbstractDownloadTask { + // CHECKSTYLE.OFF: SingleSpaceSeparator protected static final String PATTERN_OSM_API_URL = "https?://.*/api/0.6/(map|nodes?|ways?|relations?|\\*).*"; protected static final String PATTERN_OVERPASS_API_URL = "https?://.*/interpreter\\?data=.*"; protected static final String PATTERN_OVERPASS_API_XAPI_URL = "https?://.*/xapi(\\?.*\\[@meta\\]|_meta\\?).*"; protected static final String PATTERN_EXTERNAL_OSM_FILE = "https?://.*/.*\\.osm"; + // CHECKSTYLE.ON: SingleSpaceSeparator protected Bounds currentBounds; Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java (revision 10378) @@ -21,5 +21,5 @@ public class DownloadSessionTask extends AbstractDownloadTask { - private static final String PATTERN_SESSION = "https?://.*/.*\\.jo(s|z)"; + private static final String PATTERN_SESSION = "https?://.*/.*\\.jo(s|z)"; private Loader loader; Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 10378) @@ -691,6 +691,8 @@ int posn0 = selectedWay.getNodes().indexOf(currentNode); if (posn0 != -1 && // n0 is part of way - (posn0 >= 1 && targetNode.equals(selectedWay.getNode(posn0-1))) || // previous node - (posn0 < selectedWay.getNodesCount()-1) && targetNode.equals(selectedWay.getNode(posn0+1))) { // next node + // CHECKSTYLE.OFF: SingleSpaceSeparator + (posn0 >= 1 && targetNode.equals(selectedWay.getNode(posn0-1))) || // previous node + (posn0 < selectedWay.getNodesCount()-1) && targetNode.equals(selectedWay.getNode(posn0+1))) { // next node + // CHECKSTYLE.ON: SingleSpaceSeparator getCurrentDataSet().setSelected(targetNode); lastUsedNode = targetNode; @@ -845,5 +847,5 @@ * uses also lastUsedNode field */ - private void determineCurrentBaseNodeAndPreviousNode(Collection selection) { + private void determineCurrentBaseNodeAndPreviousNode(Collection selection) { Node selectedNode = null; Way selectedWay = null; @@ -1283,5 +1285,5 @@ n = (Node) p; // found one node wayIsFinished = false; - } else { + } else { // if more than 1 node were affected by previous command, // we have no way to continue, so we forget about found node @@ -1659,5 +1661,5 @@ } if (enOpt != null) { - projectionSource = enOpt; + projectionSource = enOpt; } } Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 10378) @@ -822,5 +822,5 @@ initialN2en.getX() - en.getX(), initialN2en.getY() - en.getY() - ), initialN2en, en, false)); + ), initialN2en, en, false)); } } @@ -835,5 +835,5 @@ possibleMoveDirections = new ArrayList<>(); for (OsmPrimitive p: selectedNode.getReferrers()) { - if (p instanceof Way && p.isUsable()) { + if (p instanceof Way && p.isUsable()) { for (Node neighbor: ((Way) p).getNeighbours(selectedNode)) { EastNorth en = neighbor.getEastNorth(); @@ -905,5 +905,5 @@ initialN2en.getX() - nextNodeEn.getX(), initialN2en.getY() - nextNodeEn.getY() - ), initialN2en, nextNodeEn, false); + ), initialN2en, nextNodeEn, false); } @@ -985,5 +985,5 @@ private int getNextNodeIndex(int index) { int count = selectedSegment.way.getNodesCount(); - if (index < count - 1) + if (index < count - 1) return index + 1; else if (selectedSegment.way.isClosed()) Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java (revision 10378) @@ -25,7 +25,9 @@ char c = str.charAt(2); // @formatter:off + // CHECKSTYLE.OFF: SingleSpaceSeparator alt = a == '?' ? UNKNOWN : (a == 'A' ? ON : OFF); shift = s == '?' ? UNKNOWN : (s == 'S' ? ON : OFF); ctrl = c == '?' ? UNKNOWN : (c == 'C' ? ON : OFF); + // CHECKSTYLE.ON: SingleSpaceSeparator // @formatter:on } Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (revision 10378) @@ -205,4 +205,5 @@ private void updateModeLocalPreferences() { // @formatter:off + // CHECKSTYLE.OFF: SingleSpaceSeparator snapThreshold = Main.pref.getDouble(prefKey("snap-threshold-percent"), 0.70); snapDefault = Main.pref.getBoolean(prefKey("snap-default"), true); @@ -219,4 +220,5 @@ toggleSelectedModifierCombo = new ModifiersSpec(getStringPref("toggle-selection-modifier-combo", "asC")); setSelectedModifierCombo = new ModifiersSpec(getStringPref("set-selection-modifier-combo", "asc")); + // CHECKSTYLE.ON: SingleSpaceSeparator // @formatter:on } Index: /trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java (revision 10378) @@ -24,5 +24,5 @@ * @since 5793 */ -public class EditRelationAction extends AbstractRelationAction { +public class EditRelationAction extends AbstractRelationAction { /** Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 10378) @@ -68,6 +68,6 @@ private final boolean caseSensitive; private final boolean regexSearch; - private static String rxErrorMsg = marktr("The regex \"{0}\" had a parse error at offset {1}, full error:\n\n{2}"); - private static String rxErrorMsgNoPos = marktr("The regex \"{0}\" had a parse error, full error:\n\n{1}"); + private static String rxErrorMsg = marktr("The regex \"{0}\" had a parse error at offset {1}, full error:\n\n{2}"); + private static String rxErrorMsgNoPos = marktr("The regex \"{0}\" had a parse error, full error:\n\n{1}"); private final PushbackTokenizer tokenizer; private static Map simpleMatchFactoryMap = new HashMap<>(); Index: /trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java (revision 10378) @@ -36,4 +36,5 @@ */ public FixDataHook() { + // CHECKSTYLE.OFF: SingleSpaceSeparator deprecated.add(new FixDataSpace()); deprecated.add(new FixDataKey("color", "colour")); @@ -44,4 +45,5 @@ deprecated.add(new FixDataTag("oneway", "1", "oneway", "yes")); deprecated.add(new FixDataTag("highway", "stile", "barrier", "stile")); + // CHECKSTYLE.ON: SingleSpaceSeparator deprecated.add(new FixData() { @Override Index: /trunk/src/org/openstreetmap/josm/command/MoveCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/MoveCommand.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/command/MoveCommand.java (revision 10378) @@ -107,5 +107,5 @@ public MoveCommand(Collection objects, EastNorth start, EastNorth end) { this(objects, end.getX()-start.getX(), end.getY()-start.getY()); - startEN = start; + startEN = start; } @@ -118,5 +118,5 @@ public MoveCommand(OsmPrimitive p, EastNorth start, EastNorth end) { this(Collections.singleton(p), end.getX()-start.getX(), end.getY()-start.getY()); - startEN = start; + startEN = start; } Index: /trunk/src/org/openstreetmap/josm/command/PurgeCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/PurgeCommand.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/command/PurgeCommand.java (revision 10378) @@ -231,8 +231,6 @@ List outR = new ArrayList<>(inR.size()); while (!childlessR.isEmpty()) { - // Identify one childless Relation and - // let it virtually die. This makes other - // relations childless. - Iterator it = childlessR.iterator(); + // Identify one childless Relation and let it virtually die. This makes other relations childless. + Iterator it = childlessR.iterator(); Relation next = it.next(); it.remove(); Index: /trunk/src/org/openstreetmap/josm/command/RotateCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/RotateCommand.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/command/RotateCommand.java (revision 10378) @@ -81,6 +81,8 @@ double x = oldEastNorth.east() - pivot.east(); double y = oldEastNorth.north() - pivot.north(); + // CHECKSTYLE.OFF: SingleSpaceSeparator double nx = cosPhi * x + sinPhi * y + pivot.east(); double ny = -sinPhi * x + cosPhi * y + pivot.north(); + // CHECKSTYLE.ON: SingleSpaceSeparator n.setEastNorth(new EastNorth(nx, ny)); } Index: /trunk/src/org/openstreetmap/josm/command/ScaleCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/ScaleCommand.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/command/ScaleCommand.java (revision 10378) @@ -44,5 +44,5 @@ // releases the button and presses it again with the same modifiers. // The very first point of this operation is stored here. - startEN = currentEN; + startEN = currentEN; handleEvent(currentEN); Index: /trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java (revision 10378) @@ -32,5 +32,5 @@ public ConflictAddCommand(OsmDataLayer layer, Conflict conflict) { super(layer); - this.conflict = conflict; + this.conflict = conflict; } Index: /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 10378) @@ -344,5 +344,5 @@ private static boolean busy; - public static void pluginOperation(String install, String uninstall, String delete) { + public static void pluginOperation(String install, String uninstall, String delete) { final List installList = new ArrayList<>(); final List removeList = new ArrayList<>(); @@ -601,5 +601,5 @@ tmpPref.getAllSettings().size(), tmpPref.getAllSettings().keySet().toString()); PreferencesUtils.appendPreferences(tmpPref, mainPrefs); - } else if ("delete-values".equals(oper)) { + } else if ("delete-values".equals(oper)) { PreferencesUtils.deletePreferenceValues(tmpPref, mainPrefs); } @@ -734,5 +734,5 @@ mr.appendReplacement(sb, result); } catch (ScriptException ex) { - log("Error: Can not evaluate expression %s : %s", mr.group(1), ex.getMessage()); + log("Error: Can not evaluate expression %s : %s", mr.group(1), ex.getMessage()); } } @@ -916,5 +916,5 @@ } - private static Collection getCollection(Preferences mainpref, String key, boolean warnUnknownDefault) { + private static Collection getCollection(Preferences mainpref, String key, boolean warnUnknownDefault) { ListSetting existing = Utils.cast(mainpref.settingsMap.get(key), ListSetting.class); ListSetting defaults = Utils.cast(mainpref.defaultsMap.get(key), ListSetting.class); @@ -929,5 +929,5 @@ } - private static Collection> getArray(Preferences mainpref, String key, boolean warnUnknownDefault) { + private static Collection> getArray(Preferences mainpref, String key, boolean warnUnknownDefault) { ListListSetting existing = Utils.cast(mainpref.settingsMap.get(key), ListListSetting.class); ListListSetting defaults = Utils.cast(mainpref.defaultsMap.get(key), ListListSetting.class); @@ -943,5 +943,5 @@ } - private static List> getListOfStructs(Preferences mainpref, String key, boolean warnUnknownDefault) { + private static List> getListOfStructs(Preferences mainpref, String key, boolean warnUnknownDefault) { MapListSetting existing = Utils.cast(mainpref.settingsMap.get(key), MapListSetting.class); MapListSetting defaults = Utils.cast(mainpref.settingsMap.get(key), MapListSetting.class); @@ -1031,5 +1031,5 @@ @SuppressWarnings("unchecked") - Map stringMap = (Map) engine.get("stringMap"); + Map stringMap = (Map) engine.get("stringMap"); @SuppressWarnings("unchecked") Map> listMap = (SortedMap>) engine.get("listMap"); @@ -1073,5 +1073,5 @@ public static void loadPrefsToJS(ScriptEngine engine, Preferences tmpPref, String whereToPutInJS, boolean includeDefaults) throws ScriptException { - Map stringMap = new TreeMap<>(); + Map stringMap = new TreeMap<>(); Map> listMap = new TreeMap<>(); Map>> listlistMap = new TreeMap<>(); Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 10378) @@ -1279,5 +1279,5 @@ continue; } - } else if (f.getType() == String.class) { + } else if (f.getType() == String.class) { value = key_value.getValue(); } else if (f.getType().isAssignableFrom(Map.class)) { Index: /trunk/src/org/openstreetmap/josm/data/Version.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/Version.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/Version.java (revision 10378) @@ -85,5 +85,5 @@ isLocalBuild = false; value = properties.getProperty("Is-Local-Build"); - if (value != null && "true".equalsIgnoreCase(value.trim())) { + if (value != null && "true".equalsIgnoreCase(value.trim())) { isLocalBuild = true; } @@ -93,5 +93,5 @@ buildName = null; value = properties.getProperty("Build-Name"); - if (value != null && !value.trim().isEmpty()) { + if (value != null && !value.trim().isEmpty()) { buildName = value.trim(); } @@ -130,5 +130,5 @@ */ public String getVersionString() { - return version == 0 ? tr("UNKNOWN") : Integer.toString(version); + return version == 0 ? tr("UNKNOWN") : Integer.toString(version); } Index: /trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java (revision 10378) @@ -92,5 +92,5 @@ String val = attrs.get(key); if (val == null) { - attrs.put(key, "0"); + attrs.put(key, "0"); return 0; } Index: /trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java (revision 10378) @@ -100,5 +100,5 @@ } - private Semaphore getSemaphore(JCSCachedTileLoaderJob job) { + private Semaphore getSemaphore(JCSCachedTileLoaderJob job) { String host; try { Index: /trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java (revision 10378) @@ -42,5 +42,5 @@ private static volatile CompositeCacheManager cacheManager; - private static long maxObjectTTL = -1; + private static long maxObjectTTL = -1; private static final String PREFERENCE_PREFIX = "jcs.cache"; private static BooleanProperty USE_BLOCK_CACHE = new BooleanProperty(PREFERENCE_PREFIX + ".use_block_cache", true); @@ -53,5 +53,5 @@ * default objects to be held in memory by JCS caches (per region) */ - public static final IntegerProperty DEFAULT_MAX_OBJECTS_IN_MEMORY = new IntegerProperty(PREFERENCE_PREFIX + ".max_objects_in_memory", 1000); + public static final IntegerProperty DEFAULT_MAX_OBJECTS_IN_MEMORY = new IntegerProperty(PREFERENCE_PREFIX + ".max_objects_in_memory", 1000); private JCSCacheManager() { @@ -114,4 +114,5 @@ // these are default common to all cache regions // use of auxiliary cache and sizing of the caches is done with giving proper geCache(...) params + // CHECKSTYLE.OFF: SingleSpaceSeparator props.setProperty("jcs.default.cacheattributes", CompositeCacheAttributes.class.getCanonicalName()); props.setProperty("jcs.default.cacheattributes.MaxObjects", DEFAULT_MAX_OBJECTS_IN_MEMORY.get().toString()); @@ -123,4 +124,5 @@ props.setProperty("jcs.default.elementattributes.IdleTime", Long.toString(maxObjectTTL)); props.setProperty("jcs.default.elementattributes.IsSpool", "true"); + // CHECKSTYLE.ON: SingleSpaceSeparator CompositeCacheManager cm = CompositeCacheManager.getUnconfiguredInstance(); cm.configure(props); Index: /trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 10378) @@ -313,5 +313,5 @@ final HttpClient request = getRequest("GET", true); - if (isObjectLoadable() && + if (isObjectLoadable() && (now - attributes.getLastModification()) <= ABSOLUTE_EXPIRE_TIME_LIMIT) { request.setIfModifiedSince(attributes.getLastModification()); @@ -397,5 +397,5 @@ } catch (InterruptedException e) { attributes.setErrorMessage(e.toString()); - log.log(Level.WARNING, "JCS - Exception during download {0}", getUrlNoException()); + log.log(Level.WARNING, "JCS - Exception during download {0}", getUrlNoException()); Main.warn(e); } Index: /trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (revision 10378) @@ -235,5 +235,5 @@ */ public boolean hasConflictForTheir(OsmPrimitive their) { - return getConflictForTheir(their) != null; + return getConflictForTheir(their) != null; } Index: /trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java (revision 10378) @@ -162,6 +162,8 @@ double x = east() - pivot.east(); double y = north() - pivot.north(); + // CHECKSTYLE.OFF: SingleSpaceSeparator double nx = cosPhi * x + sinPhi * y + pivot.east(); double ny = -sinPhi * x + cosPhi * y + pivot.north(); + // CHECKSTYLE.ON: SingleSpaceSeparator return new EastNorth(nx, ny); } Index: /trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (revision 10378) @@ -39,5 +39,5 @@ * @since 8168 */ -public class TMSCachedTileLoaderJob extends JCSCachedTileLoaderJob implements TileJob, ICachedLoaderListener { +public class TMSCachedTileLoaderJob extends JCSCachedTileLoaderJob implements TileJob, ICachedLoaderListener { private static final Logger LOG = FeatureAdapter.getLogger(TMSCachedTileLoaderJob.class.getCanonicalName()); private static final LongProperty MAXIMUM_EXPIRES = new LongProperty("imagery.generic.maximum_expires", @@ -124,5 +124,5 @@ byte[] content = cacheData.getContent(); try { - return content != null || cacheData.getImage() != null || isNoTileAtZoom(); + return content != null || cacheData.getImage() != null || isNoTileAtZoom(); } catch (IOException e) { LOG.log(Level.WARNING, "JCS TMS - error loading from cache for tile {0}: {1}", new Object[] {tile.getKey(), e.getMessage()}); Index: /trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java (revision 10378) @@ -46,15 +46,17 @@ private double[] degreesPerTile; - private static final Pattern PATTERN_HEADER = Pattern.compile("\\{header\\(([^,]+),([^}]+)\\)\\}"); - private static final Pattern PATTERN_PROJ = Pattern.compile("\\{proj\\}"); - private static final Pattern PATTERN_WKID = Pattern.compile("\\{wkid\\}"); - private static final Pattern PATTERN_BBOX = Pattern.compile("\\{bbox\\}"); - private static final Pattern PATTERN_W = Pattern.compile("\\{w\\}"); - private static final Pattern PATTERN_S = Pattern.compile("\\{s\\}"); - private static final Pattern PATTERN_E = Pattern.compile("\\{e\\}"); - private static final Pattern PATTERN_N = Pattern.compile("\\{n\\}"); - private static final Pattern PATTERN_WIDTH = Pattern.compile("\\{width\\}"); - private static final Pattern PATTERN_HEIGHT = Pattern.compile("\\{height\\}"); - private static final Pattern PATTERN_PARAM = Pattern.compile("\\{([^}]+)\\}"); + // CHECKSTYLE.OFF: SingleSpaceSeparator + private static final Pattern PATTERN_HEADER = Pattern.compile("\\{header\\(([^,]+),([^}]+)\\)\\}"); + private static final Pattern PATTERN_PROJ = Pattern.compile("\\{proj\\}"); + private static final Pattern PATTERN_WKID = Pattern.compile("\\{wkid\\}"); + private static final Pattern PATTERN_BBOX = Pattern.compile("\\{bbox\\}"); + private static final Pattern PATTERN_W = Pattern.compile("\\{w\\}"); + private static final Pattern PATTERN_S = Pattern.compile("\\{s\\}"); + private static final Pattern PATTERN_E = Pattern.compile("\\{e\\}"); + private static final Pattern PATTERN_N = Pattern.compile("\\{n\\}"); + private static final Pattern PATTERN_WIDTH = Pattern.compile("\\{width\\}"); + private static final Pattern PATTERN_HEIGHT = Pattern.compile("\\{height\\}"); + private static final Pattern PATTERN_PARAM = Pattern.compile("\\{([^}]+)\\}"); + // CHECKSTYLE.ON: SingleSpaceSeparator private static final NumberFormat latLonFormat = new DecimalFormat("###0.0000000", new DecimalFormatSymbols(Locale.US)); @@ -269,5 +271,5 @@ @Override public TileXY latLonToTileXY(ICoordinate point, int zoom) { - return latLonToTileXY(point.getLat(), point.getLon(), zoom); + return latLonToTileXY(point.getLat(), point.getLon(), zoom); } @@ -297,5 +299,5 @@ EastNorth point = Main.getProjection().latlon2eastNorth(new LatLon(lat, lon)); return new Point( - (int) Math.round((point.east() - anchorPosition.east()) / scale), + (int) Math.round((point.east() - anchorPosition.east()) / scale), (int) Math.round((anchorPosition.north() - point.north()) / scale) ); Index: /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 10378) @@ -61,5 +61,5 @@ */ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTileSource { - private static final String PATTERN_HEADER = "\\{header\\(([^,]+),([^}]+)\\)\\}"; + private static final String PATTERN_HEADER = "\\{header\\(([^,]+),([^}]+)\\)\\}"; private static final String URL_GET_ENCODING_PARAMS = "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER={layer}&STYLE={style}&" @@ -812,5 +812,5 @@ @Override public TileXY latLonToTileXY(ICoordinate point, int zoom) { - return latLonToTileXY(point.getLat(), point.getLon(), zoom); + return latLonToTileXY(point.getLat(), point.getLon(), zoom); } @@ -844,5 +844,5 @@ EastNorth point = Main.getProjection().latlon2eastNorth(new LatLon(lat, lon)); return new Point( - (int) Math.round((point.east() - matrix.topLeftCorner.east()) / scale), + (int) Math.round((point.east() - matrix.topLeftCorner.east()) / scale), (int) Math.round((matrix.topLeftCorner.north() - point.north()) / scale) ); Index: /trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 10378) @@ -60,5 +60,5 @@ * as deleted on the server. */ - protected static final int FLAG_VISIBLE = 1 << 1; + protected static final int FLAG_VISIBLE = 1 << 1; /** @@ -69,5 +69,5 @@ * objects still referring to it. */ - protected static final int FLAG_DELETED = 1 << 2; + protected static final int FLAG_DELETED = 1 << 2; /** Index: /trunk/src/org/openstreetmap/josm/data/osm/BBox.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/BBox.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/BBox.java (revision 10378) @@ -53,5 +53,5 @@ } - public BBox(double ax, double ay, double bx, double by) { + public BBox(double ax, double ay, double bx, double by) { if (ax > bx) { @@ -94,16 +94,16 @@ } - private void sanity() { + private void sanity() { if (xmin < -180.0) { xmin = -180.0; } - if (xmax > 180.0) { - xmax = 180.0; - } - if (ymin < -90.0) { - ymin = -90.0; - } - if (ymax > 90.0) { - ymax = 90.0; + if (xmax > 180.0) { + xmax = 180.0; + } + if (ymin < -90.0) { + ymin = -90.0; + } + if (ymax > 90.0) { + ymax = 90.0; } } Index: /trunk/src/org/openstreetmap/josm/data/osm/Changeset.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Changeset.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/Changeset.java (revision 10378) @@ -326,5 +326,5 @@ this.createdAt = other.createdAt; this.closedAt = other.closedAt; - this.open = other.open; + this.open = other.open; this.min = other.min; this.max = other.max; Index: /trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 10378) @@ -144,5 +144,5 @@ */ public HistoryOsmPrimitive getPrimitive(PrimitiveId id) { - if (id == null) return null; + if (id == null) return null; return primitives.get(id); } Index: /trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java (revision 10378) @@ -141,5 +141,5 @@ } else if (dataSet.getPrimitiveById(primitive) == null) { printError("REFERENCED BUT NOT IN DATA", "%s is referenced by %s but not found in dataset", primitive, parent); - } else if (dataSet.getPrimitiveById(primitive) != primitive) { + } else if (dataSet.getPrimitiveById(primitive) != primitive) { printError("DIFFERENT INSTANCE", "%s is different instance that referred by %s", primitive, parent); } Index: /trunk/src/org/openstreetmap/josm/data/osm/Filter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Filter.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/Filter.java (revision 10378) @@ -57,5 +57,5 @@ } else if ("remove".equals(e.mode)) { mode = SearchMode.remove; - } else if ("in_selection".equals(e.mode)) { + } else if ("in_selection".equals(e.mode)) { mode = SearchMode.in_selection; } Index: /trunk/src/org/openstreetmap/josm/data/osm/Node.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 10378) @@ -277,5 +277,5 @@ public String toString() { String coorDesc = isLatLonKnown() ? "lat="+lat+",lon="+lon : ""; - return "{Node id=" + getUniqueId() + " version=" + getVersion() + ' ' + getFlagsAsString() + ' ' + coorDesc+'}'; + return "{Node id=" + getUniqueId() + " version=" + getVersion() + ' ' + getFlagsAsString() + ' ' + coorDesc+'}'; } Index: /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 10378) @@ -634,5 +634,5 @@ } super.setIncomplete(incomplete); - } finally { + } finally { writeUnlock(locked); } @@ -1266,5 +1266,5 @@ boolean hasEqualSemanticAttributes(final OsmPrimitive other, final boolean testInterestingTagsOnly) { - if (!isNew() && id != other.id) + if (!isNew() && id != other.id) return false; if (isIncomplete() ^ other.isIncomplete()) // exclusive or operator for performance (see #7159) @@ -1291,5 +1291,5 @@ if (other == null) return false; - return isDeleted() == other.isDeleted() + return isDeleted() == other.isDeleted() && isModified() == other.isModified() && timestamp == other.timestamp Index: /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 10378) @@ -41,5 +41,5 @@ MapView.addLayerChangeListener(historyDataSet); } - return historyDataSet; + return historyDataSet; } Index: /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 10378) @@ -89,5 +89,5 @@ this.visible = visible; this.user = user; - this.changesetId = changesetId; + this.changesetId = changesetId; this.timestamp = timestamp; tags = new HashMap<>(); Index: /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (revision 10378) @@ -111,5 +111,5 @@ * @throws IndexOutOfBoundsException if idx is out of bounds */ - public RelationMemberData getRelationMember(int idx) throws IndexOutOfBoundsException { + public RelationMemberData getRelationMember(int idx) throws IndexOutOfBoundsException { if (idx < 0 || idx >= members.size()) throw new IndexOutOfBoundsException( Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 10378) @@ -66,5 +66,5 @@ public Descriptor(Class renderer, String displayName, String description) { this.renderer = renderer; - this.displayName = displayName; + this.displayName = displayName; this.description = description; } Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java (revision 10378) @@ -21,5 +21,5 @@ CONNECTION(marktr("Node: connection"), Color.yellow), TAGGED(marktr("Node: tagged"), new Color(204, 255, 255)), // light cyan - DEFAULT_WAY(marktr("way"), new Color(0, 0, 128)), // dark blue + DEFAULT_WAY(marktr("way"), new Color(0, 0, 128)), // dark blue RELATION(marktr("relation"), new Color(0, 128, 128)), // teal UNTAGGED_WAY(marktr("untagged way"), new Color(0, 128, 0)), // dark green Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 10378) @@ -295,5 +295,5 @@ */ public static boolean isGlyphVectorDoubleTranslationBug(Font font) { - Boolean cached = IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG.get(font); + Boolean cached = IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG.get(font); if (cached != null) return cached; @@ -575,5 +575,5 @@ if (pb.width >= nb.getWidth() && pb.height >= nb.getHeight()) { - final double w = pb.width - nb.getWidth(); + final double w = pb.width - nb.getWidth(); final double h = pb.height - nb.getHeight(); @@ -590,8 +590,10 @@ if (!labelOK) { // if center position (C) is not inside osm shape, try naively some other positions as follows: + // CHECKSTYLE.OFF: SingleSpaceSeparator final int x1 = pb.x + (int) (w/4.0); final int x3 = pb.x + (int) (3*w/4.0); final int y1 = pb.y + (int) (h/4.0); final int y3 = pb.y + (int) (3*h/4.0); + // CHECKSTYLE.ON: SingleSpaceSeparator // +-----------+ // | 5 1 6 | @@ -1481,5 +1483,5 @@ final double segmentLength = p1.distance(p2); if (segmentLength != 0) { - final double l = (10. + line.getLineWidth()) / segmentLength; + final double l = (10. + line.getLineWidth()) / segmentLength; final double sx = l * (p1.x - p2.x); Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 10378) @@ -427,5 +427,5 @@ if (showDirection) { - final double l = 10. / p1.distance(p2); + final double l = 10. / p1.distance(p2); final double sx = l * (p1.x - p2.x); Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (revision 10378) @@ -646,5 +646,5 @@ } - private void addInnerToOuters(List innerPolygons, List outerPolygons) { + private void addInnerToOuters(List innerPolygons, List outerPolygons) { if (innerPolygons.isEmpty()) { combinedPolygons.addAll(outerPolygons); Index: /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 10378) @@ -316,5 +316,5 @@ s = parameters.get(Param.axis.key); if (s != null) { - this.axis = s; + this.axis = s; } } @@ -526,5 +526,5 @@ id = "tmerc"; } - Proj proj = Projections.getBaseProjection(id); + Proj proj = Projections.getBaseProjection(id); if (proj == null) throw new ProjectionConfigurationException(tr("Unknown projection identifier: ''{0}''", id)); Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java (revision 10378) @@ -92,4 +92,5 @@ // Compute constants for the mlfn double t; + // CHECKSTYLE.OFF: SingleSpaceSeparator en0 = C00 - e2 * (C02 + e2 * (C04 + e2 * (C06 + e2 * C08))); @@ -100,4 +101,5 @@ en3 = (t *= e2) * (C66 - e2 * C68); en4 = t * e2 * C88; + // CHECKSTYLE.ON: SingleSpaceSeparator } @@ -158,5 +160,5 @@ double phi = (Math.PI/2) - 2.0 * Math.atan(ts); for (int i = 0; i < MAXIMUM_ITERATIONS; i++) { - final double con = e * Math.sin(phi); + final double con = e * Math.sin(phi); final double dphi = (Math.PI/2) - 2.0*Math.atan(ts * Math.pow((1-con)/(1+con), eccnth)) - phi; phi += dphi; Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java (revision 10378) @@ -98,13 +98,13 @@ throw new ProjectionConfigurationException(tr("standard parallels are opposite")); } - double sinphi = Math.sin(phi1); - double cosphi = Math.cos(phi1); - double n = sinphi; + double sinphi = Math.sin(phi1); + double cosphi = Math.cos(phi1); + double n = sinphi; boolean secant = Math.abs(phi1 - phi2) >= EPSILON; double m1 = msfn(sinphi, cosphi); double q1 = qsfn(sinphi); if (secant) { // secant cone - sinphi = Math.sin(phi2); - cosphi = Math.cos(phi2); + sinphi = Math.sin(phi2); + cosphi = Math.cos(phi2); double m2 = msfn(sinphi, cosphi); double q2 = qsfn(sinphi); @@ -130,6 +130,8 @@ } rho = Math.sqrt(rho) / n; - y = rho0 - rho * Math.cos(x); - x = rho * Math.sin(x); + // CHECKSTYLE.OFF: SingleSpaceSeparator + y = rho0 - rho * Math.cos(x); + x = rho * Math.sin(x); + // CHECKSTYLE.ON: SingleSpaceSeparator return new double[] {x, y}; } @@ -142,6 +144,6 @@ if (n < 0.0) { rho = -rho; - x = -x; - y = -y; + x = -x; + y = -y; } x = Math.atan2(x, y) / n; @@ -175,7 +177,7 @@ final double sinpi = Math.sin(phi); final double cospi = Math.cos(phi); - final double con = e * sinpi; - final double com = 1.0 - con*con; - final double dphi = 0.5 * com*com / cospi * + final double con = e * sinpi; + final double com = 1.0 - con*con; + final double dphi = 0.5 * com*com / cospi * (qs/toneEs - sinpi / com + 0.5/e * Math.log((1. - con) / (1. + con))); phi += dphi; Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java (revision 10378) @@ -100,6 +100,6 @@ final double sinphi; - qp = qsfn(1); - rq = Math.sqrt(0.5 * qp); + qp = qsfn(1); + rq = Math.sqrt(0.5 * qp); sinphi = Math.sin(latitudeOfOrigin); sinb1 = qsfn(sinphi) / qp; @@ -107,25 +107,20 @@ switch (mode) { case NORTH_POLE: // Fall through - case SOUTH_POLE: { - dd = 1.0; + case SOUTH_POLE: + dd = 1.0; xmf = ymf = rq; break; - } - case EQUATORIAL: { - dd = 1.0 / rq; + case EQUATORIAL: + dd = 1.0 / rq; xmf = 1.0; ymf = 0.5 * qp; break; - } - case OBLIQUE: { - dd = Math.cos(latitudeOfOrigin) / - (Math.sqrt(1.0 - e2 * sinphi * sinphi) * rq * cosb1); + case OBLIQUE: + dd = Math.cos(latitudeOfOrigin) / (Math.sqrt(1.0 - e2 * sinphi * sinphi) * rq * cosb1); xmf = rq * dd; ymf = rq / dd; break; - } - default: { + default: throw new AssertionError(mode); - } } } @@ -139,23 +134,21 @@ final double sinb, cosb, b, c, x, y; switch (mode) { - case OBLIQUE: { + case OBLIQUE: sinb = q / qp; cosb = Math.sqrt(1.0 - sinb * sinb); - c = 1.0 + sinb1 * sinb + cosb1 * cosb * coslam; - b = Math.sqrt(2.0 / c); - y = ymf * b * (cosb1 * sinb - sinb1 * cosb * coslam); - x = xmf * b * cosb * sinlam; - break; - } - case EQUATORIAL: { + c = 1.0 + sinb1 * sinb + cosb1 * cosb * coslam; + b = Math.sqrt(2.0 / c); + y = ymf * b * (cosb1 * sinb - sinb1 * cosb * coslam); + x = xmf * b * cosb * sinlam; + break; + case EQUATORIAL: sinb = q / qp; cosb = Math.sqrt(1.0 - sinb * sinb); - c = 1.0 + cosb * coslam; - b = Math.sqrt(2.0 / c); - y = ymf * b * sinb; - x = xmf * b * cosb * sinlam; - break; - } - case NORTH_POLE: { + c = 1.0 + cosb * coslam; + b = Math.sqrt(2.0 / c); + y = ymf * b * sinb; + x = xmf * b * cosb * sinlam; + break; + case NORTH_POLE: c = (Math.PI / 2) + phi; q = qp - q; @@ -168,6 +161,5 @@ } break; - } - case SOUTH_POLE: { + case SOUTH_POLE: c = phi - (Math.PI / 2); q = qp + q; @@ -180,8 +172,6 @@ } break; - } - default: { + default: throw new AssertionError(mode); - } } if (Math.abs(c) < EPSILON_LATITUDE) { @@ -211,8 +201,8 @@ if (mode == Mode.OBLIQUE) { ab = cCe * sinb1 + y * sCe * cosb1 / rho; - y = rho * cosb1 * cCe - y * sinb1 * sCe; + y = rho * cosb1 * cCe - y * sinb1 * sCe; } else { ab = y * sCe / rho; - y = rho * cCe; + y = rho * cCe; } lambda = Math.atan2(x, y); Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java (revision 10378) @@ -105,6 +105,6 @@ final double tf = t(toRadians(lat0)); - n = (log(m1) - log(m2)) / (log(t1) - log(t2)); - f = m1 / (n * pow(t1, n)); + n = (log(m1) - log(m2)) / (log(t1) - log(t2)); + f = m1 / (n * pow(t1, n)); r0 = f * pow(tf, n); } @@ -123,5 +123,5 @@ n = sin(lat0rad); - f = m0 / (n * pow(t0, n)); + f = m0 / (n * pow(t0, n)); r0 = f * pow(t0, n); } Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/Mercator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/Mercator.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/Mercator.java (revision 10378) @@ -72,5 +72,5 @@ if (spherical) { scaleFactor *= Math.cos(standardParallel); - } else { + } else { scaleFactor *= msfn(Math.sin(standardParallel), Math.cos(standardParallel)); } Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java (revision 10378) @@ -314,4 +314,5 @@ lonCenter = Math.toRadians(params.lonc); azimuth = Math.toRadians(params.alpha); + // CHECKSTYLE.OFF: SingleSpaceSeparator if ((azimuth > -1.5*Math.PI && azimuth < -0.5*Math.PI) || (azimuth > 0.5*Math.PI && azimuth < 1.5*Math.PI)) { @@ -319,4 +320,5 @@ tr("Illegal value for parameter ''{0}'': {1}", "alpha", Double.toString(params.alpha))); } + // CHECKSTYLE.ON: SingleSpaceSeparator if (params.gamma != null) { rectifiedGridAngle = Math.toRadians(params.gamma); @@ -341,11 +343,11 @@ singamma0 = Math.sin(gamma0); cosgamma0 = Math.cos(gamma0); - sinrot = Math.sin(rectifiedGridAngle); - cosrot = Math.cos(rectifiedGridAngle); - arb = a / b; - ab = a * b; - bra = b / a; - vPoleN = arb * Math.log(Math.tan(0.5 * (Math.PI/2.0 - gamma0))); - vPoleS = arb * Math.log(Math.tan(0.5 * (Math.PI/2.0 + gamma0))); + sinrot = Math.sin(rectifiedGridAngle); + cosrot = Math.cos(rectifiedGridAngle); + arb = a / b; + ab = a * b; + bra = b / a; + vPoleN = arb * Math.log(Math.tan(0.5 * (Math.PI/2.0 - gamma0))); + vPoleS = arb * Math.log(Math.tan(0.5 * (Math.PI/2.0 + gamma0))); boolean hotine = params.no_off != null && params.no_off; if (hotine) { Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java (revision 10378) @@ -135,5 +135,5 @@ } else { final double rho = k0 * tsfn(y, sinlat); - x = rho * sinlon; + x = rho * sinlon; y = -rho * coslon; } Index: /trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java (revision 10378) @@ -152,5 +152,5 @@ (int) (p2.y + sinT), (int) (p1.y + sinT)}; g.fillPolygon(x, y, 4); - g.fillArc(p1.x - 5, p1.y - 5, 10, 10, deg, 180); + g.fillArc(p1.x - 5, p1.y - 5, 10, 10, deg, 180); g.fillArc(p2.x - 5, p2.y - 5, 10, 10, deg, -180); } @@ -160,5 +160,5 @@ g.drawLine((int) (p1.x - cosT), (int) (p1.y + sinT), (int) (p2.x - cosT), (int) (p2.y + sinT)); - g.drawArc(p1.x - 5, p1.y - 5, 10, 10, deg, 180); + g.drawArc(p1.x - 5, p1.y - 5, 10, 10, deg, 180); g.drawArc(p2.x - 5, p2.y - 5, 10, 10, deg, -180); } Index: /trunk/src/org/openstreetmap/josm/data/validation/Severity.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/Severity.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/validation/Severity.java (revision 10378) @@ -11,4 +11,5 @@ /** The error severity */ public enum Severity { + // CHECKSTYLE.OFF: SingleSpaceSeparator /** Error messages */ ERROR(tr("Errors"), /* ICON(data/) */"error", Main.pref.getColor(marktr("validation error"), Color.RED)), @@ -17,4 +18,5 @@ /** Other messages */ OTHER(tr("Other"), /* ICON(data/) */"other", Main.pref.getColor(marktr("validation other"), Color.CYAN)); + // CHECKSTYLE.ON: SingleSpaceSeparator /** Description of the severity code */ Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java (revision 10378) @@ -125,5 +125,5 @@ throw new IllegalArgumentException("Regular expression[" + i + "] is missing"); } - patterns[i] = Pattern.compile(regexs[i], flags); + patterns[i] = Pattern.compile(regexs[i], flags); } } Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java (revision 10378) @@ -44,4 +44,5 @@ protected static final int HOUSE_NUMBER_TOO_FAR = 2605; + // CHECKSTYLE.OFF: SingleSpaceSeparator protected static final String ADDR_HOUSE_NUMBER = "addr:housenumber"; protected static final String ADDR_INTERPOLATION = "addr:interpolation"; @@ -49,4 +50,5 @@ protected static final String ADDR_STREET = "addr:street"; protected static final String ASSOCIATED_STREET = "associatedStreet"; + // CHECKSTYLE.ON: SingleSpaceSeparator protected static class AddressError extends TestError { Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java (revision 10378) @@ -47,4 +47,5 @@ */ private static final List CLASSIFIED_HIGHWAYS = Arrays.asList( + // CHECKSTYLE.OFF: SingleSpaceSeparator "motorway", "motorway_link", "trunk", "trunk_link", @@ -55,4 +56,5 @@ "residential", "living_street"); + // CHECKSTYLE.ON: SingleSpaceSeparator private static final Set KNOWN_SOURCE_MAXSPEED_CONTEXTS = new HashSet<>(Arrays.asList( Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java (revision 10378) @@ -20,5 +20,5 @@ /** Long segment error */ - protected static final int LONG_SEGMENT = 3501; + protected static final int LONG_SEGMENT = 3501; /** Maximum segment length for this test */ protected int maxlength; Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java (revision 10378) @@ -62,5 +62,5 @@ @Override - public void startTest(ProgressMonitor monitor) { + public void startTest(ProgressMonitor monitor) { super.startTest(monitor); nodePairs = new MultiMap<>(1000); Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (revision 10378) @@ -36,20 +36,22 @@ public class RelationChecker extends Test { + // CHECKSTYLE.OFF: SingleSpaceSeparator /** Role {0} unknown in templates {1} */ - public static final int ROLE_UNKNOWN = 1701; + public static final int ROLE_UNKNOWN = 1701; /** Empty role type found when expecting one of {0} */ - public static final int ROLE_EMPTY = 1702; + public static final int ROLE_EMPTY = 1702; /** Role member does not match expression {0} in template {1} */ - public static final int WRONG_TYPE = 1703; + public static final int WRONG_TYPE = 1703; /** Number of {0} roles too high ({1}) */ - public static final int HIGH_COUNT = 1704; + public static final int HIGH_COUNT = 1704; /** Number of {0} roles too low ({1}) */ - public static final int LOW_COUNT = 1705; + public static final int LOW_COUNT = 1705; /** Role {0} missing */ - public static final int ROLE_MISSING = 1706; + public static final int ROLE_MISSING = 1706; /** Relation type is unknown */ - public static final int RELATION_UNKNOWN = 1707; + public static final int RELATION_UNKNOWN = 1707; /** Relation is empty */ - public static final int RELATION_EMPTY = 1708; + public static final int RELATION_EMPTY = 1708; + // CHECKSTYLE.ON: SingleSpaceSeparator /** Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 10378) @@ -115,4 +115,5 @@ protected JCheckBox prefCheckPaintBeforeUpload; + // CHECKSTYLE.OFF: SingleSpaceSeparator protected static final int EMPTY_VALUES = 1200; protected static final int INVALID_KEY = 1201; @@ -129,4 +130,5 @@ protected static final int MISSPELLED_KEY = 1213; protected static final int MULTIPLE_SPACES = 1214; + // CHECKSTYLE.ON: SingleSpaceSeparator // 1250 and up is used by tagcheck @@ -707,7 +709,9 @@ private int code; protected Severity severity; - protected static final int TAG_CHECK_ERROR = 1250; - protected static final int TAG_CHECK_WARN = 1260; - protected static final int TAG_CHECK_INFO = 1270; + // CHECKSTYLE.OFF: SingleSpaceSeparator + protected static final int TAG_CHECK_ERROR = 1250; + protected static final int TAG_CHECK_WARN = 1260; + protected static final int TAG_CHECK_INFO = 1270; + // CHECKSTYLE.ON: SingleSpaceSeparator protected static class CheckerElement { Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java (revision 10378) @@ -95,6 +95,8 @@ String value = w.get(key); if (isValueErroneous(value)) { + // CHECKSTYLE.OFF: SingleSpaceSeparator String type = engMessage.contains("{0}") ? tr(engMessage, tr(value)) : tr(engMessage); String etype = engMessage.contains("{0}") ? MessageFormat.format(engMessage, value) : engMessage; + // CHECKSTYLE.ON: SingleSpaceSeparator return new TestError(UnclosedWays.this, Severity.WARNING, tr("Unclosed way"), type, etype, code, Arrays.asList(w), @@ -136,4 +138,5 @@ private final UnclosedWaysCheck[] checks = { + // CHECKSTYLE.OFF: SingleSpaceSeparator new UnclosedWaysCheck(1101, "natural", marktr("natural type {0}"), new HashSet<>(Arrays.asList("cave", "coastline", "cliff", "tree_row", "ridge", "valley", "arete", "gorge"))), @@ -152,4 +155,5 @@ new UnclosedWaysBooleanCheck(1120, "building", marktr("building")), new UnclosedWaysBooleanCheck(1130, "area", marktr("area")), + // CHECKSTYLE.ON: SingleSpaceSeparator }; Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (revision 10378) @@ -346,5 +346,5 @@ y2 = tmpy; } - LatLon topLeft = new LatLon(y2+fudge, x1-fudge); + LatLon topLeft = new LatLon(y2+fudge, x1-fudge); LatLon botRight = new LatLon(y1-fudge, x2+fudge); List ret = new ArrayList<>(2); @@ -355,7 +355,6 @@ public Collection nearbyNodes(double dist) { - // If you're looking for nodes that are farther - // away that we looked for last time, the cached - // result is no good + // If you're looking for nodes that are farther away that we looked for last time, + // the cached result is no good if (dist > nearbyNodeCacheDist) { nearbyNodeCache = null; Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java (revision 10378) @@ -27,16 +27,18 @@ public class UntaggedWay extends Test { + // CHECKSTYLE.OFF: SingleSpaceSeparator /** Empty way error */ - protected static final int EMPTY_WAY = 301; + protected static final int EMPTY_WAY = 301; /** Untagged way error */ - protected static final int UNTAGGED_WAY = 302; + protected static final int UNTAGGED_WAY = 302; /** Unnamed way error */ - protected static final int UNNAMED_WAY = 303; + protected static final int UNNAMED_WAY = 303; /** One node way error */ - protected static final int ONE_NODE_WAY = 304; + protected static final int ONE_NODE_WAY = 304; /** Unnamed junction error */ - protected static final int UNNAMED_JUNCTION = 305; + protected static final int UNNAMED_JUNCTION = 305; /** Untagged, but commented way error */ - protected static final int COMMENTED_WAY = 306; + protected static final int COMMENTED_WAY = 306; + // CHECKSTYLE.ON: SingleSpaceSeparator private Set waysUsedInRelations; Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java (revision 10378) @@ -19,6 +19,8 @@ public class WronglyOrderedWays extends Test { + // CHECKSTYLE.OFF: SingleSpaceSeparator protected static final int WRONGLY_ORDERED_COAST = 1001; protected static final int WRONGLY_ORDERED_LAND = 1003; + // CHECKSTYLE.ON: SingleSpaceSeparator /** Index: /trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java (revision 10378) @@ -45,8 +45,10 @@ // First, round coordinates + // CHECKSTYLE.OFF: SingleSpaceSeparator long x0 = Math.round(n1.getEastNorth().east() * OsmValidator.griddetail); long y0 = Math.round(n1.getEastNorth().north() * OsmValidator.griddetail); long x1 = Math.round(n2.getEastNorth().east() * OsmValidator.griddetail); long y1 = Math.round(n2.getEastNorth().north() * OsmValidator.griddetail); + // CHECKSTYLE.ON: SingleSpaceSeparator // Start of the way @@ -73,8 +75,10 @@ // Then floor coordinates, in case the way is in the border of the cell. + // CHECKSTYLE.OFF: SingleSpaceSeparator x0 = (long) Math.floor(n1.getEastNorth().east() * OsmValidator.griddetail); y0 = (long) Math.floor(n1.getEastNorth().north() * OsmValidator.griddetail); x1 = (long) Math.floor(n2.getEastNorth().east() * OsmValidator.griddetail); y1 = (long) Math.floor(n2.getEastNorth().north() * OsmValidator.griddetail); + // CHECKSTYLE.ON: SingleSpaceSeparator // Start of the way @@ -147,6 +151,6 @@ } - double dx = x1 - x0; - double dy = y1 - y0; + double dx = x1 - x0; + double dy = y1 - y0; long stepY = y0 <= y1 ? 1 : -1; long gridX0 = (long) Math.floor(x0); Index: /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 10378) @@ -161,5 +161,5 @@ /* I18n: house number, street as parameter, number should remain before street for better visibility */ - n = tr("House number {0} at {1}", s, t); + n = tr("House number {0} at {1}", s, t); } else { /* I18n: house number as parameter */ @@ -253,5 +253,5 @@ /* I18n: house number, street as parameter, number should remain before street for better visibility */ - n = tr("House number {0} at {1}", s, t); + n = tr("House number {0} at {1}", s, t); } else { /* I18n: house number as parameter */ @@ -405,5 +405,5 @@ } if (name == null) { - String building = relation.get("building"); + String building = relation.get("building"); if (OsmUtils.isTrue(building)) { name = tr("building"); Index: /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 10378) @@ -407,6 +407,6 @@ boolean limitedInHeight = d.height > x.height; - if (x.width > 0 && d.width > x.width) { - d.width = x.width; + if (x.width > 0 && d.width > x.width) { + d.width = x.width; } if (x.height > 0 && d.height > x.height) { Index: /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 10378) @@ -214,5 +214,5 @@ */ public static int showOptionDialog(Component parentComponent, Object msg, String title, int messageType, - Icon icon, final ButtonSpec[] options, final ButtonSpec defaultOption, final String helpTopic) { + Icon icon, final ButtonSpec[] options, final ButtonSpec defaultOption, final String helpTopic) { final List buttons = createOptionButtons(options, helpTopic); if (helpTopic != null) { @@ -334,5 +334,5 @@ * @see #showOptionDialog(Component, Object, String, int, Icon, ButtonSpec[], ButtonSpec, String) */ - public static int showOptionDialog(Component parentComponent, Object msg, String title, int messageType, String helpTopic) { + public static int showOptionDialog(Component parentComponent, Object msg, String title, int messageType, String helpTopic) { return showOptionDialog(parentComponent, msg, title, messageType, null, null, null, helpTopic); } @@ -352,5 +352,5 @@ */ public static void showMessageDialogInEDT(final Component parentComponent, final Object msg, final String title, - final int messageType, final String helpTopic) { + final int messageType, final String helpTopic) { GuiHelper.runInEDT(new Runnable() { @Override Index: /trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java (revision 10378) @@ -282,5 +282,5 @@ private void addDynamicSeparator() { - JPopupMenu.Separator s = new JPopupMenu.Separator(); + JPopupMenu.Separator s = new JPopupMenu.Separator(); dynamicItems.add(s); add(s); Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 10378) @@ -146,8 +146,10 @@ "\t--offline= "+tr("Disable access to the given resource(s), separated by comma")+"\n\n"+ tr("options provided as Java system properties")+":\n"+ + // CHECKSTYLE.OFF: SingleSpaceSeparator "\t-Djosm.pref=" +tr("/PATH/TO/JOSM/PREF ")+tr("Set the preferences directory")+"\n\n"+ "\t-Djosm.userdata="+tr("/PATH/TO/JOSM/USERDATA")+tr("Set the user data directory")+"\n\n"+ "\t-Djosm.cache=" +tr("/PATH/TO/JOSM/CACHE ")+tr("Set the cache directory")+"\n\n"+ "\t-Djosm.home=" +tr("/PATH/TO/JOSM/HOMEDIR ")+ + // CHECKSTYLE.ON: SingleSpaceSeparator tr("Relocate all 3 directories to homedir. Cache directory will be in homedir/cache")+"\n\n"+ tr("-Djosm.home has lower precedence, i.e. the specific setting overrides the general one")+"\n\n"+ Index: /trunk/src/org/openstreetmap/josm/gui/MapFrame.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 10378) @@ -599,5 +599,5 @@ public void setButton(JButton button) { - this.button = button; + this.button = button; final ImageIcon icon = ImageProvider.get("audio-fwd"); putValue(SMALL_ICON, icon); Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 10378) @@ -1004,5 +1004,5 @@ } - public void setHelpText(Object id, final String text) { + public void setHelpText(Object id, final String text) { StatusTextHistory entry = new StatusTextHistory(id, text); Index: /trunk/src/org/openstreetmap/josm/gui/MapView.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 10378) @@ -564,5 +564,5 @@ public void rememberLastPositionOnScreen() { oldSize = getSize(); - oldLoc = getLocationOnScreen(); + oldLoc = getLocationOnScreen(); } @@ -949,5 +949,5 @@ // if the position was remembered, we need to adjust center once before repainting if (oldLoc != null && oldSize != null) { - Point l1 = getLocationOnScreen(); + Point l1 = getLocationOnScreen(); final EastNorth newCenter = new EastNorth( getCenter().getX()+ (l1.x-oldLoc.x - (oldSize.width-getWidth())/2.0)*getScale(), Index: /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 10378) @@ -101,5 +101,5 @@ public static final String PROPNAME_CENTER = "center"; - public static final String PROPNAME_SCALE = "scale"; + public static final String PROPNAME_SCALE = "scale"; /** Index: /trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java (revision 10378) @@ -132,5 +132,5 @@ this.addComponentListener(new ComponentAdapter() { - @Override public void componentResized(ComponentEvent e) { + @Override public void componentResized(ComponentEvent e) { showOrHideButtons(); } Index: /trunk/src/org/openstreetmap/josm/gui/SideButton.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/SideButton.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/SideButton.java (revision 10378) @@ -102,5 +102,5 @@ if (i instanceof ImageIcon && i.getIconHeight() != iconHeight) { Image im = ((ImageIcon) i).getImage(); - int newWidth = im.getWidth(null) * iconHeight / im.getHeight(null); + int newWidth = im.getWidth(null) * iconHeight / im.getHeight(null); ImageIcon icon = new ImageIcon(im.getScaledInstance(newWidth, iconHeight, Image.SCALE_SMOOTH)); setIcon(icon); Index: /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 10378) @@ -137,5 +137,5 @@ headers.put("User-Agent", Version.getInstance().getFullAgentString()); - cachedLoader = AbstractCachedTileSourceLayer.getTileLoaderFactory("TMS", TMSCachedTileLoader.class).makeTileLoader(this, headers); + cachedLoader = AbstractCachedTileSourceLayer.getTileLoaderFactory("TMS", TMSCachedTileLoader.class).makeTileLoader(this, headers); uncachedLoader = new OsmTileLoader(this); @@ -240,5 +240,5 @@ iSelectionRectStart = getPosition(pMin); - iSelectionRectEnd = getPosition(pMax); + iSelectionRectEnd = getPosition(pMax); Bounds b = new Bounds( Index: /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 10378) @@ -183,6 +183,6 @@ */ protected LatLon getNorthWestLatLonOfTile(Point tile, int zoom) { - double lon = tile.x / Math.pow(2.0, zoom) * 360.0 - 180; - double lat = Math.toDegrees(Math.atan(Math.sinh(Math.PI - (2.0 * Math.PI * tile.y) / Math.pow(2.0, zoom)))); + double lon = tile.x / Math.pow(2.0, zoom) * 360.0 - 180; + double lat = Math.toDegrees(Math.atan(Math.sinh(Math.PI - (2.0 * Math.PI * tile.y) / Math.pow(2.0, zoom)))); return new LatLon(lat, lon); } Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java (revision 10378) @@ -22,10 +22,10 @@ * compare my version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with the merged version */ - MY_WITH_MERGED(tr("My with Merged"), new ListRole[] {MY_ENTRIES, MERGED_ENTRIES}), + MY_WITH_MERGED(tr("My with Merged"), new ListRole[] {MY_ENTRIES, MERGED_ENTRIES}), /** * compare their version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with the merged veresion */ - THEIR_WITH_MERGED(tr("Their with Merged"), new ListRole[] {THEIR_ENTRIES, MERGED_ENTRIES}); + THEIR_WITH_MERGED(tr("Their with Merged"), new ListRole[] {THEIR_ENTRIES, MERGED_ENTRIES}); /** the localized display name */ Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 10378) @@ -48,5 +48,5 @@ * */ -public class ConflictResolver extends JPanel implements PropertyChangeListener { +public class ConflictResolver extends JPanel implements PropertyChangeListener { /* -------------------------------------------------------------------------------------- */ @@ -320,7 +320,7 @@ this.resolvedCompletely = tagMerger.getModel().isResolvedCompletely() - && propertiesMerger.getModel().isResolvedCompletely() + && propertiesMerger.getModel().isResolvedCompletely() && nodeListMerger.getModel().isFrozen(); - } else if (my instanceof Relation) { + } else if (my instanceof Relation) { // resolve the version conflict if this is a relation, all tag // conflicts and all conflicts in the member list @@ -329,5 +329,5 @@ this.resolvedCompletely = tagMerger.getModel().isResolvedCompletely() - && propertiesMerger.getModel().isResolvedCompletely() + && propertiesMerger.getModel().isResolvedCompletely() && relationMemberMerger.getModel().isFrozen(); } Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 10378) @@ -199,5 +199,5 @@ myEntriesSelectionModel = new EntriesSelectionModel(entries.get(MY_ENTRIES)); theirEntriesSelectionModel = new EntriesSelectionModel(entries.get(THEIR_ENTRIES)); - mergedEntriesSelectionModel = new EntriesSelectionModel(entries.get(MERGED_ENTRIES)); + mergedEntriesSelectionModel = new EntriesSelectionModel(entries.get(MERGED_ENTRIES)); listeners = new HashSet<>(); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 10378) @@ -783,5 +783,5 @@ * */ - private final class FreezeAction extends AbstractAction implements ItemListener, FreezeActionProperties { + private final class FreezeAction extends AbstractAction implements ItemListener, FreezeActionProperties { private FreezeAction() { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (revision 10378) @@ -25,5 +25,5 @@ @Override protected JScrollPane buildMyElementsTable() { - myEntriesTable = new NodeListTable( + myEntriesTable = new NodeListTable( "table.mynodes", model, @@ -36,5 +36,5 @@ @Override protected JScrollPane buildMergedElementsTable() { - mergedEntriesTable = new NodeListTable( + mergedEntriesTable = new NodeListTable( "table.mergednodes", model, @@ -47,5 +47,5 @@ @Override protected JScrollPane buildTheirElementsTable() { - theirEntriesTable = new NodeListTable( + theirEntriesTable = new NodeListTable( "table.theirnodes", model, Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (revision 10378) @@ -137,5 +137,5 @@ } - myDeletedState = conflict.isMyDeleted() || my.isDeleted(); + myDeletedState = conflict.isMyDeleted() || my.isDeleted(); theirDeletedState = their.isDeleted(); @@ -211,5 +211,5 @@ * @return The state of deleted flag */ - public Boolean getTheirDeletedState() { + public Boolean getTheirDeletedState() { return theirDeletedState; } Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java (revision 10378) @@ -25,5 +25,5 @@ @Override protected JScrollPane buildMyElementsTable() { - myEntriesTable = new RelationMemberTable( + myEntriesTable = new RelationMemberTable( "table.mymembers", model, @@ -36,5 +36,5 @@ @Override protected JScrollPane buildMergedElementsTable() { - mergedEntriesTable = new RelationMemberTable( + mergedEntriesTable = new RelationMemberTable( "table.mergedmembers", model, @@ -48,5 +48,5 @@ @Override protected JScrollPane buildTheirElementsTable() { - theirEntriesTable = new RelationMemberTable( + theirEntriesTable = new RelationMemberTable( "table.theirmembers", model, Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (revision 10378) @@ -22,5 +22,5 @@ * */ -public class RelationMemberTableCellRenderer extends JLabel implements TableCellRenderer { +public class RelationMemberTableCellRenderer extends JLabel implements TableCellRenderer { private final transient Border rowNumberBorder; @@ -101,5 +101,5 @@ * @param row the row index */ - protected void renderRowId(int row) { + protected void renderRowId(int row) { setBorder(rowNumberBorder); setText(Integer.toString(row+1)); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java (revision 10378) @@ -32,5 +32,5 @@ public TagMergeItem(String key, String myTagValue, String theirTagValue) { CheckParameterUtil.ensureParameterNotNull(key, "key"); - this.key = key; + this.key = key; this.myTagValue = myTagValue; this.theirTagValue = theirTagValue; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 10378) @@ -386,5 +386,5 @@ * */ - class UndecideAction extends AbstractAction implements ListSelectionListener { + class UndecideAction extends AbstractAction implements ListSelectionListener { UndecideAction() { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 10378) @@ -43,5 +43,5 @@ import org.openstreetmap.josm.tools.WindowGeometry; -public class PasteTagsConflictResolverDialog extends JDialog implements PropertyChangeListener { +public class PasteTagsConflictResolverDialog extends JDialog implements PropertyChangeListener { static final Map PANE_TITLES; static { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java (revision 10378) @@ -27,5 +27,5 @@ tr("Position {0} is out of range. Current number of members is {1}.", pos, relation.getMembersCount())); this.relation = relation; - this.pos = pos; + this.pos = pos; this.originalPrimitive = member.getMember(); this.role = member.hasRole() ? member.getRole() : ""; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 10378) @@ -234,5 +234,5 @@ */ public void refreshView() { - OsmDataLayer editLayer = Main.main.getEditLayer(); + OsmDataLayer editLayer = Main.main.getEditLayer(); conflicts = editLayer == null ? new ConflictCollection() : editLayer.getConflicts(); GuiHelper.runInEDT(new Runnable() { @@ -433,5 +433,5 @@ ResolveAction() { putValue(NAME, tr("Resolve")); - putValue(SHORT_DESCRIPTION, tr("Open a merge dialog of all selected items in the list above.")); + putValue(SHORT_DESCRIPTION, tr("Open a merge dialog of all selected items in the list above.")); new ImageProvider("dialogs", "conflict").getResource().attachImageIcon(this, true); putValue("help", ht("/Dialog/ConflictList#ResolveAction")); @@ -480,5 +480,5 @@ this.type = type; putValue(NAME, name); - putValue(SHORT_DESCRIPTION, description); + putValue(SHORT_DESCRIPTION, description); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java (revision 10378) @@ -162,5 +162,5 @@ if (visible) { new WindowGeometry( - getClass().getName() + ".geometry", + getClass().getName() + ".geometry", WindowGeometry.centerInWindow( Main.parent, Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (revision 10378) @@ -140,5 +140,5 @@ { putValue(NAME, tr("Add")); - putValue(SHORT_DESCRIPTION, tr("Add filter.")); + putValue(SHORT_DESCRIPTION, tr("Add filter.")); new ImageProvider("dialogs", "add").getResource().attachImageIcon(this, true); } @@ -410,5 +410,5 @@ } - private class EnableFilterAction extends AbstractFilterAction { + private class EnableFilterAction extends AbstractFilterAction { EnableFilterAction() { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 10378) @@ -299,5 +299,5 @@ } - private JosmTextField setupFilter() { + private JosmTextField setupFilter() { final JosmTextField f = new DisableShortcutsOnFocusGainedTextField(); f.setToolTipText(tr("Relation list filter")); @@ -411,5 +411,5 @@ public void setRelations(Collection relations) { - List sel = getSelectedRelations(); + List sel = getSelectedRelations(); this.relations.clear(); this.filteredRelations = null; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 10378) @@ -88,5 +88,5 @@ * @since 8 */ -public class SelectionListDialog extends ToggleDialog { +public class SelectionListDialog extends ToggleDialog { private JList lstPrimitives; private final DefaultListSelectionModel selectionModel = new DefaultListSelectionModel(); @@ -298,5 +298,5 @@ SearchAction() { putValue(NAME, tr("Search")); - putValue(SHORT_DESCRIPTION, tr("Search for objects")); + putValue(SHORT_DESCRIPTION, tr("Search for objects")); new ImageProvider("dialogs", "search").getResource().attachImageIcon(this, true); updateEnabledState(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 10378) @@ -163,5 +163,5 @@ protected JCheckBoxMenuItem windowMenuItem; - private final JRadioButtonMenuItem alwaysShown = new JRadioButtonMenuItem(new AbstractAction(tr("Always shown")) { + private final JRadioButtonMenuItem alwaysShown = new JRadioButtonMenuItem(new AbstractAction(tr("Always shown")) { @Override public void actionPerformed(ActionEvent e) { @@ -170,5 +170,5 @@ }); - private final JRadioButtonMenuItem dynamic = new JRadioButtonMenuItem(new AbstractAction(tr("Dynamic")) { + private final JRadioButtonMenuItem dynamic = new JRadioButtonMenuItem(new AbstractAction(tr("Dynamic")) { @Override public void actionPerformed(ActionEvent e) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 10378) @@ -316,5 +316,5 @@ if (primitives != null) { for (Map.Entry entry: statistics.entrySet()) { - data.add(new UserInfo(entry.getKey(), entry.getValue(), (double) entry.getValue() / (double) primitives.size())); + data.add(new UserInfo(entry.getKey(), entry.getValue(), (double) entry.getValue() / (double) primitives.size())); } } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 10378) @@ -140,5 +140,5 @@ { putValue(NAME, tr("Fix")); - putValue(SHORT_DESCRIPTION, tr("Fix the selected issue.")); + putValue(SHORT_DESCRIPTION, tr("Fix the selected issue.")); new ImageProvider("dialogs", "fix").getResource().attachImageIcon(this, true); } @@ -155,5 +155,5 @@ { putValue(NAME, tr("Ignore")); - putValue(SHORT_DESCRIPTION, tr("Ignore the selected issue next time.")); + putValue(SHORT_DESCRIPTION, tr("Ignore the selected issue next time.")); new ImageProvider("dialogs", "fix").getResource().attachImageIcon(this, true); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (revision 10378) @@ -71,8 +71,10 @@ public class ChangesetCacheManager extends JFrame { + // CHECKSTYLE.OFF: SingleSpaceSeparator /** The changeset download icon **/ public static final ImageIcon DOWNLOAD_CONTENT_ICON = ImageProvider.get("dialogs/changeset", "downloadchangesetcontent"); /** The changeset update icon **/ public static final ImageIcon UPDATE_CONTENT_ICON = ImageProvider.get("dialogs/changeset", "updatechangesetcontent"); + // CHECKSTYLE.ON: SingleSpaceSeparator /** the unique instance of the cache manager */ @@ -164,5 +166,5 @@ protected JPanel buildChangesetDetailPanel() { JPanel pnl = new JPanel(new BorderLayout()); - JTabbedPane tp = new JTabbedPane(); + JTabbedPane tp = new JTabbedPane(); pnlChangesetDetailTabs = tp; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java (revision 10378) @@ -52,4 +52,5 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener, ChangesetAware { + // CHECKSTYLE.OFF: SingleSpaceSeparator private final JosmTextField tfID = new JosmTextField(10); private final JosmTextArea taComment = new JosmTextArea(5, 40); @@ -64,4 +65,5 @@ private final SelectInCurrentLayerAction actSelectInCurrentLayer = new SelectInCurrentLayerAction(); private final ZoomInCurrentLayerAction actZoomInCurrentLayerAction = new ZoomInCurrentLayerAction(); + // CHECKSTYLE.ON: SingleSpaceSeparator private transient Changeset currentChangeset; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java (revision 10378) @@ -92,5 +92,5 @@ if (id == 0) return; - ChangesetContentDownloadTask task = new ChangesetContentDownloadTask( + ChangesetContentDownloadTask task = new ChangesetContentDownloadTask( SingleChangesetDownloadPanel.this, Collections.singleton(id) Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 10378) @@ -66,5 +66,5 @@ protected JPanel buildQueryPanel() { ItemListener stateChangeHandler = new RestrictionGroupStateChangeHandler(); - JPanel pnl = new VerticallyScrollablePanel(new GridBagLayout()); + JPanel pnl = new VerticallyScrollablePanel(new GridBagLayout()); pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); GridBagConstraints gc = new GridBagConstraints(); @@ -449,5 +449,5 @@ gc.gridx = 1; - gc.fill = GridBagConstraints.HORIZONTAL; + gc.fill = GridBagConstraints.HORIZONTAL; gc.weightx = 1.0; add(lblRestrictedToMyself, gc); @@ -461,5 +461,5 @@ gc.gridx = 1; - gc.fill = GridBagConstraints.HORIZONTAL; + gc.fill = GridBagConstraints.HORIZONTAL; gc.weightx = 1.0; add(new JMultilineLabel(tr("Only changesets owned by the user with the following user ID")), gc); @@ -467,5 +467,5 @@ gc.gridx = 1; gc.gridy = 2; - gc.fill = GridBagConstraints.HORIZONTAL; + gc.fill = GridBagConstraints.HORIZONTAL; gc.weightx = 1.0; add(buildUidInputPanel(), gc); @@ -530,5 +530,5 @@ tr("Cannot restrict changeset query to the current user because the current user is anonymous")); } else if (rbRestrictToUid.isSelected()) { - int uid = valUid.getUid(); + int uid = valUid.getUid(); if (uid > 0) { query.forUser(uid); @@ -985,5 +985,5 @@ @Override public void validate() { - String value = getComponent().getText(); + String value = getComponent().getText(); if (value == null || value.trim().isEmpty()) { feedbackInvalid(""); @@ -1004,5 +1004,5 @@ public int getUid() { - String value = getComponent().getText(); + String value = getComponent().getText(); if (value == null || value.trim().isEmpty()) return 0; try { @@ -1043,5 +1043,5 @@ public String getStandardTooltipText() { Date date = new Date(); - return tr( + return tr( "Please enter a date in the usual format for your locale.
" + "Example: {0}
" Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (revision 10378) @@ -188,5 +188,5 @@ public void restoreFromPreferences() { BasicQuery q; - String value = Main.pref.get("changeset-query.basic.query", null); + String value = Main.pref.get("changeset-query.basic.query", null); if (value == null) { q = BasicQuery.MOST_RECENT_CHANGESETS; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (revision 10378) @@ -46,5 +46,5 @@ gc.weightx = 0.0; gc.fill = GridBagConstraints.HORIZONTAL; - gc.insets = new Insets(0, 0, 0, 5); + gc.insets = new Insets(0, 0, 0, 5); pnl.add(new JLabel(tr("URL: ")), gc); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeAction.java (revision 10378) @@ -87,5 +87,5 @@ if (model.getSelectedLayers().isEmpty()) { setEnabled(false); - } else if (model.getSelectedLayers().size() > 1) { + } else if (model.getSelectedLayers().size() > 1) { setEnabled(supportLayers(model.getSelectedLayers())); } else { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MoveUpAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MoveUpAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MoveUpAction.java (revision 10378) @@ -14,5 +14,5 @@ * The action to move up the currently selected entries in the list. */ -public class MoveUpAction extends AbstractAction implements IEnabledStateUpdating { +public class MoveUpAction extends AbstractAction implements IEnabledStateUpdating { private final LayerListModel model; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 10378) @@ -383,5 +383,5 @@ @Override public Component getListCellRendererComponent(JList list, - AutoCompletionListItem value, int index, boolean isSelected, boolean cellHasFocus) { + AutoCompletionListItem value, int index, boolean isSelected, boolean cellHasFocus) { Component c = def.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); if (c instanceof JLabel) { @@ -602,5 +602,5 @@ } - public void selectValuesCombobox() { + public void selectValuesCombobox() { selectACComboBoxSavingUnixBuffer(values); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 10378) @@ -159,5 +159,5 @@ */ protected Dialog getParentDialog() { - Component c = this; + Component c = this; while (c != null && !(c instanceof Dialog)) { c = c.getParent(); @@ -389,5 +389,5 @@ if (!visitor.getConflicts().isEmpty()) { getLayer().getConflicts().add(visitor.getConflicts()); - conflictsCount += visitor.getConflicts().size(); + conflictsCount += visitor.getConflicts().size(); } } @@ -453,5 +453,5 @@ if (!visitor.getConflicts().isEmpty()) { getLayer().getConflicts().add(visitor.getConflicts()); - conflictsCount += visitor.getConflicts().size(); + conflictsCount += visitor.getConflicts().size(); } } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 10378) @@ -106,5 +106,5 @@ * @since 343 */ -public class GenericRelationEditor extends RelationEditor { +public class GenericRelationEditor extends RelationEditor { /** the tag table and its model */ private final TagEditorPanel tagEditorPanel; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (revision 10378) @@ -126,6 +126,6 @@ y1 = 7; - int[] xValues = {xoff - xowloop + 1, xoff - xowloop + 1, xoff}; - int[] yValues = {ymax, y1+1, 1}; + int[] xValues = {xoff - xowloop + 1, xoff - xowloop + 1, xoff}; + int[] yValues = {ymax, y1+1, 1}; g.drawPolyline(xValues, yValues, 3); unsetDotted(g); @@ -137,6 +137,6 @@ y2 = ymax - 7; - int[] xValues = {xoff+1, xoff - xowloop + 1, xoff - xowloop + 1}; - int[] yValues = {ymax-1, y2, y1}; + int[] xValues = {xoff+1, xoff - xowloop + 1, xoff - xowloop + 1}; + int[] yValues = {ymax-1, y2, y1}; g.drawPolyline(xValues, yValues, 3); unsetDotted(g); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 10378) @@ -180,5 +180,5 @@ @Override public void mouseClicked(MouseEvent e) { - if (e.getClickCount() == 2) { + if (e.getClickCount() == 2) { editAction.run(); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 10378) @@ -88,5 +88,5 @@ @Override public void treeWillExpand(TreeExpansionEvent event) throws ExpandVetoException { - TreePath path = event.getPath(); + TreePath path = event.getPath(); Relation parent = (Relation) event.getPath().getLastPathComponent(); if (!parent.isIncomplete() || parent.isNew()) Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java (revision 10378) @@ -12,5 +12,5 @@ * @since 1790 */ -public class SelectionTableColumnModel extends DefaultTableColumnModel { +public class SelectionTableColumnModel extends DefaultTableColumnModel { /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (revision 10378) @@ -74,5 +74,5 @@ @Override public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) { - if (e.getPreviousActiveLayer() == layer) { + if (e.getPreviousActiveLayer() == layer) { cache.clear(); } Index: /trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 10378) @@ -81,5 +81,5 @@ JPanel pnl = new JPanel(new GridBagLayout()); - GridBagConstraints gc = new GridBagConstraints(); + GridBagConstraints gc = new GridBagConstraints(); gc.anchor = GridBagConstraints.NORTHWEST; gc.insets = new Insets(5, 5, 5, 5); Index: /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 10378) @@ -307,5 +307,5 @@ protected void refreshBounds() { - Bounds b = build(); + Bounds b = build(); parent.boundingBoxChanged(b, BoundingBoxSelection.this); } Index: /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 10378) @@ -54,5 +54,5 @@ * Dialog displayed to download OSM and/or GPS data from OSM server. */ -public class DownloadDialog extends JDialog { +public class DownloadDialog extends JDialog { /** the unique instance of the download dialog */ private static DownloadDialog instance; @@ -169,8 +169,8 @@ pnl.add(cbStartup, GBC.std().anchor(GBC.WEST).insets(15, 5, 5, 5)); - pnl.add(sizeCheck, GBC.eol().anchor(GBC.EAST).insets(5, 5, 5, 2)); + pnl.add(sizeCheck, GBC.eol().anchor(GBC.EAST).insets(5, 5, 5, 2)); if (!ExpertToggleAction.isExpert()) { - JLabel infoLabel = new JLabel( + JLabel infoLabel = new JLabel( tr("Use left click&drag to select area, arrows or right mouse button to scroll map, wheel or +/- to zoom.")); pnl.add(infoLabel, GBC.eol().anchor(GBC.SOUTH).insets(0, 0, 0, 0)); Index: /trunk/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java (revision 10378) @@ -24,7 +24,9 @@ public class DownloadObjectDialog extends OsmIdSelectionDialog { + // CHECKSTYLE.OFF: SingleSpaceSeparator protected final JCheckBox referrers = new JCheckBox(tr("Download referrers (parent relations)")); protected final JCheckBox fullRel = new JCheckBox(tr("Download relation members")); protected final JCheckBox newLayer = new JCheckBox(tr("Separate Layer")); + // CHECKSTYLE.ON: SingleSpaceSeparator /** Index: /trunk/src/org/openstreetmap/josm/gui/download/DownloadSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/DownloadSelection.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/download/DownloadSelection.java (revision 10378) @@ -4,5 +4,5 @@ import org.openstreetmap.josm.data.Bounds; -public interface DownloadSelection { +public interface DownloadSelection { /** Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 10378) @@ -306,5 +306,5 @@ if (reference.getId() != history.getId()) throw new IllegalArgumentException( - tr("Failed to set reference. Reference ID {0} does not match history ID {1}.", reference.getId(), history.getId())); + tr("Failed to set reference. Reference ID {0} does not match history ID {1}.", reference.getId(), history.getId())); HistoryOsmPrimitive primitive = history.getByVersion(reference.getVersion()); if (primitive == null) @@ -337,5 +337,5 @@ if (current.getId() != history.getId()) throw new IllegalArgumentException( - tr("Failed to set reference. Reference ID {0} does not match history ID {1}.", current.getId(), history.getId())); + tr("Failed to set reference. Reference ID {0} does not match history ID {1}.", current.getId(), history.getId())); HistoryOsmPrimitive primitive = history.getByVersion(current.getVersion()); if (primitive == null) @@ -374,5 +374,5 @@ * @throws IllegalArgumentException if type is null */ - public HistoryOsmPrimitive getPointInTime(PointInTimeType type) { + public HistoryOsmPrimitive getPointInTime(PointInTimeType type) { CheckParameterUtil.ensureParameterNotNull(type, "type"); if (type.equals(PointInTimeType.CURRENT_POINT_IN_TIME)) Index: /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 10378) @@ -194,5 +194,5 @@ protected static String getUserUrl(String username) { - return Main.getBaseUserUrl() + '/' + Utils.encodeUrl(username).replaceAll("\\+", "%20"); + return Main.getBaseUserUrl() + '/' + Utils.encodeUrl(username).replaceAll("\\+", "%20"); } Index: /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java (revision 10378) @@ -115,7 +115,9 @@ String lbl; switch(primitiveType) { - case NODE: lbl = tr("Synchronize node {0} only", id); break; - case WAY: lbl = tr("Synchronize way {0} only", id); break; - case RELATION: lbl = tr("Synchronize relation {0} only", id); break; + // CHECKSTYLE.OFF: SingleSpaceSeparator + case NODE: lbl = tr("Synchronize node {0} only", id); break; + case WAY: lbl = tr("Synchronize way {0} only", id); break; + case RELATION: lbl = tr("Synchronize relation {0} only", id); break; + // CHECKSTYLE.ON: SingleSpaceSeparator default: throw new AssertionError(); } @@ -140,5 +142,5 @@ ) }; - String msg = tr("Uploading failed because the server has a newer version of one
" + String msg = tr("Uploading failed because the server has a newer version of one
" + "of your nodes, ways, or relations.
" + "The conflict is caused by the {0} with id {1},
" @@ -188,5 +190,5 @@ ) }; - String msg = tr("Uploading failed because the server has a newer version of one
" + String msg = tr("Uploading failed because the server has a newer version of one
" + "of your nodes, ways, or relations.
" + "
" @@ -217,5 +219,5 @@ */ protected void handleUploadConflictForClosedChangeset(long changesetId, Date d) { - String msg = tr("Uploading failed because you have been using
" + String msg = tr("Uploading failed because you have been using
" + "changeset {0} which was already closed at {1}.
" + "Please upload again with a new or an existing open changeset.", Index: /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 10378) @@ -184,5 +184,5 @@ */ public void setSelectedChangesetForNextUpload(Changeset cs) { - int idx = model.getIndexOf(cs); + int idx = model.getIndexOf(cs); if (idx >= 0) { rbExisting.setSelected(true); Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java (revision 10378) @@ -41,5 +41,5 @@ monitor = NullProgressMonitor.INSTANCE; } - this.layerInfo = layerInfo; + this.layerInfo = layerInfo; this.parentMonitor = monitor; } Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 10378) @@ -324,5 +324,5 @@ } - class DiscardAndProceedAction extends AbstractAction implements PropertyChangeListener { + class DiscardAndProceedAction extends AbstractAction implements PropertyChangeListener { DiscardAndProceedAction() { initForDiscardAndExit(); @@ -414,7 +414,9 @@ BufferedImage newIco = new BufferedImage(ICON_SIZE*3, ICON_SIZE, BufferedImage.TYPE_4BYTE_ABGR); Graphics2D g = newIco.createGraphics(); + // CHECKSTYLE.OFF: SingleSpaceSeparator g.drawImage(model.getLayersToUpload().isEmpty() ? upldDis : upld, ICON_SIZE*0, 0, ICON_SIZE, ICON_SIZE, null); g.drawImage(model.getLayersToSave().isEmpty() ? saveDis : save, ICON_SIZE*1, 0, ICON_SIZE, ICON_SIZE, null); g.drawImage(base, ICON_SIZE*2, 0, ICON_SIZE, ICON_SIZE, null); + // CHECKSTYLE.ON: SingleSpaceSeparator putValue(SMALL_ICON, new ImageIcon(newIco)); } Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 10378) @@ -220,5 +220,5 @@ // partially uploaded. Better run on EDT. // - Runnable r = new Runnable() { + Runnable r = new Runnable() { @Override public void run() { Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 10378) @@ -154,5 +154,5 @@ public List getSelectedPrimitives() { - List ret = new ArrayList<>(); + List ret = new ArrayList<>(); ret.addAll(lstSelectedPrimitives.getOsmPrimitiveListModel().getPrimitives(lstSelectedPrimitives.getSelectedIndices())); ret.addAll(lstDeletedPrimitives.getOsmPrimitiveListModel().getPrimitives(lstDeletedPrimitives.getSelectedIndices())); Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java (revision 10378) @@ -15,5 +15,5 @@ * */ -public class UploadStrategySpecification { +public class UploadStrategySpecification { /** indicates that the chunk size isn't specified */ public static final int UNSPECIFIED_CHUNK_SIZE = -1; Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (revision 10378) @@ -134,5 +134,5 @@ * @return the number of objects to upload */ - public int getNumObjectsToUpload() { + public int getNumObjectsToUpload() { return lstAdd.getModel().getSize() + lstUpdate.getModel().getSize() Index: /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 10378) @@ -1529,5 +1529,5 @@ } Tile t2 = tempCornerTile(missed); - LatLon topLeft2 = new LatLon(tileSource.tileXYToLatLon(missed)); + LatLon topLeft2 = new LatLon(tileSource.tileXYToLatLon(missed)); LatLon botRight2 = new LatLon(tileSource.tileXYToLatLon(t2)); TileSet ts2 = new TileSet(topLeft2, botRight2, newzoom); @@ -1622,5 +1622,5 @@ continue; } - clickedTile = t1; + clickedTile = t1; break; } Index: /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (revision 10378) @@ -338,5 +338,5 @@ private static float[] KERNEL_SHARPEN = new float[] { -.5f, -1f, -.5f, - -1f, 7, -1f, + -1f, 7, -1f, -.5f, -1f, -.5f }; @@ -531,5 +531,5 @@ private byte mix(int color, double luminosity) { - int val = (int) (colorfulness * color + (1 - colorfulness) * luminosity); + int val = (int) (colorfulness * color + (1 - colorfulness) * luminosity); if (val < 0) { return 0; Index: /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (revision 10378) @@ -175,5 +175,5 @@ memoryBytesRequired += layer.estimateMemoryUsage(); } - if (memoryBytesRequired > Runtime.getRuntime().maxMemory()) { + if (memoryBytesRequired > Runtime.getRuntime().maxMemory()) { throw new IllegalArgumentException( tr("To add another layer you need to allocate at least {0,number,#}MB memory to JOSM using -Xmx{0,number,#}M " @@ -336,5 +336,5 @@ public void setVisible(boolean visible) { boolean oldValue = isVisible(); - this.visible = visible; + this.visible = visible; if (visible && opacity == 0) { setOpacity(1); Index: /trunk/src/org/openstreetmap/josm/gui/layer/NativeScaleLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/NativeScaleLayer.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/layer/NativeScaleLayer.java (revision 10378) @@ -80,5 +80,5 @@ * List of scales, may include intermediate steps between native resolutions */ - class ScaleList { + class ScaleList { private final List scales = new ArrayList<>(); Index: /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 10378) @@ -36,5 +36,5 @@ */ public class WMSLayer extends AbstractCachedTileSourceLayer { - private static final String PREFERENCE_PREFIX = "imagery.wms."; + private static final String PREFERENCE_PREFIX = "imagery.wms."; /** default tile size for WMS Layer */ @@ -108,5 +108,5 @@ return supportedProjections == null || supportedProjections.isEmpty() || supportedProjections.contains(proj.toCode()) || (info.isEpsg4326To3857Supported() && supportedProjections.contains("EPSG:4326") - && "EPSG:3857".equals(Main.getProjection().toCode())); + && "EPSG:3857".equals(Main.getProjection().toCode())); } @@ -170,5 +170,5 @@ private boolean isReprojectionPossible() { - return supportedProjections.contains("EPSG:4326") && "EPSG:3857".equals(Main.getProjection().toCode()); + return supportedProjections.contains("EPSG:4326") && "EPSG:3857".equals(Main.getProjection().toCode()); } } Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 10378) @@ -764,5 +764,5 @@ private final transient StatusBarUpdater statusBarUpdaterWithRepaint = new StatusBarUpdater(true); - private class StatusBarUpdater implements DocumentListener, ItemListener, ActionListener { + private class StatusBarUpdater implements DocumentListener, ItemListener, ActionListener { private final boolean doRepaint; Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java (revision 10378) @@ -25,5 +25,5 @@ private final DateEditorWithSlider dateFrom = new DateEditorWithSlider(tr("From")); private final DateEditorWithSlider dateTo = new DateEditorWithSlider(tr("To")); - private final JCheckBox noTimestampCb = new JCheckBox(tr("No timestamp")); + private final JCheckBox noTimestampCb = new JCheckBox(tr("No timestamp")); private final transient GpxLayer layer; @@ -77,5 +77,5 @@ private final Timer t = new Timer(200, new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { applyFilter(); } Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 10378) @@ -156,5 +156,5 @@ if (!mousePressedInButton) return; - mousePressed = true; + mousePressed = true; if (isVisible()) { invalidate(); Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (revision 10378) @@ -197,5 +197,5 @@ for (OsmPrimitive referrer : osm.getReferrers()) { Relation r = (Relation) referrer; - if (!drawMultipolygon || !r.isMultipolygon() || !r.isUsable()) { + if (!drawMultipolygon || !r.isMultipolygon() || !r.isUsable()) { continue; } Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java (revision 10378) @@ -91,5 +91,5 @@ BasicStroke myLine = line, myDashLine = dashesLine; if (realWidth > 0 && paintSettings.isUseRealWidth() && !showOrientation) { - float myWidth = (int) (100 / (float) (painter.getCircum() / realWidth)); + float myWidth = (int) (100 / (float) (painter.getCircum() / realWidth)); if (myWidth < line.getLineWidth()) { myWidth = line.getLineWidth(); Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java (revision 10378) @@ -211,5 +211,5 @@ private boolean mustRescale(Image image) { - return autoRescale && width == -1 && image.getWidth(null) > MAX_SIZE + return autoRescale && width == -1 && image.getWidth(null) > MAX_SIZE && height == -1 && image.getHeight(null) > MAX_SIZE; } Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java (revision 10378) @@ -60,5 +60,5 @@ return false; final Symbol other = (Symbol) obj; - return symbol == other.symbol && + return symbol == other.symbol && size == other.size && Objects.equals(stroke, other.stroke) && Index: /trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java (revision 10378) @@ -90,5 +90,5 @@ * @return the retrieved Access Token */ - public OAuthToken getAccessToken() { + public OAuthToken getAccessToken() { return accessToken; } Index: /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 10378) @@ -128,10 +128,10 @@ // OAuth in a nutshell ... - gc.gridy = 1; + gc.gridy = 1; gc.insets = new Insets(5, 0, 0, 5); HtmlPanel pnlMessage = new HtmlPanel(); pnlMessage.setText("" + tr("With OAuth you grant JOSM the right to upload map data and GPS tracks " - + "on your behalf (more info...).", "http://oauth.net/") + + "on your behalf (more info...).", "http://oauth.net/") + "" ); @@ -140,5 +140,5 @@ // the authorisation procedure - gc.gridy = 2; + gc.gridy = 2; gc.gridwidth = 1; gc.weightx = 0.0; Index: /trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 10378) @@ -362,5 +362,5 @@ } catch (IOException e) { throw new OsmOAuthAuthorizationException(e); - } finally { + } finally { synchronized (this) { connection = null; Index: /trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java (revision 10378) @@ -400,5 +400,5 @@ ); executor.execute(task); - Runnable r = new Runnable() { + Runnable r = new Runnable() { @Override public void run() { @@ -437,5 +437,5 @@ ); executor.execute(task); - Runnable r = new Runnable() { + Runnable r = new Runnable() { @Override public void run() { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 10378) @@ -545,5 +545,5 @@ @SuppressWarnings("unchecked") - public T getSetting(Class clazz) { + public T getSetting(Class clazz) { for (PreferenceSetting setting:settings) { if (clazz.isAssignableFrom(setting.getClass())) Index: /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 10378) @@ -398,5 +398,5 @@ } - private class ToolbarPopupMenu extends JPopupMenu { + private class ToolbarPopupMenu extends JPopupMenu { private transient ActionDefinition act; @@ -1137,5 +1137,5 @@ long paramCode = 0; if (action.hasParameters()) { - paramCode = action.parameters.hashCode(); + paramCode = action.parameters.hashCode(); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 10378) @@ -60,5 +60,5 @@ private final JRadioButton colorTypeTime = new JRadioButton(tr("Track date")); private final JRadioButton colorTypeNone = new JRadioButton(tr("Single Color (can be customized for named layers)")); - private final JRadioButton colorTypeGlobal = new JRadioButton(tr("Use global settings")); + private final JRadioButton colorTypeGlobal = new JRadioButton(tr("Use global settings")); private final JosmComboBox colorTypeVelocityTune = new JosmComboBox<>(new String[] {tr("Car"), tr("Bicycle"), tr("Foot")}); private final JCheckBox makeAutoMarkers = new JCheckBox(tr("Create markers when reading GPX")); @@ -359,9 +359,9 @@ int colorType = Main.pref.getInteger("draw.rawgps.colors", layerName, 0); switch (colorType) { - case 0: colorTypeNone.setSelected(true); break; - case 1: colorTypeVelocity.setSelected(true); break; - case 2: colorTypeDilution.setSelected(true); break; + case 0: colorTypeNone.setSelected(true); break; + case 1: colorTypeVelocity.setSelected(true); break; + case 2: colorTypeDilution.setSelected(true); break; case 3: colorTypeDirection.setSelected(true); break; - case 4: colorTypeTime.setSelected(true); break; + case 4: colorTypeTime.setSelected(true); break; default: Main.warn("Unknown color type: " + colorType); } @@ -397,5 +397,5 @@ } else { if (layerName == null || !locLayer) { - Main.pref.put("draw.rawgps.lines" + layerNameDot, drawRawGpsLinesAll.isSelected()); + Main.pref.put("draw.rawgps.lines" + layerNameDot, drawRawGpsLinesAll.isSelected()); Main.pref.put("draw.rawgps.max-line-length" + layerNameDot, drawRawGpsMaxLineLength.getText()); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 10378) @@ -101,5 +101,5 @@ errorMessage = tr("Tagging preset source {0} can be loaded but it contains errors. " + "Do you really want to use it?

Error is: {1}
", - source, e.getMessage()); + source, e.getMessage()); } else { errorMessage = tr("Unable to parse tagging preset source: {0}. " + @@ -127,5 +127,5 @@ sources.removeSources(sourcesToRemove); return true; - } else { + } else { return true; } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 10378) @@ -198,5 +198,5 @@ JPanel pnl = new JPanel(new BorderLayout()); pnl.add(buildSearchFieldPanel(), BorderLayout.NORTH); - model = new PluginPreferencesModel(); + model = new PluginPreferencesModel(); pnlPluginPreferences = new PluginListPanel(model); spPluginPreferences = GuiHelper.embedInVerticalScrollPane(pnlPluginPreferences); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java (revision 10378) @@ -147,5 +147,5 @@ } model.fireContentsChanged(); - int idx = filteredData.indexOf(lastCode); + int idx = filteredData.indexOf(lastCode); if (idx == -1) { selectionList.clearSelection(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java (revision 10378) @@ -15,5 +15,5 @@ */ public class OAuthAccessTokenHolder { - private static OAuthAccessTokenHolder instance; + private static OAuthAccessTokenHolder instance; /** Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 10378) @@ -85,5 +85,5 @@ gc.weightx = 1.0; gc.insets = new Insets(0, 0, 0, 0); - gc.gridwidth = 4; + gc.gridwidth = 4; add(buildDefaultServerUrlPanel(), gc); @@ -124,5 +124,5 @@ */ public void initFromPreferences() { - String url = OsmApi.getOsmApi().getServerUrl(); + String url = OsmApi.getOsmApi().getServerUrl(); tfOsmServerUrl.setPossibleItems(SERVER_URL_HISTORY.get()); if (OsmApi.DEFAULT_API_URL.equals(url.trim())) { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 10378) @@ -66,9 +66,9 @@ 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, + 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, + 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, + private static final String META = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.META_DOWN_MASK).getModifiers()); @@ -246,5 +246,5 @@ private JPanel buildFilterPanel() { // copied from PluginPreference - JPanel pnl = new JPanel(new GridBagLayout()); + JPanel pnl = new JPanel(new GridBagLayout()); pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); GridBagConstraints gc = new GridBagConstraints(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java (revision 10378) @@ -144,4 +144,5 @@ List def = new ArrayList<>(); + // CHECKSTYLE.OFF: SingleSpaceSeparator addDefault(def, "addresses", tr("Addresses"), tr("Checks for errors on addresses")); addDefault(def, "combinations", tr("Tag combinations"), tr("Checks for missing tag or suspicious combinations")); @@ -155,4 +156,5 @@ addDefault(def, "unnecessary", tr("Unnecessary tags"), tr("Checks for unnecessary tags")); addDefault(def, "wikipedia", tr("Wikipedia"), tr("Checks for wrong wikipedia tags")); + // CHECKSTYLE.ON: SingleSpaceSeparator return def; Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java (revision 10378) @@ -19,5 +19,5 @@ * */ -public class TagCellRenderer extends JLabel implements TableCellRenderer { +public class TagCellRenderer extends JLabel implements TableCellRenderer { private final Font fontStandard; private final Font fontItalic; @@ -54,5 +54,5 @@ } else if (tag.getValueCount() == 1) { setText(tag.getValues().get(0)); - } else if (tag.getValueCount() > 1) { + } else if (tag.getValueCount() > 1) { setText(tr("multiple")); setFont(fontItalic); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 10378) @@ -49,5 +49,5 @@ * @since 1762 */ -public class TagTable extends JosmTable { +public class TagTable extends JosmTable { /** the table cell editor used by this table */ private TagCellEditor editor; @@ -70,7 +70,6 @@ * last cell in the table * - * - */ - class SelectNextColumnCellAction extends AbstractAction { + */ + class SelectNextColumnCellAction extends AbstractAction { @Override public void actionPerformed(ActionEvent e) { @@ -116,7 +115,6 @@ * Action to be run when the user navigates to the previous cell in the table, * for instance by pressing Shift-TAB - * - */ - class SelectPreviousColumnCellAction extends AbstractAction { + */ + class SelectPreviousColumnCellAction extends AbstractAction { @Override Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java (revision 10378) @@ -33,5 +33,5 @@ * Indicates that this is a value from a selected object. */ - public static final AutoCompletionItemPriority IS_IN_SELECTION = new AutoCompletionItemPriority(false, false, true); + public static final AutoCompletionItemPriority IS_IN_SELECTION = new AutoCompletionItemPriority(false, false, true); /** Unknown priority. This is the lowest priority. */ Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java (revision 10378) @@ -20,5 +20,5 @@ /** the pritority of this item */ - private AutoCompletionItemPriority priority; + private AutoCompletionItemPriority priority; /** the value of this item */ private String value; Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java (revision 10378) @@ -357,5 +357,5 @@ public static Collection readAll(Collection sources, boolean validate, boolean displayErrMsg) { HashSetWithLast allPresets = new HashSetWithLast<>(); - for (String source : sources) { + for (String source : sources) { try { readAll(source, validate, allPresets); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java (revision 10378) @@ -62,5 +62,5 @@ private static final BooleanProperty SEARCH_IN_TAGS = new BooleanProperty("taggingpreset.dialog.search-in-tags", true); - private static final BooleanProperty ONLY_APPLICABLE = new BooleanProperty("taggingpreset.dialog.only-applicable-to-selection", true); + private static final BooleanProperty ONLY_APPLICABLE = new BooleanProperty("taggingpreset.dialog.only-applicable-to-selection", true); private final JCheckBox ckOnlyApplicable; Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java (revision 10378) @@ -80,5 +80,5 @@ } if (usage.unused()) { - if (auto_increment_selected != 0 && auto_increment != null) { + if (auto_increment_selected != 0 && auto_increment != null) { try { textField.setText(Integer.toString(Integer.parseInt( Index: /trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java (revision 10378) @@ -115,5 +115,5 @@ * @throws IllegalArgumentException if adjustable is null */ - public void adapt(final JCheckBox view, final Adjustable adjustable) { + public void adapt(final JCheckBox view, final Adjustable adjustable) { CheckParameterUtil.ensureParameterNotNull(adjustable, "adjustable"); CheckParameterUtil.ensureParameterNotNull(view, "view"); Index: /trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 10378) @@ -34,5 +34,5 @@ public abstract class AbstractTextComponentValidator implements ActionListener, FocusListener, DocumentListener, PropertyChangeListener { private static final Border ERROR_BORDER = BorderFactory.createLineBorder(Color.RED, 1); - private static final Color ERROR_BACKGROUND = new Color(255, 224, 224); + private static final Color ERROR_BACKGROUND = new Color(255, 224, 224); private JTextComponent tc; Index: /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (revision 10378) @@ -399,5 +399,5 @@ if (!splitChildren.hasNext()) { - double newWidth = Math.max(minSplitChildWidth, bounds.getMaxX() - x); + double newWidth = Math.max(minSplitChildWidth, bounds.getMaxX() - x); Rectangle newSplitChildBounds = boundsWithXandWidth(bounds, x, newWidth); layout2(splitChild, newSplitChildBounds); @@ -446,5 +446,5 @@ if (!splitChildren.hasNext()) { double oldHeight = splitChildBounds.getHeight(); - double newHeight = Math.max(minSplitChildHeight, bounds.getMaxY() - y); + double newHeight = Math.max(minSplitChildHeight, bounds.getMaxY() - y); Rectangle newSplitChildBounds = boundsWithYandHeight(bounds, y, newHeight); layout2(splitChild, newSplitChildBounds); Index: /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java (revision 10378) @@ -241,5 +241,5 @@ dragOffsetX = mx - initialDividerBounds.x; dragOffsetY = my - initialDividerBounds.y; - dragDivider = divider; + dragDivider = divider; Rectangle prevNodeBounds = prevNode.getBounds(); Rectangle nextNodeBounds = nextNode.getBounds(); @@ -336,5 +336,5 @@ MultiSplitLayout.Divider divider = getMultiSplitLayout().dividerAt(x, y); if (divider != null) { - cursorID = divider.isVertical() ? + cursorID = divider.isVertical() ? Cursor.E_RESIZE_CURSOR : Cursor.N_RESIZE_CURSOR; Index: /trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java (revision 10378) @@ -174,5 +174,5 @@ } - protected void addMenuEntry(JTextComponent component, String label, String actionName, String iconName) { + protected void addMenuEntry(JTextComponent component, String label, String actionName, String iconName) { Action action = component.getActionMap().get(actionName); if (action != null) { Index: /trunk/src/org/openstreetmap/josm/io/Capabilities.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/Capabilities.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/io/Capabilities.java (revision 10378) @@ -131,5 +131,5 @@ } } else { - if (!capabilities.containsKey(element)) { + if (!capabilities.containsKey(element)) { Map h = new HashMap<>(); capabilities.put(element, h); Index: /trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 10378) @@ -157,5 +157,5 @@ CheckParameterUtil.ensureParameterNotNull(min, "min"); CheckParameterUtil.ensureParameterNotNull(max, "max"); - this.bounds = new Bounds(min, max); + this.bounds = new Bounds(min, max); return this; } @@ -215,5 +215,5 @@ */ public ChangesetQuery beingOpen(boolean isOpen) { - this.open = isOpen; + this.open = isOpen; return this; } @@ -474,5 +474,5 @@ protected Map createMapFromQueryString(String query) { - Map queryParams = new HashMap<>(); + Map queryParams = new HashMap<>(); String[] keyValuePairs = query.split("&"); for (String keyValuePair: keyValuePairs) { Index: /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (revision 10378) @@ -97,5 +97,5 @@ return 0; } - if (port <= 0 || port > 65535) { + if (port <= 0 || port > 65535) { Main.error(tr("Illegal port number in preference ''{0}''. Got {1}.", property, port)); Main.error(tr("The proxy will not be used.")); Index: /trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java (revision 10378) @@ -32,5 +32,5 @@ import org.xml.sax.helpers.DefaultHandler; -public class DiffResultProcessor { +public class DiffResultProcessor { private static class DiffResultEntry { @@ -76,5 +76,5 @@ * */ - public void parse(String diffUploadResponse, ProgressMonitor progressMonitor) throws XmlParsingException { + public void parse(String diffUploadResponse, ProgressMonitor progressMonitor) throws XmlParsingException { if (progressMonitor == null) { progressMonitor = NullProgressMonitor.INSTANCE; @@ -168,5 +168,5 @@ case "way": case "relation": - PrimitiveId id = new SimplePrimitiveId( + PrimitiveId id = new SimplePrimitiveId( Long.parseLong(atts.getValue("old_id")), OsmPrimitiveType.fromApiTypeName(qName) Index: /trunk/src/org/openstreetmap/josm/io/GpxReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 10378) @@ -504,5 +504,5 @@ @Override - public void endDocument() throws SAXException { + public void endDocument() throws SAXException { if (!states.empty()) throw new SAXException(tr("Parse error: invalid document structure for GPX document.")); Index: /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 10378) @@ -314,7 +314,9 @@ final String baseUrl = getBaseUrl(); switch (type) { + // CHECKSTYLE.OFF: SingleSpaceSeparator case NODE: msg = tr("Fetching a package of nodes from ''{0}''", baseUrl); break; case WAY: msg = tr("Fetching a package of ways from ''{0}''", baseUrl); break; case RELATION: msg = tr("Fetching a package of relations from ''{0}''", baseUrl); break; + // CHECKSTYLE.ON: SingleSpaceSeparator default: throw new AssertionError(); } @@ -584,7 +586,9 @@ String msg; switch (type) { + // CHECKSTYLE.OFF: SingleSpaceSeparator case NODE: msg = tr("Fetching node with id {0} from ''{1}''", id, baseUrl); break; case WAY: msg = tr("Fetching way with id {0} from ''{1}''", id, baseUrl); break; case RELATION: msg = tr("Fetching relation with id {0} from ''{1}''", id, baseUrl); break; + // CHECKSTYLE.ON: SingleSpaceSeparator default: throw new AssertionError(); } Index: /trunk/src/org/openstreetmap/josm/io/NoteReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/NoteReader.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/io/NoteReader.java (revision 10378) @@ -194,5 +194,5 @@ @Override - public void endDocument() throws SAXException { + public void endDocument() throws SAXException { parsedNotes = notes; } Index: /trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 10378) @@ -133,5 +133,5 @@ * @throws IllegalArgumentException if serverUrl is null */ - protected OsmApi(String serverUrl) { + protected OsmApi(String serverUrl) { CheckParameterUtil.ensureParameterNotNull(serverUrl, "serverUrl"); this.serverUrl = serverUrl; Index: /trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java (revision 10378) @@ -44,5 +44,5 @@ } - protected void importData(InputStream in, final File associatedFile, ProgressMonitor progressMonitor) throws IllegalDataException { + protected void importData(InputStream in, final File associatedFile, ProgressMonitor progressMonitor) throws IllegalDataException { final DataSet dataSet = OsmChangeReader.parseDataSet(in, progressMonitor); final OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile); Index: /trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 10378) @@ -98,5 +98,5 @@ * @throws IllegalArgumentException if type is null */ - public OsmServerBackreferenceReader(long id, OsmPrimitiveType type, boolean readFull) { + public OsmServerBackreferenceReader(long id, OsmPrimitiveType type, boolean readFull) { this(id, type); this.readFull = readFull; @@ -202,5 +202,5 @@ } if (isReadFull()) { - Collection relationsToCheck = new ArrayList<>(ds.getRelations()); + Collection relationsToCheck = new ArrayList<>(ds.getRelations()); for (Relation relation: relationsToCheck) { if (!relation.isNew() && relation.hasIncompleteMembers()) { Index: /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (revision 10378) @@ -41,5 +41,5 @@ * @throws OsmTransferException if data transfer errors occur */ - protected InputStream getInputStream(String urlStr, ProgressMonitor progressMonitor) throws OsmTransferException { + protected InputStream getInputStream(String urlStr, ProgressMonitor progressMonitor) throws OsmTransferException { return getInputStream(urlStr, progressMonitor, null); } @@ -55,5 +55,5 @@ * @throws OsmTransferException if data transfer errors occur */ - protected InputStream getInputStream(String urlStr, ProgressMonitor progressMonitor, String reason) throws OsmTransferException { + protected InputStream getInputStream(String urlStr, ProgressMonitor progressMonitor, String reason) throws OsmTransferException { try { api.initialize(progressMonitor); Index: /trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java (revision 10378) @@ -20,5 +20,5 @@ if (requestorType == null) return null; - PasswordAuthentication credentials = lookup(requestorType, host); + PasswordAuthentication credentials = lookup(requestorType, host); final String username = (credentials == null || credentials.getUserName() == null) ? "" : credentials.getUserName(); final String password = (credentials == null || credentials.getPassword() == null) ? "" : String.valueOf(credentials.getPassword()); Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 10378) @@ -150,5 +150,5 @@ ExistingValues old = new ExistingValues(key); for (OsmPrimitive osm : sel) { - oldValue = osm.get(key); + oldValue = osm.get(key); if (oldValue != null) { old.addValue(oldValue); @@ -209,5 +209,5 @@ propertyTable.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.SHIFT_MASK), "shiftenter"); propertyTable.getActionMap().put("shiftenter", new AbstractAction() { - @Override public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { buttonAction(1, e); // add all tags on Shift-Enter } @@ -242,5 +242,5 @@ protected void buttonAction(int buttonIndex, ActionEvent evt) { // if layer all layers were closed, ignore all actions - if (Main.main.getCurrentDataSet() != null && buttonIndex != 2) { + if (Main.main.getCurrentDataSet() != null && buttonIndex != 2) { TableModel tm = propertyTable.getModel(); for (int i = 0; i < tm.getRowCount(); i++) { Index: /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 10378) @@ -368,5 +368,5 @@ + ""; togglePreferenceKey = "pluginmanager.version-based-update.policy"; - } else { + } else { long tim = System.currentTimeMillis(); long last = Main.pref.getLong("pluginmanager.lastupdate", 0); @@ -725,5 +725,5 @@ + "Delete from preferences?", plugin.name, plugin.className); } - } catch (RuntimeException e) { + } catch (RuntimeException e) { pluginLoadingExceptions.put(plugin.name, e); Main.error(e); Index: /trunk/src/org/openstreetmap/josm/tools/ColorScale.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/ColorScale.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/tools/ColorScale.java (revision 10378) @@ -37,8 +37,10 @@ public static ColorScale createCyclicScale(int count) { ColorScale sc = new ColorScale(); - // red yellow green blue red - int[] h = new int[] {0, 59, 127, 244, 360}; + // CHECKSTYLE.OFF: SingleSpaceSeparator + // red yellow green blue red + int[] h = new int[] {0, 59, 127, 244, 360}; int[] s = new int[] {100, 84, 99, 100}; int[] b = new int[] {90, 93, 74, 83}; + // CHECKSTYLE.ON: SingleSpaceSeparator sc.colors = new Color[count]; @@ -166,5 +168,5 @@ for (int i = 0; i <= intervalCount; i++) { g.setColor(colors[(int) (1.0*i*n/intervalCount-1e-10)]); - final double val = min+i*(max-min)/intervalCount; + final double val = min+i*(max-min)/intervalCount; final String txt = String.format("%.3f", val*valueScale); if (w < h) { Index: /trunk/src/org/openstreetmap/josm/tools/Diff.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 10378) @@ -327,5 +327,5 @@ static class ReverseScript implements ScriptBuilder { @Override - public Change build_script( + public Change build_script( final boolean[] changed0, int len0, final boolean[] changed1, int len1) { @@ -828,24 +828,21 @@ private final int bufferedLines; - /** Vector, indexed by line number, containing an equivalence code for - each line. It is this vector that is actually compared with that - of another file to generate differences. */ - private final int[] equivs; - - /** Vector, like the previous one except that - the elements for discarded lines have been squeezed out. */ - private final int[] undiscarded; - - /** Vector mapping virtual line numbers (not counting discarded lines) - to real ones (counting those lines). Both are origin-0. */ - private final int[] realindexes; + /** Vector, indexed by line number, containing an equivalence code for each line. + * It is this vector that is actually compared with that of another file to generate differences. */ + private final int[] equivs; + + /** Vector, like the previous one except that the elements for discarded lines have been squeezed out. */ + private final int[] undiscarded; + + /** Vector mapping virtual line numbers (not counting discarded lines) to real ones (counting those lines). + * Both are origin-0. */ + private final int[] realindexes; /** Total number of nondiscarded lines. */ - private int nondiscardedLines; - - /** Array, indexed by real origin-1 line number, - containing true for a line that is an insertion or a deletion. - The results of comparison are stored here. */ - private boolean[] changedFlag; + private int nondiscardedLines; + + /** Array, indexed by real origin-1 line number, containing true for a line that is an insertion or a deletion. + The results of comparison are stored here. */ + private boolean[] changedFlag; } } Index: /trunk/src/org/openstreetmap/josm/tools/ExifReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/ExifReader.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/tools/ExifReader.java (revision 10378) @@ -179,5 +179,5 @@ } - private static double readAxis(GpsDirectory dirGps, int gpsTag, int gpsTagRef, char cRef) throws MetadataException { + private static double readAxis(GpsDirectory dirGps, int gpsTag, int gpsTagRef, char cRef) throws MetadataException { double value; Rational[] components = dirGps.getRationalArray(gpsTag); @@ -205,6 +205,5 @@ * Returns a Transform that fixes the image orientation. * - * Only orientation 1, 3, 6 and 8 are supported. Everything else is treated - * as 1. + * Only orientation 1, 3, 6 and 8 are supported. Everything else is treated as 1. * @param orientation the exif-orientation of the image * @param width the original width of the image Index: /trunk/src/org/openstreetmap/josm/tools/Geometry.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 10378) @@ -789,5 +789,5 @@ BigDecimal d = new BigDecimal(3, MathContext.DECIMAL128); // 1/2 * 6 = 3 - area = area.multiply(d, MathContext.DECIMAL128); + area = area.multiply(d, MathContext.DECIMAL128); if (area.compareTo(BigDecimal.ZERO) != 0) { north = north.divide(area, MathContext.DECIMAL128); Index: /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 10378) @@ -102,7 +102,9 @@ public class ImageProvider { + // CHECKSTYLE.OFF: SingleSpaceSeparator private static final String HTTP_PROTOCOL = "http://"; private static final String HTTPS_PROTOCOL = "https://"; private static final String WIKI_PROTOCOL = "wiki://"; + // CHECKSTYLE.ON: SingleSpaceSeparator /** Index: /trunk/src/org/openstreetmap/josm/tools/MultikeyShortcutAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/MultikeyShortcutAction.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/tools/MultikeyShortcutAction.java (revision 10378) @@ -27,5 +27,5 @@ return '0'; else - return (char) ('A' + index - 10); + return (char) ('A' + index - 10); } Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 10378) @@ -232,7 +232,9 @@ public static String getPackageDetails(String ... packageNames) { try { + // CHECKSTYLE.OFF: SingleSpaceSeparator boolean dpkg = Files.exists(Paths.get("/usr/bin/dpkg-query")); boolean eque = Files.exists(Paths.get("/usr/bin/equery")); boolean rpm = Files.exists(Paths.get("/bin/rpm")); + // CHECKSTYLE.ON: SingleSpaceSeparator if (dpkg || rpm || eque) { for (String packageName : packageNames) { Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 10378) @@ -79,5 +79,5 @@ (byte) 0xfc, (byte) 0xf1, 0x7f, 0x73, (byte) 0xa7, (byte) 0x9d, (byte) 0xde, (byte) 0xc7, (byte) 0x88, 0x57, 0x51, (byte) 0x84, (byte) 0xed, (byte) 0x96, (byte) 0xfb, (byte) 0xe1, 0x38, (byte) 0xef, 0x08, 0x2b, (byte) 0xf3, - (byte) 0xc7, (byte) 0xc3, 0x5d, (byte) 0xfe, (byte) 0xf9, 0x51, (byte) 0xe6, 0x29, (byte) 0xfc, (byte) 0xe5, 0x0d, + (byte) 0xc7, (byte) 0xc3, 0x5d, (byte) 0xfe, (byte) 0xf9, 0x51, (byte) 0xe6, 0x29, (byte) 0xfc, (byte) 0xe5, 0x0d, (byte) 0xa1, 0x0d, (byte) 0xa8, (byte) 0xb4, (byte) 0xae, 0x26, 0x18, 0x19, 0x4d, 0x6c, 0x0c, 0x3b, 0x12, (byte) 0xba, (byte) 0xbc, 0x5f, 0x32, (byte) 0xb3, (byte) 0xbe, (byte) 0x9d, 0x17, 0x0d, 0x4d, 0x2f, 0x1a, 0x48, (byte) 0xb7, Index: /trunk/src/org/openstreetmap/josm/tools/Shortcut.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 10378) @@ -221,5 +221,5 @@ */ public void setMnemonic(AbstractButton button) { - if (assignedModifier == getGroupModifier(MNEMONIC) && getKeyStroke() != null && KeyEvent.getKeyText(assignedKey).length() == 1) { + if (assignedModifier == getGroupModifier(MNEMONIC) && getKeyStroke() != null && KeyEvent.getKeyText(assignedKey).length() == 1) { button.setMnemonic(KeyEvent.getKeyText(assignedKey).charAt(0)); //getKeyStroke().getKeyChar() seems not to work here } @@ -231,5 +231,5 @@ */ public void setFocusAccelerator(JTextComponent component) { - if (assignedModifier == getGroupModifier(MNEMONIC) && getKeyStroke() != null && KeyEvent.getKeyText(assignedKey).length() == 1) { + if (assignedModifier == getGroupModifier(MNEMONIC) && getKeyStroke() != null && KeyEvent.getKeyText(assignedKey).length() == 1) { component.setFocusAccelerator(KeyEvent.getKeyText(assignedKey).charAt(0)); } Index: /trunk/src/org/openstreetmap/josm/tools/TextTagParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 10378) @@ -125,5 +125,5 @@ while (pos < n) { c = data.charAt(pos); - if (c == '\t' || c == '\n' || c == ' ') { + if (c == '\t' || c == '\n' || c == ' ') { pos++; } else if (c == '=') { @@ -177,5 +177,5 @@ String k; String v; - for (String line: lines) { + for (String line: lines) { if (line.trim().isEmpty()) continue; // skip empty lines Matcher m = p.matcher(line); @@ -195,5 +195,5 @@ if (!tags.isEmpty()) { return tags; - } else { + } else { return null; } Index: /trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (revision 10378) @@ -58,5 +58,5 @@ * @param window the window */ - public WindowGeometry(Window window) { + public WindowGeometry(Window window) { this(window.getLocationOnScreen(), window.getSize()); } @@ -165,5 +165,5 @@ * @param window the window */ - public void fixScreen(Window window) { + public void fixScreen(Window window) { Rectangle oldScreen = getScreenInfo(getRectangle()); Rectangle newScreen = getScreenInfo(new Rectangle(window.getLocationOnScreen(), window.getSize())); @@ -402,5 +402,5 @@ Rectangle bounds = gc.getBounds(); Insets insets = component.getToolkit().getScreenInsets(gc); - result.width = bounds.width - insets.left - insets.right; + result.width = bounds.width - insets.left - insets.right; result.height = bounds.height - insets.top - insets.bottom; } Index: /trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (revision 10378) @@ -106,5 +106,5 @@ } else if (mapping.containsKey(qname) && characters != null && !current.isEmpty()) { setValue(mapping.get(qname), qname, characters.toString().trim()); - characters = new StringBuilder(64); + characters = new StringBuilder(64); } } @@ -117,5 +117,5 @@ private void report() { queue.add(current.pop()); - characters = new StringBuilder(64); + characters = new StringBuilder(64); } Index: /trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java (revision 10377) +++ /trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java (revision 10378) @@ -108,5 +108,5 @@ Token token = tokenizer.lookAhead(); - if (token.getType() == TokenType.END) { + if (token.getType() == TokenType.END) { tokenizer.nextToken(); return result; Index: /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTestFT.java =================================================================== --- /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTestFT.java (revision 10377) +++ /trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTestFT.java (revision 10378) @@ -32,5 +32,5 @@ public static void main(String[] args) { - TagMergerTestFT test = new TagMergerTestFT(); + TagMergerTestFT test = new TagMergerTestFT(); test.setSize(600, 600); test.setVisible(true); Index: /trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java =================================================================== --- /trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (revision 10377) +++ /trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (revision 10378) @@ -138,5 +138,5 @@ ds.adjustRelationUploadOrder(); OsmServerWriter writer = new OsmServerWriter(); - Changeset cs = new Changeset(); + Changeset cs = new Changeset(); writer.uploadOsm( new UploadStrategySpecification().setStrategy(UploadStrategy.SINGLE_REQUEST_STRATEGY), Index: /trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java =================================================================== --- /trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java (revision 10377) +++ /trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java (revision 10378) @@ -22,5 +22,5 @@ protected UploadStrategySelectionPanel uploadStrategySelectionPanel; - protected void build() { + protected void build() { getContentPane().setLayout(new BorderLayout()); uploadStrategySelectionPanel = new UploadStrategySelectionPanel(); Index: /trunk/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java (revision 10378) @@ -96,5 +96,5 @@ void verifyRectangleClockwise(final Way way) { for (int i = 1; i < way.getNodesCount() - 1; i++) { - assertEquals(-Math.PI / 2, Geometry.getCornerAngle( + assertEquals(-Math.PI / 2, Geometry.getCornerAngle( way.getNode(i - 1).getEastNorth(), way.getNode(i).getEastNorth(), way.getNode(i + 1).getEastNorth()), 1e-6); } Index: /trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java (revision 10378) @@ -79,5 +79,5 @@ */ @Test - public void testStatusCodes() throws IOException, InterruptedException { + public void testStatusCodes() throws IOException, InterruptedException { doTestStatusCode(200); // can't test for 3xx, as httpstat.us redirects finally to 200 page Index: /trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java (revision 10378) @@ -33,10 +33,12 @@ @SuppressFBWarnings(value = "MS_PKGPROTECT") public static final double[] SAMPLE_VALUES = new double[]{ + // CHECKSTYLE.OFF: SingleSpaceSeparator -180.0, -179.9, -179.6, -179.5, -179.4, -179.1, -179.0, -100.0, -99.9, -10.0, -9.9, -1.0, -0.1, - 180.0, 179.9, 179.6, 179.5, 179.4, 179.1, 179.0, 100.0, 99.9, 10.0, 9.9, 1.0, 0.1, + 180.0, 179.9, 179.6, 179.5, 179.4, 179.1, 179.0, 100.0, 99.9, 10.0, 9.9, 1.0, 0.1, 0.12, 0.123, 0.1234, 0.12345, 0.123456, 0.1234567, 1.12, 1.123, 1.1234, 1.12345, 1.123456, 1.1234567, 10.12, 10.123, 10.1234, 10.12345, 10.123456, 10.1234567, 100.12, 100.123, 100.1234, 100.12345, 100.123456, 100.1234567 + // CHECKSTYLE.ON: SingleSpaceSeparator }; @@ -54,4 +56,5 @@ assertEquals(LatLon.roundToOsmPrecision(-0.0), 0.0, 0); + // CHECKSTYLE.OFF: SingleSpaceSeparator assertEquals(LatLon.roundToOsmPrecision(0.12345678), 0.1234568, 0); assertEquals(LatLon.roundToOsmPrecision(0.123456789), 0.1234568, 0); @@ -65,34 +68,35 @@ assertEquals(LatLon.roundToOsmPrecision(100.12345678), 100.1234568, 0); assertEquals(LatLon.roundToOsmPrecision(100.123456789), 100.1234568, 0); + // CHECKSTYLE.ON: SingleSpaceSeparator - assertEquals(LatLon.roundToOsmPrecision(100.00000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.0000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.00000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.0000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.00000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.000000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.0000000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.00000000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.000000000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.0000000000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.00000000000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.00000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.0000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.00000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.0000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.00000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.000000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.0000000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.00000000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.000000000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.0000000000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.00000000000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.999999999999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.99999999999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.9999999999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.999999999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.99999999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.9999999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.999999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.99999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.9999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.99999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.9999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.99999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.9999999), 99.9999999, 0); + assertEquals(LatLon.roundToOsmPrecision(99.999999999999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.99999999999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.9999999999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.999999999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.99999999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.9999999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.999999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.99999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.9999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.99999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.9999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.99999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.9999999), 99.9999999, 0); } Index: /trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java (revision 10378) @@ -36,5 +36,5 @@ @Test public void testGetExtendedUrl() { - ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null); + ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null); testImageryTMS.setDefaultMinZoom(16); testImageryTMS.setDefaultMaxZoom(23); Index: /trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java (revision 10378) @@ -23,6 +23,6 @@ public class TemplatedWMSTileSourceTest { - private ImageryInfo testImageryWMS = new ImageryInfo("test imagery", "http://localhost", "wms", null, null); - private ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null); + private ImageryInfo testImageryWMS = new ImageryInfo("test imagery", "http://localhost", "wms", null, null); + private ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null); /** @@ -190,5 +190,5 @@ private static boolean isWithin(EastNorth point, EastNorth topLeft, EastNorth bottomRight) { return Math.min(topLeft.east(), bottomRight.east()) <= point.east() && - point.east() <= Math.max(topLeft.east(), bottomRight.east()) && + point.east() <= Math.max(topLeft.east(), bottomRight.east()) && Math.min(topLeft.north(), bottomRight.north()) <= point.north() && point.north() <= Math.max(topLeft.north(), bottomRight.north()); Index: /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 10378) @@ -25,5 +25,5 @@ public class WMTSTileSourceTest { - private ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null); + private ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null); private ImageryInfo testImageryPSEUDO_MERCATOR = getImagery(TestUtils.getTestDataRoot() + "wmts/getcapabilities-pseudo-mercator.xml"); private ImageryInfo testImageryTOPO_PL = getImagery(TestUtils.getTestDataRoot() + "wmts/getcapabilities-TOPO.xml"); @@ -192,5 +192,5 @@ + "VERSION=1.0.0&LAYER=MAPA TOPOGRAFICZNA&STYLE=default&FORMAT=image/jpeg&tileMatrixSet=EPSG:4326&" + "tileMatrix=EPSG:4326:0&tileRow=1&tileCol=1", - testSource.getTileUrl(0, 1, 1)); + testSource.getTileUrl(0, 1, 1)); } @@ -221,5 +221,5 @@ assertEquals( "http://www.ngi.be/cartoweb/1.0.0/topo/default/3857/7/1/1.png", - testSource.getTileUrl(0, 1, 1)); + testSource.getTileUrl(0, 1, 1)); } @@ -232,5 +232,4 @@ verifyTile(new LatLon(45.4105023, -75.7153702), testSource, 303751, 375502, 12); verifyTile(new LatLon(45.4601306, -75.7617187), testSource, 1186, 1466, 4); - } Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (revision 10378) @@ -8,4 +8,5 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.StringWriter; @@ -53,7 +54,7 @@ } - private void runConsistencyTests(DataSet ds) throws Exception { + private void runConsistencyTests(DataSet ds) { StringWriter writer = new StringWriter(); - DatasetConsistencyTest test = new DatasetConsistencyTest(ds, writer); + DatasetConsistencyTest test = new DatasetConsistencyTest(ds, writer); test.checkReferrers(); test.checkCompleteWaysWithIncompleteNodes(); @@ -63,10 +64,10 @@ test.checkZeroNodesWays(); String result = writer.toString(); - if (result.length() > 0) - throw new RuntimeException(result); + if (!result.isEmpty()) + fail(result); } @After - public void checkDatasets() throws Exception { + public void checkDatasets() { runConsistencyTests(my); runConsistencyTests(their); Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryRelationTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryRelationTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryRelationTest.java (revision 10378) @@ -80,4 +80,5 @@ rel2.addMember(new RelationMemberData(null, OsmPrimitiveType.NODE, 2)); + // CHECKSTYLE.OFF: SingleSpaceSeparator assertEquals("relation (1, 0 members)", rel0.getDisplayName(hnf)); assertEquals("relation (1, 1 member)", rel1.getDisplayName(hnf)); @@ -94,4 +95,5 @@ assertEquals("relation (\"RelName\", 1 member)", rel1.getDisplayName(hnf)); assertEquals("relation (\"RelName\", 2 members)", rel2.getDisplayName(hnf)); + // CHECKSTYLE.ON: SingleSpaceSeparator } } Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (revision 10378) @@ -122,4 +122,5 @@ way2.addNode(2); + // CHECKSTYLE.OFF: SingleSpaceSeparator assertEquals("1 (0 nodes)", way0.getDisplayName(hnf)); assertEquals("1 (1 node)", way1.getDisplayName(hnf)); @@ -136,4 +137,5 @@ assertEquals("WayName (1 node)", way1.getDisplayName(hnf)); assertEquals("WayName (2 nodes)", way2.getDisplayName(hnf)); + // CHECKSTYLE.ON: SingleSpaceSeparator } } Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (revision 10378) @@ -169,5 +169,5 @@ r1.addMember(new RelationMember("node-20", n20)); Way w30 = new Way(30, 1); - Node n21 = new Node(21); + Node n21 = new Node(21); w30.addNode(n21); Node n22 = new Node(22); Index: /trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (revision 10378) @@ -25,4 +25,5 @@ // CHECKSTYLE.OFF: LineLength + // CHECKSTYLE.OFF: SingleSpaceSeparator /** @@ -30,10 +31,11 @@ */ ProjData[] data = { - new ProjData("Zimmerwald", d(7, 27, 54.983506), d(46, 52, 37.540562), 947.149, 602030.680, 191775.030, 897.915), - new ProjData("Chrischona", d(7, 40, 6.983077), d(47, 34, 1.385301), 504.935, 617306.300, 268507.300, 456.064), - new ProjData("Pfaender", d(9, 47, 3.697723), d(47, 30, 55.172797), 1089.372, 776668.105, 265372.681, 1042.624), - new ProjData("La Givrine", d(6, 6, 7.326361), d(46, 27, 14.690021), 1258.274, 497313.292, 145625.438, 1207.434), - new ProjData("Monte Generoso", d(9, 1, 16.389053), d(45, 55, 45.438020), 1685.027, 722758.810, 87649.670, 1636.600) }; - + new ProjData("Zimmerwald", d(7, 27, 54.983506), d(46, 52, 37.540562), 947.149, 602030.680, 191775.030, 897.915), + new ProjData("Chrischona", d(7, 40, 6.983077), d(47, 34, 1.385301), 504.935, 617306.300, 268507.300, 456.064), + new ProjData("Pfaender", d(9, 47, 3.697723), d(47, 30, 55.172797), 1089.372, 776668.105, 265372.681, 1042.624), + new ProjData("La Givrine", d(6, 6, 7.326361), d(46, 27, 14.690021), 1258.274, 497313.292, 145625.438, 1207.434), + new ProjData("Monte Generoso", d(9, 1, 16.389053), d(45, 55, 45.438020), 1685.027, 722758.810, 87649.670, 1636.600) }; + + // CHECKSTYLE.ON: SingleSpaceSeparator // CHECKSTYLE.ON: LineLength Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java (revision 10378) @@ -58,5 +58,5 @@ */ @Test - public void testEmail() { + public void testEmail() { assertTrue(validator.isValid("jsmith@apache.org")); assertFalse(validator.isValid(null)); @@ -67,5 +67,5 @@ */ @Test - public void testEmailWithNumericAddress() { + public void testEmailWithNumericAddress() { assertTrue(validator.isValid("someone@[216.109.118.76]")); assertTrue(validator.isValid("someone@yahoo.com")); @@ -76,5 +76,5 @@ */ @Test - public void testEmailExtension() { + public void testEmailExtension() { assertTrue(validator.isValid("jsmith@apache.org")); @@ -99,5 +99,5 @@ */ @Test - public void testEmailWithDash() { + public void testEmailWithDash() { assertTrue(validator.isValid("andy.noble@data-workshop.com")); @@ -114,5 +114,5 @@ */ @Test - public void testEmailWithDotEnd() { + public void testEmailWithDotEnd() { assertFalse(validator.isValid("andy.noble@data-workshop.com.")); } @@ -123,5 +123,5 @@ */ @Test - public void testEmailWithBogusCharacter() { + public void testEmailWithBogusCharacter() { assertFalse(validator.isValid("andy.noble@\u008fdata-workshop.com")); @@ -184,5 +184,5 @@ */ @Test - public void testEmailWithCommas() { + public void testEmailWithCommas() { assertFalse(validator.isValid("joeblow@apa,che.org")); @@ -196,5 +196,5 @@ */ @Test - public void testEmailWithSpaces() { + public void testEmailWithSpaces() { assertFalse(validator.isValid("joeblow @apache.org")); // TODO - this should be valid? @@ -215,5 +215,5 @@ */ @Test - public void testEmailWithControlChars() { + public void testEmailWithControlChars() { for (char c = 0; c < 32; c++) { assertFalse("Test control char " + ((int) c), validator.isValid("foo" + c + "bar@domain.com")); @@ -278,5 +278,5 @@ */ @Test - public void testEmailUserName() { + public void testEmailUserName() { assertTrue(validator.isValid("joe1blow@apache.org")); @@ -492,5 +492,5 @@ @Ignore("This test fails so disable it for 1.1.4 release. The real solution is to fix the email parsing") @Test - public void testEmailFromPerl() { + public void testEmailFromPerl() { for (int index = 0; index < testEmailFromPerl.length; index++) { String item = testEmailFromPerl[index].item; Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/InetAddressValidatorTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/InetAddressValidatorTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/InetAddressValidatorTest.java (revision 10378) @@ -47,8 +47,10 @@ @Test public void testInetAddressesFromTheWild() { - assertTrue("www.apache.org IP should be valid", validator.isValid("140.211.11.130")); - assertTrue("www.l.google.com IP should be valid", validator.isValid("72.14.253.103")); - assertTrue("fsf.org IP should be valid", validator.isValid("199.232.41.5")); - assertTrue("appscs.ign.com IP should be valid", validator.isValid("216.35.123.87")); + // CHECKSTYLE.OFF: SingleSpaceSeparator + assertTrue("www.apache.org IP should be valid", validator.isValid("140.211.11.130")); + assertTrue("www.l.google.com IP should be valid", validator.isValid("72.14.253.103")); + assertTrue("fsf.org IP should be valid", validator.isValid("199.232.41.5")); + assertTrue("appscs.ign.com IP should be valid", validator.isValid("216.35.123.87")); + // CHECKSTYLE.ON: SingleSpaceSeparator } @@ -67,18 +69,20 @@ @Test public void testInetAddressesByClass() { - assertTrue("class A IP should be valid", validator.isValid("24.25.231.12")); - assertFalse("illegal class A IP should be invalid", validator.isValid("2.41.32.324")); - - assertTrue("class B IP should be valid", validator.isValid("135.14.44.12")); - assertFalse("illegal class B IP should be invalid", validator.isValid("154.123.441.123")); - - assertTrue("class C IP should be valid", validator.isValid("213.25.224.32")); - assertFalse("illegal class C IP should be invalid", validator.isValid("201.543.23.11")); - - assertTrue("class D IP should be valid", validator.isValid("229.35.159.6")); - assertFalse("illegal class D IP should be invalid", validator.isValid("231.54.11.987")); - - assertTrue("class E IP should be valid", validator.isValid("248.85.24.92")); - assertFalse("illegal class E IP should be invalid", validator.isValid("250.21.323.48")); + // CHECKSTYLE.OFF: SingleSpaceSeparator + assertTrue("class A IP should be valid", validator.isValid("24.25.231.12")); + assertFalse("illegal class A IP should be invalid", validator.isValid("2.41.32.324")); + + assertTrue("class B IP should be valid", validator.isValid("135.14.44.12")); + assertFalse("illegal class B IP should be invalid", validator.isValid("154.123.441.123")); + + assertTrue("class C IP should be valid", validator.isValid("213.25.224.32")); + assertFalse("illegal class C IP should be invalid", validator.isValid("201.543.23.11")); + + assertTrue("class D IP should be valid", validator.isValid("229.35.159.6")); + assertFalse("illegal class D IP should be invalid", validator.isValid("231.54.11.987")); + + assertTrue("class E IP should be valid", validator.isValid("248.85.24.92")); + assertFalse("illegal class E IP should be invalid", validator.isValid("250.21.323.48")); + // CHECKSTYLE.ON: SingleSpaceSeparator } @@ -88,6 +92,6 @@ @Test public void testReservedInetAddresses() { - assertTrue("localhost IP should be valid", validator.isValid("127.0.0.1")); - assertTrue("broadcast IP should be valid", validator.isValid("255.255.255.255")); + assertTrue("localhost IP should be valid", validator.isValid("127.0.0.1")); + assertTrue("broadcast IP should be valid", validator.isValid("255.255.255.255")); } @@ -97,8 +101,10 @@ @Test public void testBrokenInetAddresses() { + // CHECKSTYLE.OFF: SingleSpaceSeparator assertFalse("IP with characters should be invalid", validator.isValid("124.14.32.abc")); assertFalse("IP with leading zeroes should be invalid", validator.isValid("124.14.32.01")); assertFalse("IP with three groups should be invalid", validator.isValid("23.64.12")); assertFalse("IP with five groups should be invalid", validator.isValid("26.34.23.77.234")); + // CHECKSTYLE.ON: SingleSpaceSeparator } Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java (revision 10378) @@ -37,15 +37,17 @@ public class RegexValidatorTest { - private static final String REGEX = "^([abc]*)(?:\\-)([DEF]*)(?:\\-)([123]*)$"; + private static final String REGEX = "^([abc]*)(?:\\-)([DEF]*)(?:\\-)([123]*)$"; private static final String COMPONENT_1 = "([abc]{3})"; private static final String COMPONENT_2 = "([DEF]{3})"; private static final String COMPONENT_3 = "([123]{3})"; - private static final String SEPARATOR_1 = "(?:\\-)"; - private static final String SEPARATOR_2 = "(?:\\s)"; + private static final String SEPARATOR_1 = "(?:\\-)"; + private static final String SEPARATOR_2 = "(?:\\s)"; private static final String REGEX_1 = "^" + COMPONENT_1 + SEPARATOR_1 + COMPONENT_2 + SEPARATOR_1 + COMPONENT_3 + "$"; private static final String REGEX_2 = "^" + COMPONENT_1 + SEPARATOR_2 + COMPONENT_2 + SEPARATOR_2 + COMPONENT_3 + "$"; private static final String REGEX_3 = "^" + COMPONENT_1 + COMPONENT_2 + COMPONENT_3 + "$"; private static final String[] MULTIPLE_REGEX = new String[] {REGEX_1, REGEX_2, REGEX_3}; + + // CHECKSTYLE.OFF: SingleSpaceSeparator /** @@ -85,8 +87,8 @@ // ------------ Set up Sensitive Validators - RegexValidator multiple = new RegexValidator(MULTIPLE_REGEX); - RegexValidator single1 = new RegexValidator(REGEX_1); - RegexValidator single2 = new RegexValidator(REGEX_2); - RegexValidator single3 = new RegexValidator(REGEX_3); + RegexValidator multiple = new RegexValidator(MULTIPLE_REGEX); + RegexValidator single1 = new RegexValidator(REGEX_1); + RegexValidator single2 = new RegexValidator(REGEX_2); + RegexValidator single3 = new RegexValidator(REGEX_3); // ------------ Set up test values @@ -128,7 +130,7 @@ // ------------ Set up In-sensitive Validators RegexValidator multiple = new RegexValidator(MULTIPLE_REGEX, false); - RegexValidator single1 = new RegexValidator(REGEX_1, false); - RegexValidator single2 = new RegexValidator(REGEX_2, false); - RegexValidator single3 = new RegexValidator(REGEX_3, false); + RegexValidator single1 = new RegexValidator(REGEX_1, false); + RegexValidator single2 = new RegexValidator(REGEX_2, false); + RegexValidator single3 = new RegexValidator(REGEX_3, false); // ------------ Set up test values @@ -172,4 +174,6 @@ assertNull("Instance match()", validator.match(null)); } + + // CHECKSTYLE.ON: SingleSpaceSeparator /** Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java (revision 10378) @@ -99,5 +99,5 @@ int statusPerLine = 60; int printed = 0; - if (printIndex) { + if (printIndex) { statusPerLine = 6; } Index: /trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (revision 10378) @@ -70,4 +70,5 @@ System.out.println("p3: "+DefaultNameFormatter.getInstance().format(p3)+" - "+p3); + // CHECKSTYLE.OFF: SingleSpaceSeparator assertEquals(comparator.compare(p1, p2), -1); // p1 < p2 assertEquals(comparator.compare(p2, p1), 1); // p2 > p1 @@ -77,4 +78,5 @@ assertEquals(comparator.compare(p2, p3), 1); // p2 > p3 assertEquals(comparator.compare(p3, p2), -1); // p3 < p2 + // CHECKSTYLE.ON: SingleSpaceSeparator Relation[] relations = new ArrayList<>(ds.getRelations()).toArray(new Relation[0]); Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java (revision 10378) @@ -128,5 +128,5 @@ */ @Before - public void setUp() { + public void setUp() { layerManager = new LayerManager(); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayerTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayerTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayerTest.java (revision 10378) @@ -37,5 +37,5 @@ */ @Test - public void testMarkerLayer() { + public void testMarkerLayer() { assertEquals(Color.magenta, MarkerLayer.getGenericColor()); MarkerLayer layer = new MarkerLayer(new GpxData(), "foo", null, null); Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testAdvancedPreference() { + public void testAdvancedPreference() { assertNotNull(new AdvancedPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileActionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileActionTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileActionTest.java (revision 10378) @@ -24,5 +24,5 @@ */ @Test - public void testAction() { + public void testAction() { new ExportProfileAction(Main.pref, "foo", "bar").actionPerformed(null); new ExportProfileAction(Main.pref, "expert", "expert").actionPerformed(null); Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ListEditorTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ListEditorTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ListEditorTest.java (revision 10378) @@ -30,5 +30,5 @@ */ @Test - public void testListSettingTableModel() { + public void testListSettingTableModel() { ListSettingTableModel model = new ListSettingTableModel(null); assertNotNull(model.getData()); Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java (revision 10378) @@ -30,5 +30,5 @@ */ @Test - public void testPrefEntry() { + public void testPrefEntry() { String key = "key"; StringSetting val = new StringSetting("value"); Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTableTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTableTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTableTest.java (revision 10378) @@ -42,5 +42,5 @@ */ @Test - public void testPreferencesTable() { + public void testPreferencesTable() { PreferencesTable t = newTable(); t.fireDataChanged(); @@ -55,5 +55,5 @@ */ @Test - public void testAllSettingsTableModel() { + public void testAllSettingsTableModel() { AllSettingsTableModel model = (AllSettingsTableModel) newTable().getModel(); assertEquals(1, model.getRowCount()); Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/audio/AudioPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/audio/AudioPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/audio/AudioPreferenceTest.java (revision 10378) @@ -27,5 +27,5 @@ */ @Test - public void testAudioPreference() { + public void testAudioPreference() { assertNotNull(new AudioPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/ColorPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/ColorPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/ColorPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testColorPreference() { + public void testColorPreference() { assertNotNull(new ColorPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DisplayPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DisplayPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DisplayPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testDisplayPreference() { + public void testDisplayPreference() { assertNotNull(new DisplayPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testDrawingPreference() { + public void testDrawingPreference() { assertNotNull(new DrawingPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LafPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LafPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LafPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testLafPreference() { + public void testLafPreference() { assertNotNull(new LafPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LanguagePreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LanguagePreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LanguagePreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testLanguagePreference() { + public void testLanguagePreference() { assertNotNull(new LanguagePreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testImageryPreference() { + public void testImageryPreference() { assertNotNull(new ImageryPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/BackupPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/BackupPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/BackupPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testBackupPreference() { + public void testBackupPreference() { assertNotNull(new BackupPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testMapPaintPreference() { + public void testMapPaintPreference() { assertNotNull(new MapPaintPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testMapPreference() { + public void testMapPreference() { assertNotNull(new MapPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testTaggingPresetPreference() { + public void testTaggingPresetPreference() { assertNotNull(new TaggingPresetPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java (revision 10378) @@ -36,5 +36,5 @@ */ @Test - public void testPluginPreference() { + public void testPluginPreference() { assertNotNull(new PluginPreference.Factory().createPreferenceSetting()); } @@ -45,5 +45,5 @@ */ @Test - public void testBuildDownloadSummary() throws Exception { + public void testBuildDownloadSummary() throws Exception { final PluginInformation dummy = new PluginInformation( new File(TestUtils.getTestDataRoot() + "plugin/dummy_plugin.jar"), "dummy_plugin"); Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreferenceTest.java (revision 10378) @@ -27,5 +27,5 @@ */ @Test - public void testProjectionPreference() { + public void testProjectionPreference() { assertNotNull(new ProjectionPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testRemoteControlPreference() { + public void testRemoteControlPreference() { assertNotNull(new RemoteControlPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testAuthenticationPreference() { + public void testAuthenticationPreference() { assertNotNull(new AuthenticationPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testOverpassServerPreference() { + public void testOverpassServerPreference() { assertNotNull(new OverpassServerPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/ProxyPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/ProxyPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/ProxyPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testProxyPreference() { + public void testProxyPreference() { assertNotNull(new ProxyPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testServerAccessPreference() { + public void testServerAccessPreference() { assertNotNull(new ServerAccessPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testShortcutPreference() { + public void testShortcutPreference() { assertNotNull(new ShortcutPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testValidatorPreference() { + public void testValidatorPreference() { assertNotNull(new ValidatorPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreferenceTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testValidatorTestsPreference() { + public void testValidatorTestsPreference() { assertNotNull(new ValidatorTestsPreference.Factory().createPreferenceSetting()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java (revision 10378) @@ -58,5 +58,5 @@ final Collection presets = TaggingPresetReader.readAll(TestUtils.getTestDataRoot() + "preset_chunk.xml", true); assertThat(presets, hasSize(1)); - final TaggingPreset abc = presets.iterator().next(); + final TaggingPreset abc = presets.iterator().next(); final List keys = Utils.transform(abc.data, new Utils.Function() { @Override Index: /trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java (revision 10378) @@ -36,5 +36,5 @@ */ @Test - public void testStartupHook() { + public void testStartupHook() { hook.startupHook(); } Index: /trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java (revision 10378) @@ -43,5 +43,5 @@ */ @Test - public void testStartupHook() { + public void testStartupHook() { hook.startupHook(); } Index: /trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java (revision 10378) @@ -30,14 +30,18 @@ public void testUnescape() { String s, s1; - s = "\"2 3 4\""; s1 = "2 3 4"; + s = "\"2 3 4\""; + s1 = "2 3 4"; Assert.assertEquals(s1, TextTagParser.unescape(s)); - s = "\"2 \\\"3\\\" 4\""; s1 = "2 \"3\" 4"; + s = "\"2 \\\"3\\\" 4\""; + s1 = "2 \"3\" 4"; Assert.assertEquals(s1, TextTagParser.unescape(s)); - s = "\"2 3 ===4===\""; s1 = "2 3 ===4==="; + s = "\"2 3 ===4===\""; + s1 = "2 3 ===4==="; Assert.assertEquals(s1, TextTagParser.unescape(s)); - s = "\"2 3 \\\\\\\\===4===\""; s1 = "2 3 \\\\===4==="; + s = "\"2 3 \\\\\\\\===4===\""; + s1 = "2 3 \\\\===4==="; Assert.assertEquals(s1, TextTagParser.unescape(s)); } Index: /trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java (revision 10377) +++ /trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java (revision 10378) @@ -24,4 +24,5 @@ @Test public void testStrip() { + // CHECKSTYLE.OFF: SingleSpaceSeparator final String someWhite = "\u00A0"+ // SPACE_SEPARATOR @@ -42,4 +43,5 @@ "\uFEFF"+ // ZERO WIDTH NO-BREAK SPACE "\u3000"; // IDEOGRAPHIC SPACE + // CHECKSTYLE.ON: SingleSpaceSeparator Assert.assertNull(Utils.strip(null)); Assert.assertEquals("", Utils.strip("")); Index: /trunk/tools/checkstyle/josm_checks.xml =================================================================== --- /trunk/tools/checkstyle/josm_checks.xml (revision 10377) +++ /trunk/tools/checkstyle/josm_checks.xml (revision 10378) @@ -56,4 +56,5 @@ +