Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 9246)
@@ -1264,4 +1264,5 @@
     /**
      * Returns {@code o} as collection of {@code o}'s type.
+     * @param <T> object type
      * @param o any object
      * @return {@code o} as collection of {@code o}'s type.
Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9246)
@@ -1338,4 +1338,5 @@
      * Default constructor is used to initialize the struct objects, properties
      * then override some of these default values.
+     * @param <T> klass type
      * @param key main preference key
      * @param klass The struct class
@@ -1352,4 +1353,5 @@
     /**
      * same as above, but returns def if nothing was found
+     * @param <T> klass type
      * @param key main preference key
      * @param def default value
Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java	(revision 9246)
@@ -124,4 +124,6 @@
     /**
      * Returns configured cache object for named cache region
+     * @param <K> key type
+     * @param <V> value type
      * @param cacheName region name
      * @return cache access object
@@ -134,4 +136,6 @@
     /**
      * Returns configured cache object with defined limits of memory cache and disk cache
+     * @param <K> key type
+     * @param <V> value type
      * @param cacheName         region name
      * @param maxMemoryObjects  number of objects to keep in memory
Index: trunk/src/org/openstreetmap/josm/data/gpx/IWithAttributes.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/IWithAttributes.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/data/gpx/IWithAttributes.java	(revision 9246)
@@ -31,4 +31,5 @@
      * Returns the Collection value to which the specified key is mapped,
      * or {@code null} if this map contains no Collection mapping for the key.
+     * @param <T> type of items
      *
      * @param key the key whose associated value is to be returned
Index: trunk/src/org/openstreetmap/josm/data/osm/Storage.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 9246)
@@ -277,4 +277,5 @@
     /**
      * Finds a bucket for given key.
+     * @param <K> type for hashCode and first equals parameter
      * @param ha hash function
      *
@@ -350,6 +351,6 @@
     /**
      * A factory for default hash implementation.
-     * @return a hash implementation that just delegates to object's own
-     * hashCode and equals.
+     * @param <O> type for hash
+     * @return a hash implementation that just delegates to object's own hashCode and equals.
      */
     public static <O> Hash<O, O> defaultHash() {
Index: trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 9246)
@@ -229,4 +229,5 @@
     /**
      * Returns the instance of the given test class.
+     * @param <T> testClass type
      * @param testClass The class of test to retrieve
      * @return the instance of the given test class, if any, or {@code null}
Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 9246)
@@ -535,4 +535,5 @@
      * This method handles all the shortcut handling. It also makes sure that actions that are
      * handled by the OS are not duplicated on the menu.
+     * @param <E> group item enum type
      * @param menu to add the action to
      * @param action the action that should get a menu item
@@ -556,4 +557,5 @@
      * Add a JosmAction to a menu and automatically prints accelerator if available.
      * Also adds a checkbox that may be toggled.
+     * @param <E> group enum item type
      * @param menu to add the action to
      * @param action the action that should get a menu item
@@ -622,4 +624,5 @@
     /**
      * Adds the given menu on the given position to the main menu.
+     * @param <T> menu type
      *
      * @param menu              the menu to add
Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 9246)
@@ -648,4 +648,5 @@
     /**
      * Find panel on top of MapView by class
+     * @param <T> type
      * @param type type of panel
      * @return found panel
Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 9246)
@@ -838,4 +838,5 @@
      *     List&lt;WMSLayer&gt; wmsLayers = getLayersOfType(WMSLayer.class);
      * </pre>
+     * @param <T> layer type
      *
      * @param ofType The layer type.
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java	(revision 9246)
@@ -197,4 +197,6 @@
     /**
      * Wires updater for enabled state to the events. Also updates dialog title if needed.
+     * @param updater updater
+     * @param tree tree on which wire updater
      */
     protected void wireUpdateEnabledStateUpdater(final IEnabledStateUpdating updater, JTree tree) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 9246)
@@ -160,4 +160,5 @@
     /**
      * Creates a layer list and attach it to the given mapView.
+     * @param mapFrame map frame
      */
     protected LayerListDialog(MapFrame mapFrame) {
@@ -831,4 +832,6 @@
         /**
          * Constructs a new {@code MergeAction}.
+         * @param layer the layer (null if layer list if specified)
+         * @param layers the layer list (null if a single layer is specified)
          */
         private MergeAction(Layer layer, List<Layer> layers) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 9246)
