Index: trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (revision 9073) @@ -114,6 +114,6 @@ if (param[0].toLowerCase(Locale.ENGLISH).startsWith("-dproxy")) { it.set(param[0]+"=xxx"); - // Shorten some parameters for readability concerns } else { + // Shorten some parameters for readability concerns shortenParam(it, param, envJavaHome, envJavaHomeAlt); shortenParam(it, param, propJavaHome, propJavaHomeAlt); Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 9073) @@ -384,5 +384,5 @@ } - /** + /** * Look, whether any object is selected. If not, select the nearest node. * If there are no nodes in the dataset, do nothing. @@ -1106,5 +1106,5 @@ return cycleList; } -// updateKeyModifiers(e); // already called before ! + // updateKeyModifiers() already called before! DataSet ds = getCurrentDataSet(); Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 9073) @@ -230,5 +230,5 @@ } - /** + /** * Makes a WayPoint at the projection of point P onto the track providing P is less than * tolerance away from the track Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 9073) @@ -793,6 +793,6 @@ (int) (repeat - pos), 0, (int) (repeat - pos + segmentLength), imgHeight, null); - // rest of the image fits fully on the current segment } else { + // rest of the image fits fully on the current segment g.drawImage(pattern.getImage(disabled), 0, dy1, (int) (pos - spacing), dy2, (int) (repeat - pos), 0, imgWidth, imgHeight, null); Index: trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java (revision 9073) @@ -183,5 +183,5 @@ return new double[] { - /* Calculate latitude */ + /* Calculate latitude */ phif + x2frac * x2poly * (x * x) + x4frac * x4poly * pow(x, 4.0) Index: trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 9073) @@ -991,5 +991,5 @@ } - /** + /** * The *result* depends on the current map selection state IF use_selected is true. * Index: trunk/src/org/openstreetmap/josm/gui/NotificationManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/NotificationManager.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/gui/NotificationManager.java (revision 9073) @@ -57,6 +57,5 @@ private Timer hideTimer; // started when message is shown, responsible for hiding the message private Timer pauseTimer; // makes sure, there is a small pause between two consecutive messages - private Timer unfreezeDelayTimer; // tiny delay before resuming the timer when mouse cursor - // is moved off the panel + private Timer unfreezeDelayTimer; // tiny delay before resuming the timer when mouse cursor is moved off the panel private boolean running; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 9073) @@ -545,5 +545,5 @@ } - /** + /** * This simply fires up an {@link RelationEditor} for the relation shown; everything else * is the editor's business. Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 9073) @@ -1121,6 +1121,5 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "reverse")); putValue(NAME, tr("Reverse")); - // Shortcut.register Shortcut("relationeditor:reverse", tr("Relation Editor: Reverse"), - // KeyEvent.VK_END, Shortcut.ALT) + // Shortcut.register Shortcut("relationeditor:reverse", tr("Relation Editor: Reverse"), KeyEvent.VK_END, Shortcut.ALT) updateEnabledState(); } @@ -1570,6 +1569,5 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected")); putValue(NAME, tr("Download Members")); - // Shortcut.register Shortcut("relationeditor:downloadincomplete", tr("Relation Editor: Download Members"), - // KeyEvent.VK_K, Shortcut.ALT) + // Shortcut.register Shortcut("relationeditor:downloadincomplete", tr("Relation Editor: Download Members"), KeyEvent.VK_K, Shortcut.ALT) updateEnabledState(); } Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (revision 9073) @@ -302,5 +302,5 @@ continue; } - // now we are sure some color will be assigned + // now we are sure some color will be assigned Color color = null; Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (revision 9073) @@ -116,5 +116,5 @@ /** The value needs to end with the reference string. */ ENDS_WITH, - /** The value needs to contain the reference string. */ + /** The value needs to contain the reference string. */ CONTAINS; Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 9073) @@ -411,14 +411,14 @@ @Override public void actionPerformed(ActionEvent e) { - Collection t = new LinkedList<>(getToolString()); - ActionParser parser = new ActionParser(null); - // get text definition of current action + Collection t = new LinkedList<>(getToolString()); + ActionParser parser = new ActionParser(null); + // get text definition of current action String res = parser.saveAction(act); - // remove the button from toolbar preferences - t.remove(res); - Main.pref.putCollection("toolbar", t); - Main.toolbar.refreshToolbarControl(); - } - }); + // remove the button from toolbar preferences + t.remove(res); + Main.pref.putCollection("toolbar", t); + Main.toolbar.refreshToolbarControl(); + } + }); private JMenuItem configure = new JMenuItem(new AbstractAction(tr("Configure toolbar")) { Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/FeaturesPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/FeaturesPanel.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/FeaturesPanel.java (revision 9073) @@ -99,11 +99,10 @@ MessageNotifier.start(); } - // Even if they have not changed, } else { - // notifier should be stopped if user is no more identified enough + // Even if they have not changed, notifier should be stopped if user is no more identified enough if (!MessageNotifier.isUserEnoughIdentified()) { MessageNotifier.stop(); - // or restarted if user is again identified and notifier was enabled in preferences } else if (enabled && !MessageNotifier.isRunning()) { + // or restarted if user is again identified and notifier was enabled in preferences MessageNotifier.start(); } Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 9073) @@ -339,5 +339,5 @@ model.updateTags(tagPaster.execute()); } else { - // Paste tags from arbitrary text + // Paste tags from arbitrary text Map tags = TextTagParser.readTagsFromText(buf); if (tags == null || tags.isEmpty()) { Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 9073) @@ -347,6 +347,5 @@ public Collection getAdditionalFonts() { Collection def = new ArrayList<>(); - def.add(new FontEntry("devanagari", "", "")); // just include in fallback list - // font already defined in template + def.add(new FontEntry("devanagari", "", "")); // just include in fallback list font already defined in template // Windows scripts: https://msdn.microsoft.com/en-us/goglobal/bb688099.aspx Index: trunk/src/org/openstreetmap/josm/tools/TextTagParser.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 9072) +++ trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 9073) @@ -215,5 +215,5 @@ // tag1\tval1\ntag2\tval2\n tags = readTagsByRegexp(buf, "[\\r\\n]+", ".*?([a-zA-Z0-9:_]+).*\\t(.*?)", false); - // try "tag\tvalue\n" format + // try "tag\tvalue\n" format if (tags != null) return tags; @@ -224,5 +224,5 @@ // a = b=c - this method of parsing fails intentionally tags = readTagsByRegexp(buf, "[\\n\\t\\r]+", "(.*?)=(.*?)", true); - // try format t1=v1\n t2=v2\n ... + // try format t1=v1\n t2=v2\n ... if (tags != null) return tags;