Index: trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java	(revision 8419)
@@ -32,10 +32,10 @@
  * Aligns all selected nodes within a circle. (Useful for roundabouts)
  *
- * @since 146
- *
  * @author Matthew Newton
  * @author Petr Dlouhý
  * @author Teemu Koskinen
  * @author Alain Delplanque
+ *
+ * @since 146
  */
 public final class AlignInCircleAction extends JosmAction {
Index: trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java	(revision 8419)
@@ -76,5 +76,5 @@
     }
 
-    private class DownloadOpenChangesetsTask extends PleaseWaitRunnable {
+    private final class DownloadOpenChangesetsTask extends PleaseWaitRunnable {
 
         private boolean canceled;
Index: trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 8419)
@@ -45,9 +45,9 @@
  * BTW: Someone might want to implement projection corrections for this...
  *
- * @since 996
- *
  * @author Henry Loenwind
  * @author Sebastian Masch
  * @author Alain Delplanque
+ *
+ * @since 996
  */
 public final class CreateCircleAction extends JosmAction {
Index: trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java	(revision 8419)
@@ -83,5 +83,5 @@
     }
 
-    private static class CreateUpdateMultipolygonTask implements Runnable {
+    private static final class CreateUpdateMultipolygonTask implements Runnable {
         private final Collection<Way> selectedWays;
         private final Relation multipolygonRelation;
Index: trunk/src/org/openstreetmap/josm/actions/DownloadNotesInViewAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DownloadNotesInViewAction.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/actions/DownloadNotesInViewAction.java	(revision 8419)
@@ -18,5 +18,5 @@
  * No interaction is required.
  */
-public class DownloadNotesInViewAction extends JosmAction {
+public final class DownloadNotesInViewAction extends JosmAction {
 
     private DownloadNotesInViewAction(String iconName) {
Index: trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 8419)
@@ -134,6 +134,6 @@
      * @param filter The dialog file filter
      * @return The output {@code File}
+     * @see DiskAccessAction#createAndOpenFileChooser(boolean, boolean, String, FileFilter, int, String)
      * @since 5456
-     * @see DiskAccessAction#createAndOpenFileChooser(boolean, boolean, String, FileFilter, int, String)
      */
     public static File createAndOpenSaveFileChooser(String title, ExtensionFileFilter filter) {
Index: trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java	(revision 8419)
@@ -23,5 +23,5 @@
 
     /** Create a new action to upload notes */
-    public UploadNotesAction () {
+    public UploadNotesAction() {
         putValue(SHORT_DESCRIPTION,tr("Upload note changes to server"));
         putValue(NAME, tr("Upload notes"));
Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java	(revision 8419)
@@ -125,5 +125,5 @@
      * Loads history and updates incomplete primitives.
      */
-    private static class HistoryLoaderAndListener extends HistoryLoadTask implements HistoryDataSetListener {
+    private static final class HistoryLoaderAndListener extends HistoryLoadTask implements HistoryDataSetListener {
 
         private final Map<OsmPrimitive, Date> toLoad;
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java	(revision 8419)
@@ -208,5 +208,5 @@
     private void updateModeLocalPreferences() {
         // @formatter:off
-        snapThreshold        = Main.pref.getDouble (prefKey("snap-threshold-percent"), 0.70);
+        snapThreshold        = Main.pref.getDouble(prefKey("snap-threshold-percent"), 0.70);
         snapDefault          = Main.pref.getBoolean(prefKey("snap-default"),      true);
         copyTagsDefault      = Main.pref.getBoolean(prefKey("copy-tags-default"), true);
Index: trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java	(revision 8419)
@@ -35,5 +35,5 @@
      * Constructor for data initialization
      */
-    public FixDataHook () {
+    public FixDataHook() {
         deprecated.add(new FixDataSpace());
         deprecated.add(new FixDataKey("color",            "colour"));
Index: trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 8419)
@@ -1005,5 +1005,5 @@
         Map<String, String> stringMap =  (Map<String, String>) engine.get("stringMap");
         @SuppressWarnings("unchecked")
-        Map<String, List<String>> listMap = (SortedMap<String, List<String>> ) engine.get("listMap");
+        Map<String, List<String>> listMap = (SortedMap<String, List<String>>) engine.get("listMap");
         @SuppressWarnings("unchecked")
         Map<String, List<Collection<String>>> listlistMap = (SortedMap<String, List<Collection<String>>>) engine.get("listlistMap");
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 8419)
@@ -441,5 +441,5 @@
     /* ------*/
 
-    private void updateFlagsNoLock (int flag, boolean value) {
+    private void updateFlagsNoLock(int flag, boolean value) {
         super.updateFlags(flag, value);
     }
Index: trunk/src/org/openstreetmap/josm/data/osm/PrimitiveId.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/PrimitiveId.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/data/osm/PrimitiveId.java	(revision 8419)
@@ -19,8 +19,8 @@
      * Gets the type of object represented by this object.
      *
+     * @return the object type
      * @see Node
      * @see Way
      * @see Relation
-     * @return the object type
      */
     OsmPrimitiveType getType();
Index: trunk/src/org/openstreetmap/josm/data/osm/Tag.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Tag.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/data/osm/Tag.java	(revision 8419)
@@ -102,7 +102,7 @@
     /**
      * This constructs a {@link Tag} by splitting {@code s} on the first equality sign.
-     * @see org.openstreetmap.josm.tools.TextTagParser
      * @param s the string to convert
      * @return the constructed tag
+     * @see org.openstreetmap.josm.tools.TextTagParser
      */
     public static Tag ofString(String s) {
Index: trunk/src/org/openstreetmap/josm/data/osm/Way.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 8419)
@@ -112,8 +112,8 @@
      *
      * @return the real number of nodes in this way.
-     * @since 5847
      *
      * @see #getNodesCount()
      * @see #isClosed()
+     * @since 5847
      */
     public int getRealNodesCount() {
Index: trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java	(revision 8419)
@@ -5,6 +5,6 @@
  * A listener listening for all DataSet changes.
  *
+ * @author nenik
  * @see DataSetListenerAdapter
- * @author nenik
  */
 public interface DataSetListener {
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java	(revision 8419)
@@ -65,6 +65,6 @@
         boolean done = false;
 
-        outcode0 = computeOutCode (x1, y1, xmin, ymin, xmax, ymax);
-        outcode1 = computeOutCode (x2, y2, xmin, ymin, xmax, ymax);
+        outcode0 = computeOutCode(x1, y1, xmin, ymin, xmax, ymax);
+        outcode1 = computeOutCode(x2, y2, xmin, ymin, xmax, ymax);
 
         do {
@@ -115,5 +115,5 @@
      * We cannot use Rectangle.outcode since it does not work with long ints.
      */
-    private static int computeOutCode (long x, long y, long xmin, long ymin, long xmax, long ymax) {
+    private static int computeOutCode(long x, long y, long xmin, long ymin, long xmax, long ymax) {
         int code = 0;
         if (y > ymax) {
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 8419)
@@ -1320,7 +1320,7 @@
                             final double sy = l * (p1.y - p2.y);
 
-                            orientationArrows.moveTo (p2.x + cosPHI * sx - sinPHI * sy, p2.y + sinPHI * sx + cosPHI * sy);
+                            orientationArrows.moveTo(p2.x + cosPHI * sx - sinPHI * sy, p2.y + sinPHI * sx + cosPHI * sy);
                             orientationArrows.lineTo(p2.x, p2.y);
-                            orientationArrows.lineTo (p2.x + cosPHI * sx + sinPHI * sy, p2.y - sinPHI * sx + cosPHI * sy);
+                            orientationArrows.lineTo(p2.x + cosPHI * sx + sinPHI * sy, p2.y - sinPHI * sx + cosPHI * sy);
                         }
                     }
@@ -1351,6 +1351,6 @@
 
                                     onewayPath.moveTo(x, y);
-                                    onewayPath.lineTo (x + cosPHI * sx - sinPHI * sy, y + sinPHI * sx + cosPHI * sy);
-                                    onewayPath.lineTo (x + cosPHI * sx + sinPHI * sy, y - sinPHI * sx + cosPHI * sy);
+                                    onewayPath.lineTo(x + cosPHI * sx - sinPHI * sy, y + sinPHI * sx + cosPHI * sy);
+                                    onewayPath.lineTo(x + cosPHI * sx + sinPHI * sy, y - sinPHI * sx + cosPHI * sy);
                                     onewayPath.lineTo(x, y);
                                 }
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java	(revision 8419)
@@ -432,6 +432,6 @@
                 final double sy = l * (p1.y - p2.y);
 
-                path.lineTo (p2.x + (int) Math.round(cosPHI * sx - sinPHI * sy), p2.y + (int) Math.round(sinPHI * sx + cosPHI * sy));
-                path.moveTo (p2.x + (int) Math.round(cosPHI * sx + sinPHI * sy), p2.y + (int) Math.round(- sinPHI * sx + cosPHI * sy));
+                path.lineTo(p2.x + (int) Math.round(cosPHI * sx - sinPHI * sy), p2.y + (int) Math.round(sinPHI * sx + cosPHI * sy));
+                path.moveTo(p2.x + (int) Math.round(cosPHI * sx + sinPHI * sy), p2.y + (int) Math.round(- sinPHI * sx + cosPHI * sy));
                 path.lineTo(p2.x, p2.y);
             }
Index: trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java	(revision 8419)
@@ -95,5 +95,5 @@
                 + (N_a / 5040.0 * pow(cos(phi), 7.0) * l7coef * pow(l, 7.0)),
                 /* Calculate northing (y) */
-                ArcLengthOfMeridian (phi) / a
+                ArcLengthOfMeridian(phi) / a
                 + (t / 2.0 * N_a * pow(cos(phi), 2.0) * pow(l, 2.0))
                 + (t / 24.0 * N_a * pow(cos(phi), 4.0) * l4coef * pow(l, 4.0))
Index: trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java	(revision 8419)
@@ -62,5 +62,5 @@
  * @since Validator 1.4
  */
-public class DomainValidator extends AbstractValidator {
+public final class DomainValidator extends AbstractValidator {
 
     // Regular expression strings for hostnames (derived from RFC2396 and RFC 1123)
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java	(revision 8419)
@@ -1,3 +1,3 @@
-// License: GPL. See LICENSE file for details.
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.validation.tests;
 
Index: trunk/src/org/openstreetmap/josm/gui/FileDrop.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 8419)
@@ -167,9 +167,9 @@
 
                         // Is it a file list?
-                        if (tr.isDataFlavorSupported (DataFlavor.javaFileListFlavor)) {
+                        if (tr.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) {
 
                             // Say we'll take it.
-                            evt.acceptDrop ( DnDConstants.ACTION_COPY );
-                            Main.trace("FileDrop: file list accepted." );
+                            evt.acceptDrop(DnDConstants.ACTION_COPY);
+                            Main.trace("FileDrop: file list accepted.");
 
                             // Get a useful list
@@ -181,10 +181,10 @@
                             // Alert listener to drop.
                             if( listener != null ) {
-                                listener.filesDropped( files );
+                                listener.filesDropped(files);
                             }
 
                             // Mark that drop is completed.
                             evt.getDropTargetContext().dropComplete(true);
-                            Main.trace("FileDrop: drop complete." );
+                            Main.trace("FileDrop: drop complete.");
                         } else {
                             // this section will check for a reader flavor.
@@ -554,7 +554,7 @@
          * <tt>application/x-net.iharder.dnd.TransferableObject</tt>.
          *
-         * @see Fetcher
          * @param dataClass The {@link java.lang.Class} to use in the custom data flavor
          * @param fetcher The {@link Fetcher} that will return the data object
+         * @see Fetcher
          */
         public TransferableObject(Class<?> dataClass, Fetcher fetcher ) {
Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 8419)
@@ -441,6 +441,6 @@
 
     /**
+     * @return the default position of tnew top-level menus
      * @since 6088
-     * @return the default position of tnew top-level menus
      */
     public int getDefaultMenuPos() {
Index: trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 8419)
@@ -724,11 +724,11 @@
      * It solely depends on the distance to point p.
      *
+     * @param p the point for which to search the nearest segment.
+     * @param ignore a collection of nodes which are not to be returned.
+     * @param predicate the returned objects have to fulfill certain properties.
+     *
      * @return All nodes nearest to point p that are in a belt from
      *      dist(nearest) to dist(nearest)+4px around p and
      *      that are not in ignore.
-     *
-     * @param p the point for which to search the nearest segment.
-     * @param ignore a collection of nodes which are not to be returned.
-     * @param predicate the returned objects have to fulfill certain properties.
      */
     public final List<Node> getNearestNodes(Point p,
@@ -771,10 +771,10 @@
      * It solely depends on the distance to point p.
      *
+     * @param p the point for which to search the nearest segment.
+     * @param predicate the returned objects have to fulfill certain properties.
+     *
      * @return All nodes nearest to point p that are in a belt from
      *      dist(nearest) to dist(nearest)+4px around p.
      * @see #getNearestNodes(Point, Collection, Predicate)
-     *
-     * @param p the point for which to search the nearest segment.
-     * @param predicate the returned objects have to fulfill certain properties.
      */
     public final List<Node> getNearestNodes(Point p, Predicate<OsmPrimitive> predicate) {
@@ -795,11 +795,11 @@
      *
      * Finally, if a node is not found at all, null is returned.
-     *
-     * @return A node within snap-distance to point p,
-     *      that is chosen by the algorithm described.
      *
      * @param p the screen point
      * @param predicate this parameter imposes a condition on the returned object, e.g.
      *        give the nearest node that is tagged.
+     *
+     * @return A node within snap-distance to point p,
+     *      that is chosen by the algorithm described.
      */
     public final Node getNearestNode(Point p, Predicate<OsmPrimitive> predicate, boolean useSelected) {
@@ -965,10 +965,10 @@
      * then, within groups of equally distant segments, prefer those that are selected.
      *
-     * @return all segments within 10px of p that are not in ignore,
-     *          sorted by their perpendicular distance.
-     *
      * @param p the point for which to search the nearest segments.
      * @param ignore a collection of segments which are not to be returned.
      * @param predicate the returned objects have to fulfill certain properties.
+     *
+     * @return all segments within 10px of p that are not in ignore,
+     *          sorted by their perpendicular distance.
      */
     public final List<WaySegment> getNearestWaySegments(Point p,
@@ -996,9 +996,9 @@
      * The result *order* depends on the current map selection state.
      *
+     * @param p the point for which to search the nearest segments.
+     * @param predicate the returned objects have to fulfill certain properties.
+     *
      * @return all segments within 10px of p, sorted by their perpendicular distance.
      * @see #getNearestWaySegments(Point, Collection, Predicate)
-     *
-     * @param p the point for which to search the nearest segments.
-     * @param predicate the returned objects have to fulfill certain properties.
      */
     public final List<WaySegment> getNearestWaySegments(Point p, Predicate<OsmPrimitive> predicate) {
@@ -1106,10 +1106,10 @@
      * It solely depends on the perpendicular distance to point p.
      *
-     * @return all nearest ways to the screen point given that are not in ignore.
-     * @see #getNearestWaySegments(Point, Collection, Predicate)
-     *
      * @param p the point for which to search the nearest ways.
      * @param ignore a collection of ways which are not to be returned.
      * @param predicate the returned object has to fulfill certain properties.
+     *
+     * @return all nearest ways to the screen point given that are not in ignore.
+     * @see #getNearestWaySegments(Point, Collection, Predicate)
      */
     public final List<Way> getNearestWays(Point p,
@@ -1137,9 +1137,9 @@
      * It solely depends on the perpendicular distance to point p.
      *
+     * @param p the point for which to search the nearest ways.
+     * @param predicate the returned object has to fulfill certain properties.
+     *
      * @return all nearest ways to the screen point given.
      * @see #getNearestWays(Point, Collection, Predicate)
-     *
-     * @param p the point for which to search the nearest ways.
-     * @param predicate the returned object has to fulfill certain properties.
      */
     public final List<Way> getNearestWays(Point p, Predicate<OsmPrimitive> predicate) {
@@ -1175,11 +1175,11 @@
      * If nothing is found, return an empty collection.
      *
+     * @param p The point on screen.
+     * @param ignore a collection of ways which are not to be returned.
+     * @param predicate the returned object has to fulfill certain properties.
+     *
      * @return Primitives nearest to the given screen point that are not in ignore.
      * @see #getNearestNodes(Point, Collection, Predicate)
      * @see #getNearestWays(Point, Collection, Predicate)
-     *
-     * @param p The point on screen.
-     * @param ignore a collection of ways which are not to be returned.
-     * @param predicate the returned object has to fulfill certain properties.
      */
     public final List<OsmPrimitive> getNearestNodesOrWays(Point p,
@@ -1207,9 +1207,8 @@
      * It solely depends on the distance to point p.
      *
+     * @param p The point on screen.
+     * @param predicate the returned object has to fulfill certain properties.
      * @return Primitives nearest to the given screen point.
      * @see #getNearestNodesOrWays(Point, Collection, Predicate)
-     *
-     * @param p The point on screen.
-     * @param predicate the returned object has to fulfill certain properties.
      */
     public final List<OsmPrimitive> getNearestNodesOrWays(Point p, Predicate<OsmPrimitive> predicate) {
@@ -1220,10 +1219,9 @@
      * This is used as a helper routine to {@link #getNearestNodeOrWay(Point, Predicate, boolean)}
      * It decides, whether to yield the node to be tested or look for further (way) candidates.
-     *
-     * @return true, if the node fulfills the properties of the function body
      *
      * @param osm node to check
      * @param p point clicked
      * @param use_selected whether to prefer selected nodes
+     * @return true, if the node fulfills the properties of the function body
      */
     private boolean isPrecedenceNode(Node osm, Point p, boolean use_selected) {
@@ -1452,6 +1450,6 @@
      * Sets the current system of measurement.
      * @param somKey The system of measurement key. Must be defined in {@link SystemOfMeasurement#ALL_SYSTEMS}.
+     * @throws IllegalArgumentException if {@code somKey} is not known
      * @since 6056
-     * @throws IllegalArgumentException if {@code somKey} is not known
      */
     public static void setSystemOfMeasurement(String somKey) {
Index: trunk/src/org/openstreetmap/josm/gui/Notification.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/Notification.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/Notification.java	(revision 8419)
@@ -82,6 +82,6 @@
      * @param content any Component to be shown
      *
+     * @return the current Object, for convenience
      * @see #setContent(java.lang.String)
-     * @return the current Object, for convenience
      */
     public Notification setContent(Component content) {
@@ -96,6 +96,6 @@
      * you can use &lt;br&gt; and other markup directly.
      *
+     * @return the current Object, for convenience
      * @see #Notification(java.lang.String)
-     * @return the current Object, for convenience
      */
     public Notification setContent(String msg) {
Index: trunk/src/org/openstreetmap/josm/gui/actionsupport/LogShowDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/actionsupport/LogShowDialog.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/actionsupport/LogShowDialog.java	(revision 8419)
@@ -23,5 +23,5 @@
 
 
-    public LogShowDialog (String title, String msg, String log) {
+    public LogShowDialog(String title, String msg, String log) {
         super(Main.parent, title, new String[] {tr("OK")});
         setButtonIcons(new String[] {"ok.png"});
@@ -32,7 +32,7 @@
         JPanel p = new JPanel(new GridBagLayout());
         JLabel lbl = new JLabel(msg);
-        
+
         lbl.setFont(lbl.getFont().deriveFont(0, 14));
-        
+
         p.add(lbl, GBC.eol().insets(5,0,5,0));
         JosmEditorPane txt = new JosmEditorPane();
@@ -41,10 +41,10 @@
         txt.setEditable(false);
         txt.setOpaque(false);
-        
+
         JScrollPane sp = new JScrollPane(txt);
         sp.setOpaque(false);
         sp.setPreferredSize(new Dimension(600,300));
-        
-        
+
+
         p.add(sp, GBC.eop().insets(5,15,0,0).fill(GBC.HORIZONTAL));
 
Index: trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java	(revision 8419)
@@ -634,5 +634,5 @@
      * Represents a rectangular area of tiles at a given zoom level.
      */
-    private static class TileBounds {
+    private static final class TileBounds {
         private Point min;
         private Point max;
@@ -664,5 +664,5 @@
      * The map view used in this bounding box chooser
      */
-    private static class TileBoundsMapView extends JMapViewer {
+    private static final class TileBoundsMapView extends JMapViewer {
         private Point min;
         private Point max;
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java	(revision 8419)
@@ -782,5 +782,5 @@
      *
      */
-    private 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/tags/PasteTagsConflictResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 8419)
@@ -269,5 +269,5 @@
     }
 
-    class CancelAction extends AbstractAction {
+    final class CancelAction extends AbstractAction {
 
         private CancelAction() {
@@ -285,5 +285,5 @@
     }
 
-    class ApplyAction extends AbstractAction implements PropertyChangeListener {
+    final class ApplyAction extends AbstractAction implements PropertyChangeListener {
 
         private ApplyAction() {
@@ -359,5 +359,5 @@
     }
 
-    private static class StatisticsInfo {
+    private static final class StatisticsInfo {
         public int numTags;
         public Map<OsmPrimitiveType, Integer> sourceInfo;
@@ -370,5 +370,5 @@
     }
 
-    private static class StatisticsTableColumnModel extends DefaultTableColumnModel {
+    private static final class StatisticsTableColumnModel extends DefaultTableColumnModel {
         private StatisticsTableColumnModel() {
             TableCellRenderer renderer = new StatisticsInfoRenderer();
@@ -398,5 +398,5 @@
     }
 
-    private static class StatisticsTableModel extends DefaultTableModel {
+    private static final class StatisticsTableModel extends DefaultTableModel {
         private static final String[] HEADERS = new String[] {tr("Paste ..."), tr("From ..."), tr("To ...") };
         private transient List<StatisticsInfo> data;
@@ -508,5 +508,5 @@
     }
 
-    private static class StatisticsInfoTable extends JPanel {
+    private static final class StatisticsInfoTable extends JPanel {
 
         private JTable infoTable;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 8419)
@@ -69,6 +69,6 @@
      *
      * @return the color used to paint conflicts
+     * @see #paintConflicts
      * @since 1221
-     * @see #paintConflicts
      */
     public static Color getColor() {
@@ -442,5 +442,5 @@
     }
 
-    class SelectAction extends AbstractSelectAction implements ListSelectionListener {
+    final class SelectAction extends AbstractSelectAction implements ListSelectionListener {
         private SelectAction() {
             putValue("help", ht("/Dialog/ConflictList#SelectAction"));
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java	(revision 8419)
@@ -107,5 +107,5 @@
         for (Action a : actions) {
             if (a instanceof LayerAction) {
-                add (((LayerAction) a).createMenuComponent());
+                add(((LayerAction) a).createMenuComponent());
             } else {
                 add(new JMenuItem(a));
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 8419)
@@ -569,5 +569,5 @@
         public FixTask(Collection<TestError> testErrors) {
             super(tr("Fixing errors ..."), false /* don't ignore exceptions */);
-            this.testErrors = testErrors == null ? new ArrayList<TestError> (): testErrors;
+            this.testErrors = testErrors == null ? new ArrayList<TestError>(): testErrors;
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java	(revision 8419)
@@ -120,5 +120,5 @@
     }
 
-    class MouseListener extends PopupMenuLauncher {
+    final class MouseListener extends PopupMenuLauncher {
         private MouseListener() {
             super(popupMenu);
Index: trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java	(revision 8419)
@@ -343,5 +343,5 @@
         protected JTextField nextTF;
 
-        public TFKeyListener (CredentialDialog owner, JTextField currentTF, JTextField nextTF) {
+        public TFKeyListener(CredentialDialog owner, JTextField currentTF, JTextField nextTF) {
             this.owner = owner;
             this.currentTF = currentTF;
@@ -371,5 +371,5 @@
 
         @Override
-        public void keyTyped ( KeyEvent e ){
+        public void keyTyped(KeyEvent e) {
         }
     }
Index: trunk/src/org/openstreetmap/josm/gui/layer/Layer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/Layer.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/layer/Layer.java	(revision 8419)
@@ -478,6 +478,6 @@
      * When the user has chosen a file, checks the file extension, and confirms overwrite if needed.
      * @return The output {@code File}
+     * @see SaveActionBase#createAndOpenSaveFileChooser
      * @since 5459
-     * @see SaveActionBase#createAndOpenSaveFileChooser
      */
     public File createAndOpenSaveFileChooser() {
Index: trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(revision 8419)
@@ -320,5 +320,5 @@
     }
 
-    private int modulo (int a, int b) {
+    private int modulo(int a, int b) {
         return a % b >= 0 ? a%b : a%b+b;
     }
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 8419)
@@ -254,5 +254,5 @@
         components.add(new SynchronizeAudio());
         if (Main.pref.getBoolean("marker.traceaudio", true)) {
-            components.add (new MoveAudio());
+            components.add(new MoveAudio());
         }
         components.add(new JumpToNextMarker(this));
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java	(revision 8419)
@@ -117,7 +117,7 @@
      * @param count count of nodes in parent way or members in parent relation
      * @return A clone of this environment, with the specified parent, index, and context set to {@link Context#LINK}
-     * @since 6175
      * @see #parent
      * @see #index
+     * @since 6175
      */
     public Environment withParentAndIndexAndLinkContext(OsmPrimitive parent, int index, int count) {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 8419)
@@ -109,6 +109,6 @@
      * @param test if <code>true</code> than the icon is request is tested
      * @return image provider for icon (can be <code>null</code> when <code>test</code> is <code>true</code>).
+     * @see #getIcon(IconReference, int,int)
      * @since 8097
-     * @see #getIcon(IconReference, int,int)
      */
     public static ImageProvider getIconProvider(IconReference ref, boolean test) {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java	(revision 8419)
@@ -114,6 +114,6 @@
      * Closes the source input stream previously returned by {@link #getSourceInputStream()} and other linked resources, if applicable.
      * @param is The source input stream that must be closed
+     * @see #getSourceInputStream()
      * @since 6289
-     * @see #getSourceInputStream()
      */
     public void closeSourceInputStream(InputStream is) {
@@ -142,6 +142,6 @@
      *
      * @return image provider for default styles icon
+     * @see #getIconProvider()
      * @since 8097
-     * @see #getIconProvider()
      */
     private static synchronized ImageProvider getDefaultIconProvider() {
@@ -156,6 +156,6 @@
      *
      * @return image provider for styles icon
+     * @see #getIconProvider()
      * @since 8097
-     * @see #getIconProvider()
      */
     protected ImageProvider getSourceIconProvider() {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/AreaPrototype.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/AreaPrototype.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/AreaPrototype.java	(revision 8419)
@@ -10,5 +10,5 @@
     public boolean closed; // if true, it does not apply to unclosed ways
 
-    public AreaPrototype (AreaPrototype a, Range range) {
+    public AreaPrototype(AreaPrototype a, Range range) {
         super(range);
         this.color = a.color;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java	(revision 8419)
@@ -10,5 +10,5 @@
     public Boolean annotate;
 
-    public IconPrototype (IconPrototype i, Range range) {
+    public IconPrototype(IconPrototype i, Range range) {
         super(range);
         this.icon = i.icon;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java	(revision 8419)
@@ -319,5 +319,5 @@
      * Loads preferences to UI controls
      */
-    public final void loadPreferences () {
+    public final void loadPreferences() {
         makeAutoMarkers.setSelected(Main.pref.getBoolean("marker.makeautomarkers", true));
         if(layerName!=null && Main.pref.get("draw.rawgps.lines."+layerName).isEmpty()
Index: trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java	(revision 8419)
@@ -276,5 +276,5 @@
     private class CbAction extends AbstractAction implements ListSelectionListener {
         private PrefJPanel panel;
-        public CbAction (PrefJPanel panel) {
+        public CbAction(PrefJPanel panel) {
             this.panel = panel;
         }
@@ -359,5 +359,5 @@
             try {
                 final TableRowSorter<? extends TableModel> sorter =
-                    (TableRowSorter<? extends TableModel> )shortcutTable.getRowSorter();
+                    (TableRowSorter<? extends TableModel>)shortcutTable.getRowSorter();
                 if (expr == null) {
                     sorter.setRowFilter(null);
Index: trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 8419)
@@ -376,6 +376,6 @@
      * Sets a global font for all UI, replacing default font of current look and feel.
      * @param name Font name. It is up to the caller to make sure the font exists
+     * @throws IllegalArgumentException if name is null
      * @since 7896
-     * @throws IllegalArgumentException if name is null
      */
     public static void setUIFont(String name) {
Index: trunk/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java	(revision 8419)
@@ -72,6 +72,6 @@
      * file from a list in the UI.
      *
+     * @return the selected file
      * @see #setSelectedFile
-     * @return the selected file
      */
     public abstract File getSelectedFile();
@@ -175,7 +175,6 @@
      * to be the file's parent directory.
      *
+     * @param file the selected file
      * @see #getSelectedFile
-     *
-     * @param file the selected file
      */
     public abstract void setSelectedFile(File file);
Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java	(revision 8419)
@@ -19,7 +19,7 @@
  * <a href="https://bugs.openjdk.java.net/browse/JDK-6322854">JDK bug 6322854</a>.
  *
- * @since 5752
  * @see <a href="https://josm.openstreetmap.de/ticket/8404">https://josm.openstreetmap.de/ticket/8404</a>
  * @see <a href="https://hg.netbeans.org/main/rev/33cb2e81b640">https://hg.netbeans.org/main/rev/33cb2e81b640</a>
+ * @since 5752
  */
 public class JosmPasswordField extends JPasswordField implements FocusListener {
Index: trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 8419)
@@ -687,10 +687,9 @@
 
     /**
-     * The specified Node is either the wrong type or was configured
-     * incorrectly.
+     * The specified Node is either the wrong type or was configured incorrectly.
      */
     public static class InvalidLayoutException extends RuntimeException {
         private final transient Node node;
-        public InvalidLayoutException (String msg, Node node) {
+        public InvalidLayoutException(String msg, Node node) {
             super(msg);
             this.node = node;
@@ -897,7 +896,7 @@
          *
          * @param weight a double between 0.0 and 1.0
+         * @throws IllegalArgumentException if weight is not between 0.0 and 1.0
          * @see #getWeight
          * @see MultiSplitLayout#layoutContainer
-         * @throws IllegalArgumentException if weight is not between 0.0 and 1.0
          */
         public void setWeight(double weight) {
@@ -998,6 +997,6 @@
          *
          * @param children List of children
+         * @throws IllegalArgumentException if children is null
          * @see #getChildren
-         * @throws IllegalArgumentException if children is null
          */
         public void setChildren(List<Node> children) {
@@ -1220,5 +1219,5 @@
     }
 
-    private static Node parseModel (Reader r) {
+    private static Node parseModel(Reader r) {
         StreamTokenizer st = new StreamTokenizer(r);
         try {
Index: trunk/src/org/openstreetmap/josm/io/AbstractReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/AbstractReader.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/io/AbstractReader.java	(revision 8419)
@@ -91,5 +91,5 @@
                 if (n == null) {
                     if (id <= 0)
-                        throw new IllegalDataException (
+                        throw new IllegalDataException(
                                 tr("Way with external ID ''{0}'' includes missing node with external ID ''{1}''.",
                                         externalWayId,
Index: trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java	(revision 8419)
@@ -14,9 +14,8 @@
 /**
  * Use this class if you want to cache and store a single file that gets updated regularly.
- * Unless you flush() it will be kept in memory. If you want to cache a lot of data and/or files,
- * use CacheFiles
+ * Unless you flush() it will be kept in memory. If you want to cache a lot of data and/or files, use CacheFiles.
+ * @author xeen
  * @param <T> a {@link Throwable} that may be thrown during {@link #updateData()},
  * use {@link RuntimeException} if no exception must be handled.
- * @author xeen
  * @since 1450
  */
Index: trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java	(revision 8419)
@@ -77,5 +77,5 @@
      * @return The type of credentials agent
      */
-    public final Class<? extends CredentialsAgent> getCredentialsAgentClass () {
+    public final Class<? extends CredentialsAgent> getCredentialsAgentClass() {
         return delegate.getClass();
     }
Index: trunk/src/org/openstreetmap/josm/tools/AlphanumComparator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/AlphanumComparator.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/tools/AlphanumComparator.java	(revision 8419)
@@ -40,5 +40,5 @@
  *
  */
-public class AlphanumComparator implements Comparator<String>, Serializable {
+public final class AlphanumComparator implements Comparator<String>, Serializable {
 
     private static final long serialVersionUID = 1L;
Index: trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java	(revision 8419)
@@ -79,10 +79,10 @@
                 throw new InterruptedException();
         }
-        protected void failed (Exception e) {
+        protected void failed(Exception e) {
             exception = e;
             result = Result.FAILED;
             state = State.NOTPLAYING;
         }
-        protected void ok (State newState) {
+        protected void ok(State newState) {
             result = Result.OK;
             state = newState;
Index: trunk/src/org/openstreetmap/josm/tools/ColorScale.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ColorScale.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/tools/ColorScale.java	(revision 8419)
@@ -10,5 +10,5 @@
  * @since 7319
  */
-public class ColorScale {
+public final class ColorScale {
     private double min, max;
     private Color noDataColor;
Index: trunk/src/org/openstreetmap/josm/tools/Diff.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Diff.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/tools/Diff.java	(revision 8419)
@@ -152,5 +152,5 @@
      It cannot cause incorrect diff output.  */
 
-    private int diag (int xoff, int xlim, int yoff, int ylim) {
+    private int diag(int xoff, int xlim, int yoff, int ylim) {
         final int[] fd = fdiag; // Give the compiler a chance.
         final int[] bd = bdiag; // Additional help for the compiler.
@@ -323,5 +323,5 @@
      All line numbers are origin-0 and discarded lines are not counted.  */
 
-    private void compareseq (int xoff, int xlim, int yoff, int ylim) {
+    private void compareseq(int xoff, int xlim, int yoff, int ylim) {
         /* Slide down the bottom initial diagonal. */
         while (xoff < xlim && yoff < ylim && xvec[xoff] == yvec[yoff]) {
@@ -345,5 +345,5 @@
             /* Find a point of correspondence in the middle of the files.  */
 
-            int d = diag (xoff, xlim, yoff, ylim);
+            int d = diag(xoff, xlim, yoff, ylim);
             int c = cost;
             int b = bdiag[bdiagoff + d];
@@ -357,10 +357,10 @@
             else {
                 /* Use that point to split this problem into two subproblems.  */
-                compareseq (xoff, b, yoff, b - d);
+                compareseq(xoff, b, yoff, b - d);
                 /* This used to use f instead of b,
                    but that is incorrect!
                    It is not necessarily the case that diagonal d
                    has a snake from b to f.  */
-                compareseq (b, xlim, b - d, ylim);
+                compareseq(b, xlim, b - d, ylim);
             }
         }
@@ -494,5 +494,5 @@
        and avoid even thinking about them in the main comparison algorithm.  */
 
-        discard_confusing_lines ();
+        discard_confusing_lines();
 
         /* Now do the main comparison algorithm, considering just the
@@ -509,5 +509,5 @@
         bdiagoff = filevec[1].nondiscardedLines + 1;
 
-        compareseq (0, filevec[0].nondiscardedLines,
+        compareseq(0, filevec[0].nondiscardedLines,
                 0, filevec[1].nondiscardedLines);
         fdiag = null;
@@ -517,5 +517,5 @@
        in cases where that can validly be done.  */
 
-        shift_boundaries ();
+        shift_boundaries();
 
         /* Get the results of comparison in the form of a chain
@@ -631,8 +631,7 @@
          * Mark to be discarded each line that matches no line of another file.
          * If a line matches many lines, mark it as provisionally discardable.
+         * @param counts The count of each equivalence number for the other file.
+         * @return 0=nondiscardable, 1=discardable or 2=provisionally discardable for each line
          * @see #equivCount()
-         * @param counts The count of each equivalence number for the other file.
-         * @return 0=nondiscardable, 1=discardable or 2=provisionally discardable
-         *  for each line
          */
         private byte[] discardable(final int[] counts) {
Index: trunk/src/org/openstreetmap/josm/tools/FontsManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/FontsManager.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/tools/FontsManager.java	(revision 8419)
@@ -17,5 +17,5 @@
  * @since 7383
  */
-public class FontsManager {
+public final class FontsManager {
 
     /**
Index: trunk/src/org/openstreetmap/josm/tools/Geometry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Geometry.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/tools/Geometry.java	(revision 8419)
@@ -424,6 +424,6 @@
      * @param point Point for which a closest point is searched on line (P1,P2)
      * @return The closest point found on line. It may be outside the segment [P1,P2].
+     * @see #closestPointToSegment
      * @since 4134
-     * @see #closestPointToSegment
      */
     public static EastNorth closestPointToLine(EastNorth lineP1, EastNorth lineP2, EastNorth point) {
@@ -690,8 +690,8 @@
     /**
      * Determines whether path from nodes list is oriented clockwise.
-     * @see #isClockwise(Way)
      * @param nodes Nodes list to be checked.
      * @return true if and only if way is oriented clockwise.
      * @throws IllegalArgumentException if way is not closed (see {@link Way#isClosed}).
+     * @see #isClockwise(Way)
      */
     public static boolean isClockwise(List<Node> nodes) {
Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 8419)
@@ -466,6 +466,6 @@
      * Limit the maximum width of the image.
      * @param maxWidth maximum image width
+     * @return the current object, for convenience
      * @see #setMaxSize
-     * @return the current object, for convenience
      */
     public ImageProvider setMaxWidth(int maxWidth) {
@@ -477,6 +477,6 @@
      * Limit the maximum height of the image.
      * @param maxHeight maximum image height
+     * @return the current object, for convenience
      * @see #setMaxSize
-     * @return the current object, for convenience
      */
     public ImageProvider setMaxHeight(int maxHeight) {
@@ -1102,5 +1102,5 @@
             parser.setEntityResolver(new EntityResolver() {
                 @Override
-                public InputSource resolveEntity (String publicId, String systemId) {
+                public InputSource resolveEntity(String publicId, String systemId) {
                     return new InputSource(new ByteArrayInputStream(new byte[0]));
                 }
@@ -1545,6 +1545,6 @@
      * @return the {@code TransparentColor} defined in image reader metadata, or {@code null}
      * @throws IOException if an error occurs during reading
+     * @see <a href="http://docs.oracle.com/javase/7/docs/api/javax/imageio/metadata/doc-files/standard_metadata.html">javax_imageio_1.0 metadata</a>
      * @since 7499
-     * @see <a href="http://docs.oracle.com/javase/7/docs/api/javax/imageio/metadata/doc-files/standard_metadata.html">javax_imageio_1.0 metadata</a>
      */
     public static Color getTransparentColor(ColorModel model, ImageReader reader) throws IOException {
Index: trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java	(revision 8419)
@@ -225,6 +225,6 @@
      *
      * @param locale the locale to use, <code>null</code> for default locale
+     * @return list of codes
      * @since 8283
-     * @return list of codes
      */
     public static Collection<String> getLanguageCodes(Locale l) {
Index: trunk/src/org/openstreetmap/josm/tools/Shortcut.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 8419)
@@ -218,6 +218,6 @@
         if (keyStroke == null) return "";
         String modifText = KeyEvent.getKeyModifiersText(keyStroke.getModifiers());
-        if ("".equals (modifText)) return KeyEvent.getKeyText (keyStroke.getKeyCode ());
-        return modifText + "+" + KeyEvent.getKeyText(keyStroke.getKeyCode ());
+        if ("".equals (modifText)) return KeyEvent.getKeyText(keyStroke.getKeyCode());
+        return modifText + "+" + KeyEvent.getKeyText(keyStroke.getKeyCode());
     }
 
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 8419)
@@ -878,9 +878,9 @@
     /**
      * An alternative to {@link String#trim()} to effectively remove all leading and trailing white characters, including Unicode ones.
-     * @see <a href="http://closingbraces.net/2008/11/11/javastringtrim/">Java’s String.trim has a strange idea of whitespace</a>
-     * @see <a href="https://bugs.openjdk.java.net/browse/JDK-4080617">JDK bug 4080617</a>
      * @param str The string to strip
      * @return <code>str</code>, without leading and trailing characters, according to
      *         {@link Character#isWhitespace(char)} and {@link Character#isSpaceChar(char)}.
+     * @see <a href="http://closingbraces.net/2008/11/11/javastringtrim/">Java’s String.trim has a strange idea of whitespace</a>
+     * @see <a href="https://bugs.openjdk.java.net/browse/JDK-4080617">JDK bug 4080617</a>
      * @since 5772
      */
Index: trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java	(revision 8418)
+++ trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java	(revision 8419)
@@ -54,5 +54,5 @@
 
         @Override
-        public void startElement (String uri, String localName, String qName, Attributes atts) throws SAXException {
+        public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
             if ("".equals(uri)) {
                 super.startElement(namespace, localName, qName, atts);