@@ -64,4 +64,6 @@
     /**
      * constructor
+     * @param layer data layer
+     * @param presetHandler tagging preset handler
      */
     public MemberTableModel(OsmDataLayer layer, TaggingPresetHandler presetHandler) {
@@ -73,4 +75,8 @@
     }
 
+    /**
+     * Returns the data layer.
+     * @return the data layer
+     */
     public OsmDataLayer getLayer() {
         return layer;
@@ -525,4 +531,5 @@
     /**
      * Replies the set of selected referers. Never null, but may be empty.
+     * @param referenceSet reference set
      *
      * @return the set of selected referers
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java	(revision 9246)
@@ -231,5 +231,6 @@
      * upper left corner is close to <code>p</code>.
      *
-     * @param p  the reference point to check
+     * @param p the reference point to check
+     * @param thisEditor the current editor
      * @return true, if there is another open {@link RelationEditor} whose
      * upper left corner is close to <code>p</code>.
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java	(revision 9246)
@@ -27,5 +27,5 @@
  *
  * @author Christiaan Welvaart &lt;cjw@time4t.net&gt;
- *
+ * @since 1785
  */
 public class RelationNodeMap {
@@ -173,7 +173,8 @@
 
     /**
-     * Return a relation member that is linked to the
-     * member 'i', but has not been popped yet.
+     * Return a relation member that is linked to the member 'i', but has not been popped yet.
      * Return null if there is no such member left.
+     * @param way way key
+     * @return a relation member that is linked to the member 'i', but has not been popped yet
      */
     public Integer popAdjacent(Integer way) {
@@ -295,6 +296,6 @@
 
     /**
-     * Returns some remaining member or null if
-     * every sortable member has been processed.
+     * Returns some remaining member or null if every sortable member has been processed.
+     * @return member key
      */
     public Integer pop() {
@@ -306,5 +307,5 @@
 
         if (remainingOneway.isEmpty()) return null;
-        for (Integer i :remainingOneway.keySet()) { //find oneway, which is connected to more than one way (is between two oneway loops)
+        for (Integer i : remainingOneway.keySet()) { //find oneway, which is connected to more than one way (is between two oneway loops)
             for (Node n : onewayReverseMap.ways.get(i)) {
                 if (onewayReverseMap.nodes.containsKey(n) && onewayReverseMap.nodes.get(n).size() > 1) {
@@ -324,4 +325,5 @@
      * This relation member has been processed.
      * Remove references in the map.nodes.
+     * @param i member key
      */
     private void doneOneway(Integer i) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java	(revision 9246)
@@ -19,9 +19,10 @@
     /**
      * determine, if the way i is a roundabout and if yes, what type of roundabout
+     * @param member relation member
+     * @return roundabout type
      */
     static Direction roundaboutType(RelationMember member) {
         if (member == null || !member.isWay()) return NONE;
-        Way w = member.getWay();
-        return roundaboutType(w);
+        return roundaboutType(member.getWay());
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java	(revision 9246)
@@ -22,4 +22,6 @@
     /**
      * refresh the cache of member WayConnectionTypes
+     * @param members relation members
+     * @return way connections
      */
     public List<WayConnectionType> updateLinks(List<RelationMember> members) {
@@ -215,7 +217,6 @@
 
     /**
-     * Determines the direction of way k with respect to the way ref_i.
-     * The way ref_i is assumed to have the direction ref_direction and
-     * to be the predecessor of k.
+     * Determines the direction of way {@code k} with respect to the way {@code ref_i}.
+     * The way {@code ref_i} is assumed to have the direction {@code ref_direction} and to be the predecessor of {@code k}.
      *
      * If both ways are not linked in any way, NONE is returned.
@@ -224,6 +225,10 @@
      * Let the relation be a route of oneway streets, and someone travels them in the given order.
      * Direction is FORWARD if it is legal and BACKWARD if it is illegal to do so for the given way.
-     *
-     **/
+     * @param ref_i way key
+     * @param ref_direction direction of ref_i
+     * @param k successor of ref_i
+     * @param reversed if {@code true} determine reverse direction
+     * @return direction of way {@code k}
+     */
     private Direction determineDirection(int ref_i, final Direction ref_direction, int k, boolean reversed) {
         if (ref_i < 0 || k < 0 || ref_i >= members.size() || k >= members.size())
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java	(revision 9246)
@@ -35,4 +35,5 @@
      *
      * @param helpTopicUrl  the absolute help topic URL
+     * @param dotest
      * @return the content, filtered and transformed for being displayed in the internal help browser
      * @throws HelpContentReaderException if problem occurs
@@ -68,4 +69,6 @@
      *
      * @param in the input stream
+     * @param dotest if {@code true}, checks if help content is empty
+     * @param url help topic URL
      * @return the content
      * @throws HelpContentReaderException if an exception occurs
Index: trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java	(revision 9246)
@@ -91,4 +91,8 @@
      * The result from the diff algorithm is a "script" (a compressed description of the changes)
      * This method expands this script into a full two column description.
+     * @param script diff script
+     * @param a reference version
+     * @param b current version
+     * @param reversed if {@code true} use {@link DiffItemType#REVERSED} instead of {@link DiffItemType#SAME}
      */
     private void twoColumnDiffFromScript(Diff.Change script, Object[] a, Object[] b, final boolean reversed) {
Index: trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java	(revision 9246)
@@ -53,5 +53,5 @@
      * Synchronizes the local state of an {@link OsmPrimitive} with its state on the
      * server. The method uses an individual GET for the primitive.
-     *
+     * @param type the primitive type
      * @param id the primitive ID
      */
@@ -192,5 +192,6 @@
      * Handles the case that a conflict was detected while uploading where we don't
      * know what {@link OsmPrimitive} actually caused the conflict (for whatever reason)
-     *
+     * @param changesetId changeset ID
+     * @param d changeset date
      */
     protected void handleUploadConflictForClosedChangeset(long changesetId, Date d) {
@@ -211,4 +212,6 @@
      * Handles the case where deleting a node failed because it is still in use in
      * a non-deleted way on the server.
+     * @param e exception
+     * @param conflict conflict
      */
     protected void handleUploadPreconditionFailedConflict(OsmApiException e, Pair<OsmPrimitive, Collection<OsmPrimitive>> conflict) {
Index: trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java	(revision 9246)
@@ -121,6 +121,9 @@
     }
 
-    /** adds layer name label to (this) using the given info. Returns tooltip that
-     * should be added to the panel **/
+    /**
+     * Adds layer name label to (this) using the given info. Returns tooltip that should be added to the panel
+     * @param info information, user preferences and save/upload states of the layer
+     * @return tooltip that should be added to the panel
+     */
     private String addLblLayerName(SaveLayerInfo info) {
         lblLayerName.setIcon(info.getLayer().getIcon());
@@ -130,6 +133,9 @@
     }
 
-    /** adds filename label to (this) using the given info. Returns tooltip that
-     * should be added to the panel */
+    /**
+     * Adds filename label to (this) using the given info. Returns tooltip that should be added to the panel
+     * @param info information, user preferences and save/upload states of the layer
+     * @return tooltip that should be added to the panel
+     */
     private String addLblFilename(SaveLayerInfo info) {
         String tooltip = "";
@@ -157,6 +163,10 @@
     }
 
-    /** makes the given path fit lblFilename, appends ellipsis on the left if it doesn’t fit.
-     * Idea: /home/user/josm → …/user/josm → …/josm; and take the first one that fits */
+    /**
+     * Makes the given path fit lblFilename, appends ellipsis on the left if it doesn’t fit.
+     * Idea: /home/user/josm → …/user/josm → …/josm; and take the first one that fits
+     * @param t complete path
+     * @return shorter path
+     */
     private String makePathFit(String t) {
         boolean hasEllipsis = false;
Index: trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java	(revision 9246)
@@ -80,4 +80,8 @@
     }
 
+    /**
+     * Initialize panel from changeset.
+     * @param cs changeset
+     */
     public void initFromChangeset(Changeset cs) {
         Map<String, String> tags = getDefaultTags();
@@ -103,5 +107,5 @@
     /**
      * Replies the map with the current tags in the tag editor model.
-     *
+     * @param keepEmpty {@code true} to keep empty tags
      * @return the map with the current tags in the tag editor model.
      */
@@ -110,4 +114,8 @@
     }
 
+    /**
+     * Replies the map with the default tags.
+     * @return the map with the default tags
+     */
     public Map<String, String> getDefaultTags() {
         Map<String, String> tags = new HashMap<>();
@@ -116,4 +124,8 @@
     }
 
+    /**
+     * Sets the map with the default tags.
+     * @param tags the map with the default tags
+     */
     public void setDefaultTags(Map<String, String> tags) {
         defaultTags.clear();
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 9246)
@@ -436,8 +436,17 @@
     }
 
+    /**
+     * Returns tags, without empty ones.
+     * @return not-empty tags
+     */
     public Map<String, String> getTags() {
         return getTags(false);
     }
 
+    /**
+     * Returns tags.
+     * @param keepEmpty {@code true} to keep empty tags
+     * @return tags
+     */
     public Map<String, String> getTags(boolean keepEmpty) {
         return applyToTags(keepEmpty);
Index: trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 9246)
@@ -122,4 +122,5 @@
      * <a href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/dispatch.html">Event Dispatch Thread</a>
      * and return a value.
+     * @param <V> the result type of method <tt>call</tt>
      * @param callable The callable to execute
      * @return The computed result
Index: trunk/src/org/openstreetmap/josm/tools/Pair.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Pair.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/tools/Pair.java	(revision 9246)
@@ -69,4 +69,6 @@
     /**
      * Convenient constructor method
+     * @param <U> type of first item
+     * @param <V> type of second item
      * @param u The first item
      * @param v The second item
Index: trunk/src/org/openstreetmap/josm/tools/Predicates.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Predicates.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/tools/Predicates.java	(revision 9246)
@@ -18,4 +18,5 @@
     /**
      * Returns the negation of {@code predicate}.
+     * @param <T> type of items
      * @param predicate the predicate to negate
      * @return the negation of {@code predicate}
@@ -32,4 +33,5 @@
     /**
      * Returns a {@link Predicate} executing {@link Objects#equals}.
+     * @param <T> type of items
      * @param ref the reference object
      * @return a {@link Predicate} executing {@link Objects#equals}
@@ -117,4 +119,5 @@
     /**
      * Returns a {@link Predicate} executing {@link Collection#contains(Object)}.
+     * @param <T> type of items
      * @param target collection
      * @return a {@link Predicate} executing {@link Collection#contains(Object)}
@@ -131,4 +134,5 @@
     /**
      * Returns a {@link Predicate} testing whether objects are {@code null}.
+     * @param <T> type of items
      * @return a {@link Predicate} testing whether objects are {@code null}
      */
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 9245)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 9246)
@@ -95,4 +95,5 @@
     /**
      * Tests whether {@code predicate} applies to at least one element from {@code collection}.
+     * @param <T> type of items
      * @param collection the collection
      * @param predicate the predicate
@@ -109,4 +110,5 @@
     /**
      * Tests whether {@code predicate} applies to all elements from {@code collection}.
+     * @param <T> type of items
      * @param collection the collection
      * @param predicate the predicate
@@ -149,4 +151,5 @@
     /**
      * Returns the first element from {@code items} which is non-null, or null if all elements are null.
+     * @param <T> type of items
      * @param items the items to look for
      * @return first non-null item if there is one
@@ -165,4 +168,6 @@
      * Filter a collection by (sub)class.
      * This is an efficient read-only implementation.
+     * @param <S> Super type of items
+     * @param <T> type of items
      * @param collection the collection
      * @param klass the (sub)class
@@ -349,4 +354,5 @@
     /**
      * Copies the given array. Unlike {@link Arrays#copyOf}, this method is null-safe.
+     * @param <T> type of items
      * @param array The array to copy
      * @return A copy of the original array, or {@code null} if {@code array} is null
@@ -657,4 +663,5 @@
     /**
      * Topological sort.
+     * @param <T> type of items
      *
      * @param dependencies contains mappings (key -&gt; value). In the final list of sorted objects, the key will come
@@ -1225,4 +1232,5 @@
     /**
      * Adds the given item at the end of a new copy of given array.
+     * @param <T> type of items
      * @param array The source array
      * @param item The item to add