Index: trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 9243)
@@ -196,5 +196,7 @@
         private boolean lastWayReverse;
 
-        /** Constructor */
+        /** Constructor
+         * @param ways available ways
+         */
         WayTraverser(Collection<WayInPolygon> ways) {
             availableWays = new HashSet<>(ways);
@@ -260,4 +262,7 @@
         /**
          * Returns oriented angle (N1N2, N1N3) in range [0; 2*Math.PI[
+         * @param N1 first node
+         * @param N2 second node
+         * @param N3 third node
          * @return oriented angle (N1N2, N1N3) in range [0; 2*Math.PI[
          */
Index: trunk/src/org/openstreetmap/josm/command/PurgeCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/PurgeCommand.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/command/PurgeCommand.java	(revision 9243)
@@ -51,4 +51,7 @@
      *  - Each element of makeIncomplete must not be new and must have only
      *      referrers that are either a relation or included in toPurge.
+     * @param layer OSM data layer
+     * @param toPurge primitives to purge
+     * @param makeIncomplete primitives to make incomplete
      */
     public PurgeCommand(OsmDataLayer layer, Collection<OsmPrimitive> toPurge, Collection<OsmPrimitive> makeIncomplete) {
@@ -142,4 +145,5 @@
      * Sorts a collection of primitives such that for each object
      * its referrers come later in the sorted collection.
+     * @param sel collection of primitives to sort
      * @return sorted list
      */
Index: trunk/src/org/openstreetmap/josm/command/RotateCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/RotateCommand.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/command/RotateCommand.java	(revision 9243)
@@ -35,4 +35,6 @@
      * Creates a RotateCommand.
      * Assign the initial object set, compute pivot point and inital rotation angle.
+     * @param objects objects to fetch nodes from
+     * @param currentEN cuurent eats/north
      */
     public RotateCommand(Collection<OsmPrimitive> objects, EastNorth currentEN) {
@@ -48,4 +50,5 @@
     /**
      * Get angle between the horizontal axis and the line formed by the pivot and given point.
+     * @param currentEN cuurent eats/north
      * @return angle between the horizontal axis and the line formed by the pivot and given point
      **/
Index: trunk/src/org/openstreetmap/josm/command/ScaleCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/ScaleCommand.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/command/ScaleCommand.java	(revision 9243)
@@ -31,4 +31,6 @@
      * Computation of pivot point is done by the same rules that are used in
      * the "align nodes in circle" action.
+     * @param objects objects to fetch nodes from
+     * @param currentEN cuurent eats/north
      */
     public ScaleCommand(Collection<OsmPrimitive> objects, EastNorth currentEN) {
Index: trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java	(revision 9243)
@@ -46,4 +46,5 @@
      * Creates a TransformNodesObject.
      * Find out the impacted nodes and store their initial state.
+     * @param objects objects to fetch nodes from
      */
     public TransformNodesCommand(Collection<OsmPrimitive> objects) {
Index: trunk/src/org/openstreetmap/josm/data/Bounds.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Bounds.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/Bounds.java	(revision 9243)
@@ -79,4 +79,6 @@
     /**
      * Construct bounds out of two points. Coords will be rounded.
+     * @param min min lat/lon
+     * @param max max lat/lon
      */
     public Bounds(LatLon min, LatLon max) {
@@ -88,4 +90,8 @@
     }
 
+    /**
+     * Constructs bounds out a single point.
+     * @param b lat/lon
+     */
     public Bounds(LatLon b) {
         this(b, true);
@@ -360,4 +366,6 @@
      * The two bounds intersect? Compared to java Shape.intersects, if does not use
      * the interior but the closure. ("&gt;=" instead of "&gt;")
+     * @param b other bounds
+     * @return {@code true} if the two bounds intersect
      */
     public boolean intersects(Bounds b) {
Index: trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 9243)
@@ -702,8 +702,9 @@
         /**
          * substitute ${expression} = expression evaluated by JavaScript
+         * @param s string
+         * @return evaluation result
          */
         private String evalVars(String s) {
-            Pattern p = Pattern.compile("\\$\\{([^\\}]*)\\}");
-            Matcher mr =  p.matcher(s);
+            Matcher mr = Pattern.compile("\\$\\{([^\\}]*)\\}").matcher(s);
             StringBuffer sb = new StringBuffer();
             while (mr.find()) {
@@ -810,6 +811,8 @@
 
         /**
-        * Delete items from @param mainpref collections that match items from @param fragment collections
-        */
+         * Delete items from {@code mainpref} collections that match items from {@code fragment} collections.
+         * @param fragment preferences
+         * @param mainpref main preferences
+         */
         private static void deletePreferenceValues(Preferences fragment, Preferences mainpref) {
 
Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9243)
@@ -822,5 +822,5 @@
      * @param value the value of the setting. Can be null or "" which both removes
      *  the key-value entry.
-     * @return true, if something has changed (i.e. value is different than before)
+     * @return {@code true}, if something has changed (i.e. value is different than before)
      */
     public boolean put(final String key, String value) {
@@ -1178,5 +1178,5 @@
      * @param setting the value of the setting. In case it is null, the key-value
      * entry will be removed.
-     * @return true, if something has changed (i.e. value is different than before)
+     * @return {@code true}, if something has changed (i.e. value is different than before)
      */
     public boolean putSetting(final String key, Setting<?> setting) {
@@ -1247,4 +1247,10 @@
     }
 
+    /**
+     * Put a collection.
+     * @param key key
+     * @param value value
+     * @return {@code true}, if something has changed (i.e. value is different than before)
+     */
     public boolean putCollection(String key, Collection<String> value) {
         return putSetting(key, value == null ? null : ListSetting.create(value));
@@ -1253,4 +1259,8 @@
     /**
      * Saves at most {@code maxsize} items of collection {@code val}.
+     * @param key key
+     * @param maxsize max number of items to save
+     * @param val value
+     * @return {@code true}, if something has changed (i.e. value is different than before)
      */
     public boolean putCollectionBounded(String key, int maxsize, Collection<String> val) {
@@ -1268,4 +1278,7 @@
      * Used to read a 2-dimensional array of strings from the preference file.
      * If not a single entry could be found, <code>def</code> is returned.
+     * @param key preference key
+     * @param def default array value
+     * @return array value
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -1280,4 +1293,10 @@
     }
 
+    /**
+     * Put an array.
+     * @param key key
+     * @param value value
+     * @return {@code true}, if something has changed (i.e. value is different than before)
+     */
     public boolean putArray(String key, Collection<Collection<String>> value) {
         return putSetting(key, value == null ? null : ListListSetting.create(value));
@@ -1333,4 +1352,8 @@
     /**
      * same as above, but returns def if nothing was found
+     * @param key main preference key
+     * @param def default value
+     * @param klass The struct class
+     * @return a list of objects of type T or {@code def} if nothing was found
      */
     public <T> List<T> getListOfStructs(String key, Collection<T> def, Class<T> klass) {
Index: trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java	(revision 9243)
@@ -13,10 +13,24 @@
 public class ProjectionBounds {
     /**
-     * The minimum and maximum coordinates.
+     * The minimum east coordinate.
      */
-    public double minEast, minNorth, maxEast, maxNorth;
+    public double minEast;
+    /**
+     * The minimum north coordinate.
+     */
+    public double minNorth;
+    /**
+     * The maximum east coordinate.
+     */
+    public double maxEast;
+    /**
+     * The minimum north coordinate.
+     */
+    public double maxNorth;
 
     /**
      * Construct bounds out of two points.
+     * @param min min east/north
+     * @param max max east/north
      */
     public ProjectionBounds(EastNorth min, EastNorth max) {
@@ -27,4 +41,8 @@
     }
 
+    /**
+     * Construct bounds out of a single point.
+     * @param p east/north
+     */
     public ProjectionBounds(EastNorth p) {
         this.minEast = this.maxEast = p.east();
@@ -32,4 +50,10 @@
     }
 
+    /**
+     * Construct bounds out of a center point and east/north dimensions.
+     * @param center center east/north
+     * @param east east dimension
+     * @param north north dimension
+     */
     public ProjectionBounds(EastNorth center, double east, double north) {
         this.minEast = center.east()-east/2.0;
@@ -39,4 +63,11 @@
     }
 
+    /**
+     * Construct bounds out of two points.
+     * @param minEast min east
+     * @param minNorth min north
+     * @param maxEast max east
+     * @param maxNorth max north
+     */
     public ProjectionBounds(double minEast, double minNorth, double maxEast, double maxNorth) {
         this.minEast = minEast;
@@ -46,4 +77,8 @@
     }
 
+    /**
+     * Extends bounds to include point {@code e}.
+     * @param e east/north to include
+     */
     public void extend(EastNorth e) {
         if (e.east() < minEast) {
@@ -61,4 +96,8 @@
     }
 
+    /**
+     * Returns the center east/north.
+     * @return the center east/north
+     */
     public EastNorth getCenter() {
         return new EastNorth((minEast + maxEast) / 2.0, (minNorth + maxNorth) / 2.0);
@@ -73,4 +112,6 @@
      * The two bounds intersect? Compared to java Shape.intersects, if does not use
      * the interior but the closure. ("&gt;=" instead of "&gt;")
+     * @param b projection bounds
+     * @return {@code true} if the two bounds intersect
      */
     public boolean intersects(ProjectionBounds b) {
@@ -81,8 +122,16 @@
     }
 
+    /**
+     * Returns the min east/north.
+     * @return the min east/north
+     */
     public EastNorth getMin() {
         return new EastNorth(minEast, minNorth);
     }
 
+    /**
+     * Returns the max east/north.
+     * @return the max east/north
+     */
     public EastNorth getMax() {
         return new EastNorth(maxEast, maxNorth);
Index: trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java	(revision 9243)
@@ -156,6 +156,8 @@
     /**
      * Compares two EastNorth values
+     * @param other other east.north
+     * @param e epsilon
      *
-     * @return true if "x" and "y" values are within 1E-6 of each other
+     * @return true if "x" and "y" values are within epsilon {@code e} of each other
      */
     public boolean equalsEpsilon(EastNorth other, double e) {
Index: trunk/src/org/openstreetmap/josm/data/coor/LatLon.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/coor/LatLon.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/coor/LatLon.java	(revision 9243)
@@ -115,4 +115,5 @@
      * For example, a value of -181 will return +179, a value of +181 will return -179.
      * @param value A longitude value not restricted to the [-180,+180] range.
+     * @return a valid OSM longitude [-180,+180]
      */
     public static double toIntervalLon(double value) {
@@ -237,7 +238,7 @@
 
     /**
+     * @param other other lat/lon
      * @return <code>true</code> if the other point has almost the same lat/lon
-     * values, only differing by no more than
-     * 1 / {@link #MAX_SERVER_PRECISION MAX_SERVER_PRECISION}.
+     * values, only differing by no more than 1 / {@link #MAX_SERVER_PRECISION MAX_SERVER_PRECISION}.
      */
     public boolean equalsEpsilon(LatLon other) {
@@ -247,6 +248,6 @@
 
     /**
-     * @return <code>true</code>, if the coordinate is outside the world, compared
-     * by using lat/lon.
+     * Determines if this lat/lon is outside of the world
+     * @return <code>true</code>, if the coordinate is outside the world, compared by using lat/lon.
      */
     public boolean isOutSideWorld() {
@@ -257,4 +258,6 @@
 
     /**
+     * Determines if this lat/lon is within the given bounding box.
+     * @param b bounding box
      * @return <code>true</code> if this is within the given bounding box.
      */
@@ -330,4 +333,5 @@
     /**
      * Returns this lat/lon pair in human-readable format separated by {@code separator}.
+     * @param separator values separator
      * @return String in the format {@code "1.23456[separator]2.34567"}
      */
@@ -376,6 +380,6 @@
 
     /**
-     * Returns the value rounded to OSM precisions, i.e. to
-     * LatLon.MAX_SERVER_PRECISION
+     * Returns the value rounded to OSM precisions, i.e. to {@link LatLon#MAX_SERVER_PRECISION}.
+     * @param value lat/lon value
      *
      * @return rounded value
@@ -388,4 +392,5 @@
      * Returns the value rounded to OSM precision. This function is now the same as
      * {@link #roundToOsmPrecision(double)}, since the rounding error has been fixed.
+     * @param value lat/lon value
      *
      * @return rounded value
Index: trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(revision 9243)
@@ -449,4 +449,5 @@
      * If set to true, this object is incomplete, which means only the id
      * and type is known (type is the objects instance class)
+     * @param incomplete incomplete flag value
      */
     protected void setIncomplete(boolean incomplete) {
@@ -649,4 +650,6 @@
     /**
      * Returns true if the {@code key} corresponds to an OSM true value.
+     * @param key OSM key
+     * @return {@code true} if the {@code key} corresponds to an OSM true value
      * @see OsmUtils#isTrue(String)
      */
@@ -657,4 +660,6 @@
     /**
      * Returns true if the {@code key} corresponds to an OSM false value.
+     * @param key OSM key
+     * @return {@code true} if the {@code key} corresponds to an OSM false value
      * @see OsmUtils#isFalse(String)
      */
@@ -725,4 +730,5 @@
     /**
      * What to do, when the tags have changed by one of the tag-changing methods.
+     * @param originalKeys original tags
      */
     protected abstract void keysChangedImpl(Map<String, String> originalKeys);
Index: trunk/src/org/openstreetmap/josm/data/osm/BBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/BBox.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/BBox.java	(revision 9243)
@@ -114,4 +114,6 @@
     /**
      * Extends this bbox to include the point (x, y)
+     * @param x X coordinate
+     * @param y Y coordinate
      */
     public final void add(double x, double y) {
@@ -146,6 +148,7 @@
 
     /**
-     * Tests, weather the bbox b lies completely inside
-     * this bbox.
+     * Tests, whether the bbox {@code b} lies completely inside this bbox.
+     * @param b bounding box
+     * @return {@code true} if {@code b} lies completely inside this bbox
      */
     public boolean bounds(BBox b) {
@@ -159,5 +162,7 @@
 
     /**
-     * Tests, weather the Point c lies within the bbox.
+     * Tests, whether the Point {@code c} lies within the bbox.
+     * @param c point
+     * @return {@code true} if {@code c} lies within the bbox
      */
     public boolean bounds(LatLon c) {
@@ -171,6 +176,8 @@
 
     /**
-     * Tests, weather two BBoxes intersect as an area.
+     * Tests, whether two BBoxes intersect as an area.
      * I.e. whether there exists a point that lies in both of them.
+     * @param b other bounding box
+     * @return {@code true} if this bbox intersects with the other
      */
     public boolean intersects(BBox b) {
Index: trunk/src/org/openstreetmap/josm/data/osm/Hash.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Hash.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/Hash.java	(revision 9243)
@@ -10,4 +10,6 @@
  * For use cases, see {@link Storage}.
  * @author nenik
+ * @param <K> type for hashCode and first equals parameter
+ * @param <T> type for second equals parameter
  */
 public interface Hash<K, T> {
Index: trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java	(revision 9243)
@@ -47,4 +47,5 @@
          * Constructs a new {@code JoinedPolygon} from given list of ways.
          * @param ways The ways used to build joined polygon
+         * @param reversed list of reversed states
          */
         public JoinedPolygon(List<Way> ways, List<Boolean> reversed) {
@@ -94,5 +95,5 @@
      */
     static class PolygonLevel {
-        public final int level; //nesting level , even for outer, odd for inner polygons.
+        public final int level; // nesting level, even for outer, odd for inner polygons.
         public final JoinedPolygon outerWay;
 
@@ -298,4 +299,5 @@
     /**
      * Collects outer way and corresponding inner ways from all boundaries.
+     * @param boundaryWays boundary ways
      * @return the outermostWay, or {@code null} if intersection found.
      */
@@ -354,4 +356,6 @@
         /**
          * Collects outer way and corresponding inner ways from all boundaries.
+         * @param level nesting level
+         * @param boundaryWays boundary ways
          * @return the outermostWay, or {@code null} if intersection found.
          */
Index: trunk/src/org/openstreetmap/josm/data/osm/Node.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Node.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/Node.java	(revision 9243)
@@ -109,4 +109,6 @@
     /**
      * To be used only by Dataset.reindexNode
+     * @param coor lat/lon
+     * @param eastNorth east/north
      */
     protected void setCoorInternal(LatLon coor, EastNorth eastNorth) {
@@ -354,4 +356,8 @@
      * Tests whether {@code this} node is connected to {@code otherNode} via at most {@code hops} nodes
      * matching the {@code predicate} (which may be {@code null} to consider all nodes).
+     * @param otherNodes other nodes
+     * @param hops number of hops
+     * @param predicate predicate to match
+     * @return {@code true} if {@code this} node mets the conditions
      */
     public boolean isConnectedTo(final Collection<Node> otherNodes, final int hops, Predicate<Node> predicate) {
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 9243)
@@ -477,6 +477,6 @@
     /**
      * Remove the disabled flag from the primitive.
-     * Afterwards, the primitive is displayed normally and can be selected
-     * again.
+     * Afterwards, the primitive is displayed normally and can be selected again.
+     * @return {@code true} if a change occurred
      */
     public boolean unsetDisabledState() {
@@ -493,4 +493,5 @@
     /**
      * Set binary property used internally by the filter mechanism.
+     * @param isExplicit new "disabled type" flag value
      */
     public void setDisabledType(boolean isExplicit) {
@@ -500,4 +501,5 @@
     /**
      * Set binary property used internally by the filter mechanism.
+     * @param isExplicit new "hidden type" flag value
      */
     public void setHiddenType(boolean isExplicit) {
@@ -506,6 +508,6 @@
 
     /**
-     * Replies true, if this primitive is disabled. (E.g. a filter
-     * applies)
+     * Replies true, if this primitive is disabled. (E.g. a filter applies)
+     * @return {@code true} if this object has the "disabled" flag enabled
      */
     public boolean isDisabled() {
@@ -514,6 +516,6 @@
 
     /**
-     * Replies true, if this primitive is disabled and marked as
-     * completely hidden on the map.
+     * Replies true, if this primitive is disabled and marked as completely hidden on the map.
+     * @return {@code true} if this object has both the "disabled" and "hide if disabled" flags enabled
      */
     public boolean isDisabledAndHidden() {
@@ -523,4 +525,5 @@
     /**
      * Get binary property used internally by the filter mechanism.
+     * @return {@code true} if this object has the "hidden type" flag enabled
      */
     public boolean getHiddenType() {
@@ -530,4 +533,5 @@
     /**
      * Get binary property used internally by the filter mechanism.
+     * @return {@code true} if this object has the "disabled type" flag enabled
      */
     public boolean getDisabledType() {
@@ -535,8 +539,16 @@
     }
 
+    /**
+     * Determines if this object is selectable.
+     * @return {@code true} if this object is selectable
+     */
     public boolean isSelectable() {
         return (flags & (FLAG_DELETED + FLAG_INCOMPLETE + FLAG_DISABLED + FLAG_HIDE_IF_DISABLED)) == 0;
     }
 
+    /**
+     * Determines if this object is drawable.
+     * @return {@code true} if this object is drawable
+     */
     public boolean isDrawable() {
         return (flags & (FLAG_DELETED + FLAG_INCOMPLETE + FLAG_HIDE_IF_DISABLED)) == 0;
@@ -764,4 +776,5 @@
     /**
      * Returns {@link #getKeys()} for which {@code key} does not fulfill {@link #isUninterestingKey}.
+     * @return list of interesting tags
      */
     public Map<String, String> getInterestingTags() {
@@ -883,4 +896,5 @@
     /**
      * true if this object has direction dependent tags (e.g. oneway)
+     * @return {@code true} if this object has direction dependent tags
      */
     public boolean hasDirectionKeys() {
@@ -888,4 +902,8 @@
     }
 
+    /**
+     * true if this object has the "reversed diretion" flag enabled
+     * @return {@code true} if this object has the "reversed diretion" flag enabled
+     */
     public boolean reversedDirection() {
         return (flags & FLAG_DIRECTION_REVERSED) != 0;
@@ -1082,4 +1100,5 @@
       Return true, if this primitive is referred by at least n ways
       @param n Minimal number of ways to return true. Must be positive
+     * @return {@code true} if this primitive is referred by at least n ways
      */
     public final boolean isReferredByWays(int n) {
@@ -1117,4 +1136,5 @@
      * Get and write all attributes from the parameter. Does not fire any listener, so
      * use this only in the data initializing phase
+     * @param other other primitive
      */
     public void cloneFrom(OsmPrimitive other) {
@@ -1325,4 +1345,5 @@
     /**
      * Replies the display name of a primitive formatted by <code>formatter</code>
+     * @param formatter formatter to use
      *
      * @return the display name
@@ -1362,4 +1383,5 @@
     /**
      * Replies the set of referring relations
+     * @param primitives primitives to fetch relations from
      *
      * @return the set of referring relations
Index: trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 9243)
@@ -17,5 +17,6 @@
  *
  * This class is (no longer) thread safe.
- *
+ * @param <T> type of primitives
+ * @since 2165
  */
 public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
@@ -85,4 +86,5 @@
         /**
          * Constructor for root node
+         * @param buckets quadbuckets
          */
         QBLevel(final QuadBuckets<T> buckets) {
Index: trunk/src/org/openstreetmap/josm/data/osm/Relation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Relation.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/Relation.java	(revision 9243)
@@ -349,4 +349,5 @@
      * Obtains all members with member.member == primitive
      * @param primitives the primitives to check for
+     * @return all relation members for the given primitives
      */
     public Collection<RelationMember> getMembersFor(final Collection<? extends OsmPrimitive> primitives) {
Index: trunk/src/org/openstreetmap/josm/data/osm/Storage.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 9243)
@@ -68,4 +68,5 @@
  *
  * @author nenik
+ * @param <T> type of stored objects
  */
 public class Storage<T> extends AbstractSet<T> {
@@ -104,4 +105,5 @@
     /**
      * Constructs a new {@code Storage} with given capacity.
+     * @param capacity capacity
      */
     public Storage(int capacity) {
@@ -266,4 +268,6 @@
     /**
      * Additional mixing of hash
+     * @param h hash
+     * @return new hash
      */
     private static int rehash(int h) {
@@ -273,4 +277,5 @@
     /**
      * Finds a bucket for given key.
+     * @param ha hash function
      *
      * @param key The key to compare
Index: trunk/src/org/openstreetmap/josm/data/osm/User.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/User.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/User.java	(revision 9243)
@@ -189,5 +189,9 @@
     }
 
-    /** private constructor, only called from get method. */
+    /**
+     * Private constructor, only called from get method.
+     * @param uid user id
+     * @param name user name
+     */
     private User(long uid, String name) {
         this.uid = uid;
Index: trunk/src/org/openstreetmap/josm/data/osm/Way.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 9243)
@@ -80,4 +80,6 @@
     /**
      * Prevent directly following identical nodes in ways.
+     * @param nodes list of nodes
+     * @return {@code nodes} with consecutive identical nodes removed
      */
     private static List<Node> removeDouble(List<Node> nodes) {
Index: trunk/src/org/openstreetmap/josm/data/osm/WaySegment.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/WaySegment.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/WaySegment.java	(revision 9243)
@@ -48,4 +48,8 @@
     /**
      * Determines and returns the way segment for the given way and node pair.
+     * @param way way
+     * @param first first node
+     * @param second second node
+     * @return way segment
      * @throws IllegalArgumentException if the node pair is not part of way
      */
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java	(revision 9243)
@@ -59,4 +59,12 @@
      * Cohen–Sutherland algorithm.
      * See <a href="https://en.wikipedia.org/wiki/Cohen%E2%80%93Sutherland_algorithm">Wikipedia article</a>
+     * @param x1 X coordinate of first point
+     * @param y1 Y coordinate of first point
+     * @param x2 X coordinate of second point
+     * @param y2 Y coordinate of second point
+     * @param xmin minimal X coordinate
+     * @param ymin minimal Y coordinate
+     * @param xmax maximal X coordinate
+     * @param ymax maximal Y coordinate
      * @return true, if line is visible in the given clip region
      */
@@ -114,5 +122,12 @@
     /**
      * The outcode of the point.
-     * We cannot use Rectangle.outcode since it does not work with long ints.
+     * We cannot use {@link Rectangle#outcode} since it does not work with long ints.
+     * @param x X coordinate
+     * @param y Y coordinate
+     * @param xmin minimal X coordinate
+     * @param ymin minimal Y coordinate
+     * @param xmax maximal X coordinate
+     * @param ymax maximal Y coordinate
+     * @return outcode
      */
     private static int computeOutCode(long x, long y, long xmin, long ymin, long xmax, long ymax) {
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java	(revision 9243)
@@ -258,4 +258,7 @@
     /**
      * <p>Creates an instance of the currently active renderer.</p>
+     * @param g Graphics
+     * @param viewport Navigatable component
+     * @param isInactiveMode {@code true} if the paint visitor shall render OSM objects such that they look inactive
      * @return an instance of the currently active renderer
      *
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 9243)
@@ -1004,4 +1004,6 @@
      * highlights a given point by drawing a rounded rectangle around it. Give the
      * size of the object you want to be highlighted, width is added automatically.
+     * @param p point
+     * @param size highlight size
      */
     private void drawPointHighlight(Point p, int size) {
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java	(revision 9243)
@@ -222,4 +222,5 @@
      * @param c Third value
      * @param d Fourth value
+     * @return maximumof {@code a}, {@code b}, {@code c}, {@code d}
      */
     private static int max(int a, int b, int c, int d) {
Index: trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java	(revision 9243)
@@ -266,4 +266,5 @@
      * Returns isometric latitude of phi on given first eccentricity (e)
      * @param phi The local latitude (radians).
+     * @param e first eccentricity
      * @return isometric latitude of phi on first eccentricity (e)
      */
@@ -286,8 +287,9 @@
 
     /**
-     * Returns geographic latitude of isometric latitude of first eccentricity (e)
-     * and epsilon precision
-     * @return geographic latitude of isometric latitude of first eccentricity (e)
-     * and epsilon precision
+     * Returns geographic latitude of isometric latitude of first eccentricity (e) and epsilon precision
+     * @param latIso isometric latitude
+     * @param e first eccentricity
+     * @param epsilon epsilon precision
+     * @return geographic latitude of isometric latitude of first eccentricity (e) and epsilon precision
      */
     public double latitude(double latIso, double e, double epsilon) {
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/Datum.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/Datum.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/Datum.java	(revision 9243)
@@ -30,12 +30,15 @@
 
     /**
-     * Convert lat/lon from this datum to WGS84 datum.
+     * Convert lat/lon from this datum to {@link Ellipsoid#WGS84} datum.
+     * @param ll original lat/lon in this datum
+     * @return lat/lon converted to WGS84
      */
     LatLon toWGS84(LatLon ll);
 
     /**
-     * Convert lat/lon from WGS84 to this datum.
+     * Convert lat/lon from {@link Ellipsoid#WGS84} to this datum.
+     * @param ll original lat/lon in WGS84
+     * @return converted lat/lon in this datum
      */
     LatLon fromWGS84(LatLon ll);
-
 }
Index: trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java	(revision 9243)
@@ -130,4 +130,6 @@
     /**
      * auxiliary function t
+     * @param lat_rad latitude in radians
+     * @return result
      */
     protected double t(double lat_rad) {
@@ -138,4 +140,6 @@
     /**
      * auxiliary function m
+     * @param lat_rad latitude in radians
+     * @return result
      */
     protected double m(double lat_rad) {
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 9243)
@@ -163,4 +163,8 @@
         /**
          * Evaluates given object as {@link Expression} or {@link String} on the matched {@link OsmPrimitive} and {@code matchingSelector}.
+         * @param obj object to evaluate ({@link Expression} or {@link String})
+         * @param p OSM primitive
+         * @param matchingSelector matching selector
+         * @return result string
          */
         private static String evaluateObject(final Object obj, final OsmPrimitive p, final Selector matchingSelector) {
@@ -178,4 +182,6 @@
         /**
          * Creates a fixing command which executes a {@link ChangePropertyCommand} on the specified tag.
+         * @param obj object to evaluate ({@link Expression} or {@link String})
+         * @return created fix command
          */
         static FixCommand fixAdd(final Object obj) {
@@ -193,9 +199,10 @@
                 }
             };
-
         }
 
         /**
          * Creates a fixing command which executes a {@link ChangePropertyCommand} to delete the specified key.
+         * @param obj object to evaluate ({@link Expression} or {@link String})
+         * @return created fix command
          */
         static FixCommand fixRemove(final Object obj) {
@@ -217,4 +224,7 @@
         /**
          * Creates a fixing command which executes a {@link ChangePropertyKeyCommand} on the specified keys.
+         * @param oldKey old key
+         * @param newKey new key
+         * @return created fix command
          */
         static FixCommand fixChangeKey(final String oldKey, final String newKey) {
@@ -416,4 +426,9 @@
          * Determines the {@code index}-th key/value/tag (depending on {@code type}) of the
          * {@link org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector}.
+         * @param matchingSelector matching selector
+         * @param index index
+         * @param type selector type ("key", "value" or "tag")
+         * @param p OSM primitive
+         * @return argument value, can be {@code null}
          */
         static String determineArgument(Selector.GeneralSelector matchingSelector, int index, String type, OsmPrimitive p) {
@@ -447,4 +462,8 @@
          * Replaces occurrences of <code>{i.key}</code>, <code>{i.value}</code>, <code>{i.tag}</code> in {@code s} by the corresponding
          * key/value/tag of the {@code index}-th {@link Condition} of {@code matchingSelector}.
+         * @param matchingSelector matching selector
+         * @param s any string
+         * @param p OSM primitive
+         * @return string with arguments inserted
          */
         static String insertArguments(Selector matchingSelector, String s, OsmPrimitive p) {
@@ -494,4 +513,5 @@
         /**
          * Constructs a (localized) message for this deprecation check.
+         * @param p OSM primitive
          *
          * @return a message
@@ -513,4 +533,5 @@
         /**
          * Constructs a (localized) description for this deprecation check.
+         * @param p OSM primitive
          *
          * @return a description (possibly with alternative suggestions)
@@ -530,4 +551,6 @@
          * where any placeholders are replaced by values of the matched selector.
          *
+         * @param matchingSelector matching selector
+         * @param p OSM primitive
          * @return a description (possibly with alternative suggestions)
          */
Index: trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java	(revision 9243)
@@ -31,4 +31,5 @@
     /**
      * Construct the toggle button with the given action.
+     * @param action associated action
      */
     public IconToggleButton(Action action) {
@@ -38,4 +39,6 @@
     /**
      * Construct the toggle button with the given action.
+     * @param action associated action
+     * @param isExpert {@code true} if it's reserved to expert mode
      */
     public IconToggleButton(Action action, boolean isExpert) {
Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 9243)
@@ -573,5 +573,10 @@
     }
 
-    /** finds the correct insertion index for a given group and adds separators if necessary */
+    /**
+     * Finds the correct insertion index for a given group and adds separators if necessary
+     * @param menu menu
+     * @param group group number
+     * @return correct insertion index
+     */
     private static int getInsertionIndexForGroup(JMenu menu, int group) {
         if (group < 0)
Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 9243)
@@ -330,4 +330,5 @@
      * Call this to add new toggle dialogs to the left button-list
      * @param dlg The toggle dialog. It must not be in the list already.
+     * @param isExpert {@code true} if it's reserved to expert mode
      * @return button allowing to toggle the dialog
      */
@@ -631,4 +632,5 @@
     /**
      * Remove panel from top of MapView by class
+     * @param type type of panel
      */
     public void removeTopPanel(Class<?> type) {
@@ -644,6 +646,8 @@
     }
 
-    /*
+    /**
      * Find panel on top of MapView by class
+     * @param type type of panel
+     * @return found panel
      */
     public <T> T getTopPanel(Class<T> type) {
@@ -658,5 +662,6 @@
 
     /**
-     * Add component @param c on top of MapView
+     * Add component {@code c} on top of MapView
+     * @param c component
      */
     public void addTopPanel(Component c) {
@@ -670,4 +675,9 @@
      */
     public interface MapModeChangeListener {
+        /**
+         * Trigerred when map mode changes.
+         * @param oldMapMode old map mode
+         * @param newMapMode new map mode
+         */
         void mapModeChange(MapMode oldMapMode, MapMode newMapMode);
     }
Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 9243)
@@ -465,4 +465,5 @@
      *   <li>otherwise, the top most layer of any type becomes active</li>
      * </ul>
+     * @param layersList lit of layers
      *
      * @return the next active data layer
Index: trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 9243)
@@ -208,5 +208,5 @@
     /**
      * Get the distance in meter that correspond to 100 px on screen.
-     * 
+     *
      * @return the distance in meter that correspond to 100 px on screen
      */
@@ -217,5 +217,5 @@
     /**
      * Get the distance in meter that correspond to 100 px on screen.
-     * 
+     *
      * @param alwaysPositive if true, makes sure the return value is always
      * &gt; 0. (Two points 100 px apart can appear to be identical if the user
@@ -498,6 +498,6 @@
 
     /**
-     * Create a thread that moves the viewport to the given center in an
-     * animated fashion.
+     * Create a thread that moves the viewport to the given center in an animated fashion.
+     * @param newCenter new east/north center
      */
     public void smoothScrollTo(EastNorth newCenter) {
@@ -583,4 +583,5 @@
     /**
      * Set the new dimension to the view.
+     * @param box box to zoom to
      */
     public void zoomTo(BoundingXYVisitor box) {
@@ -662,13 +663,12 @@
 
     /**
-     * The *result* does not depend on the current map selection state,
-     * neither does the result *order*.
+     * The *result* does not depend on the current map selection state, neither does the result *order*.
      * It solely depends on the distance to point p.
-     *
-     * @return a sorted map with the keys representing the distance of
-     *      their associated nodes to point p.
-     */
-    private Map<Double, List<Node>> getNearestNodesImpl(Point p,
-            Predicate<OsmPrimitive> predicate) {
+     * @param p point
+     * @param predicate predicate to match
+     *
+     * @return a sorted map with the keys representing the distance of their associated nodes to point p.
+     */
+    private Map<Double, List<Node>> getNearestNodesImpl(Point p, Predicate<OsmPrimitive> predicate) {
         Map<Double, List<Node>> nearestMap = new TreeMap<>();
         DataSet ds = getCurrentDataSet();
@@ -768,6 +768,5 @@
      * as the true nearest node is returned.
      *
-     * If no such node is found either, the true nearest
-     * node to p is returned.
+     * If no such node is found either, the true nearest node to p is returned.
      *
      * Finally, if a node is not found at all, null is returned.
@@ -776,7 +775,7 @@
      * @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.
+     * @param useSelected make search depend on selection
+     *
+     * @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) {
@@ -795,6 +794,5 @@
      * as the true nearest node is returned.
      *
-     * If no such node is found either, the true nearest
-     * node to p is returned.
+     * If no such node is found either, the true nearest node to p is returned.
      *
      * Finally, if a node is not found at all, null is returned.
@@ -803,8 +801,8 @@
      * @param predicate this parameter imposes a condition on the returned object, e.g.
      *        give the nearest node that is tagged.
+     * @param useSelected make search depend on selection
      * @param preferredRefs primitives, whose nodes we prefer
      *
-     * @return A node within snap-distance to point p,
-     *      that is chosen by the algorithm described.
+     * @return A node within snap-distance to point p, that is chosen by the algorithm described.
      * @since 6065
      */
@@ -872,13 +870,14 @@
 
     /**
-     * The *result* does not depend on the current map selection state,
-     * neither does the result *order*.
+     * The *result* does not depend on the current map selection state, neither does the result *order*.
      * It solely depends on the distance to point p.
+     * @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 sorted map with the keys representing the perpendicular
      *      distance of their associated way segments to point p.
      */
-    private Map<Double, List<WaySegment>> getNearestWaySegmentsImpl(Point p,
-            Predicate<OsmPrimitive> predicate) {
+    private Map<Double, List<WaySegment>> getNearestWaySegmentsImpl(Point p, Predicate<OsmPrimitive> predicate) {
         Map<Double, List<WaySegment>> nearestMap = new TreeMap<>();
         DataSet ds = getCurrentDataSet();
@@ -1414,4 +1413,6 @@
     /**
      * Set new cursor.
+     * @param cursor The new cursor to use.
+     * @param reference A reference object that can be passed to the next set/reset calls to identify the caller.
      */
     public void setNewCursor(Cursor cursor, Object reference) {
@@ -1419,4 +1420,9 @@
     }
 
+    /**
+     * Set new cursor.
+     * @param cursor the type of predefined cursor
+     * @param reference A reference object that can be passed to the next set/reset calls to identify the caller.
+     */
     public void setNewCursor(int cursor, Object reference) {
         setNewCursor(Cursor.getPredefinedCursor(cursor), reference);
@@ -1425,4 +1431,5 @@
     /**
      * Remove the new cursor and reset to previous
+     * @param reference Cursor reference
      */
     public void resetCursor(Object reference) {
Index: trunk/src/org/openstreetmap/josm/gui/SplashScreen.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/SplashScreen.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/SplashScreen.java	(revision 9243)
@@ -389,4 +389,5 @@
         /**
          * Sets the tasks to displayed. A HTML formatted list is expected.
+         * @param tasks HTML formatted list of tasks
          */
         public void setTasks(String tasks) {
Index: trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java	(revision 9243)
@@ -64,4 +64,6 @@
     /**
      * Constructs a new {@code SlippyMapControler}.
+     * @param navComp navigatable component
+     * @param contentPane content pane
      */
     public SlippyMapControler(SlippyMapBBoxChooser navComp, JPanel contentPane) {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java	(revision 9243)
@@ -49,6 +49,7 @@
     /**
      * render a node
-     * @param model  the model
+     * @param model the model
      * @param node the node
+     * @param row the row
      * @param isSelected true, if the current row is selected
      */
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java	(revision 9243)
@@ -101,4 +101,5 @@
     /**
      * replies true if the current decision for the coordinate conflict is <code>decision</code>
+     * @param decision conflict resolution decision
      *
      * @return true if the current decision for the coordinate conflict is <code>decision</code>;
@@ -111,4 +112,5 @@
     /**
      * replies true if the current decision for the deleted state conflict is <code>decision</code>
+     * @param decision conflict resolution decision
      *
      * @return true if the current decision for the deleted state conflict is <code>decision</code>;
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java	(revision 9243)
@@ -109,4 +109,5 @@
     /**
      * Sets the text of the tooltip for both renderers, this (the JLabel) and the combobox renderer.
+     * @param decision conflict resolution decision
      */
     protected void renderToolTipText(MultiValueResolutionDecision decision) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java	(revision 9243)
@@ -322,4 +322,5 @@
      * Recursively adds child commands.
      * @param c the command
+     * @param idx index
      * @return the resulting node
      */
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java	(revision 9243)
@@ -34,4 +34,7 @@
      * Updates the preset list based on the {@code tags} and {@code types},
      * and associates an interaction with (matching) presets via {@code presetHandler}.
+     * @param types collection of tagging presets types
+     * @param tags colelction of tags
+     * @param presetHandler tagging preset handler
      */
     public void updatePresets(final Collection<TaggingPresetType> types, final Map<String, String> tags,
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java	(revision 9243)
@@ -349,4 +349,5 @@
      * Selects all errors related to the specified {@code primitives}, i.e. where {@link TestError#getPrimitives()}
      * returns a primitive present in {@code primitives}.
+     * @param primitives collection of primitives
      */
     public void selectRelatedErrors(final Collection<OsmPrimitive> primitives) {
Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/DownloadSelection.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/download/DownloadSelection.java	(revision 9243)
@@ -8,4 +8,5 @@
     /**
      * Add the GUI elements to the dialog.
+     * @param gui download dialog
      */
     void addGui(DownloadDialog gui);
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 9243)
@@ -1144,4 +1144,8 @@
      * Match a list of photos to a gpx track with a given offset.
      * All images need a exifTime attribute and the List must be sorted according to these times.
+     * @param images images to match
+     * @param selectedGpx selected GPX data
+     * @param offset offset
+     * @return number of matched points
      */
     private int matchGpxTrack(List<ImageEntry> images, GpxData selectedGpx, long offset) {
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 9243)
@@ -598,4 +598,5 @@
      *
      * If successful, fills in the LatLon and EastNorth attributes of passed in image
+     * @param e image entry
      */
     private static void extractExif(ImageEntry e) {
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java	(revision 9243)
@@ -51,5 +51,6 @@
 
     /**
-     * getter methods that refer to the temporary value
+     * Returns the cached temporary position value.
+     * @return the cached temporary position value
      */
     public CachedLatLon getPos() {
@@ -59,4 +60,8 @@
     }
 
+    /**
+     * Returns the cached temporary speed value.
+     * @return the cached temporary speed value
+     */
     public Double getSpeed() {
         if (tmp != null)
@@ -65,4 +70,8 @@
     }
 
+    /**
+     * Returns the cached temporary elevation value.
+     * @return the cached temporary elevation value
+     */
     public Double getElevation() {
         if (tmp != null)
@@ -71,4 +80,8 @@
     }
 
+    /**
+     * Returns the cached temporary GPS time value.
+     * @return the cached temporary GPS time value
+     */
     public Date getGpsTime() {
         if (tmp != null)
@@ -87,5 +100,6 @@
 
     /**
-     * other getter methods
+     * Returns associated file.
+     * @return associated file
      */
     public File getFile() {
@@ -93,8 +107,16 @@
     }
 
+    /**
+     * Returns EXIF orientation
+     * @return EXIF orientation
+     */
     public Integer getExifOrientation() {
         return exifOrientation;
     }
 
+    /**
+     * Returns EXIF time
+     * @return EXIF time
+     */
     public Date getExifTime() {
         return getDefensiveDate(exifTime);
@@ -147,5 +169,6 @@
 
     /**
-     * setter methods
+     * Sets the position.
+     * @param pos cached position
      */
     public void setPos(CachedLatLon pos) {
@@ -153,24 +176,48 @@
     }
 
+    /**
+     * Sets the position.
+     * @param pos position (will be cached)
+     */
     public void setPos(LatLon pos) {
-        this.pos = new CachedLatLon(pos);
-    }
-
+        setPos(new CachedLatLon(pos));
+    }
+
+    /**
+     * Sets the speed.
+     * @param speed speed
+     */
     public void setSpeed(Double speed) {
         this.speed = speed;
     }
 
+    /**
+     * Sets the elevation.
+     * @param elevation elevation
+     */
     public void setElevation(Double elevation) {
         this.elevation = elevation;
     }
 
+    /**
+     * Sets associated file.
+     * @param file associated file
+     */
     public void setFile(File file) {
         this.file = file;
     }
 
+    /**
+     * Sets EXIF orientation.
+     * @param exifOrientation EXIF orientation
+     */
     public void setExifOrientation(Integer exifOrientation) {
         this.exifOrientation = exifOrientation;
     }
 
+    /**
+     * Sets EXIF time.
+     * @param exifTime EXIF time
+     */
     public void setExifTime(Date exifTime) {
         this.exifTime = getDefensiveDate(exifTime);
@@ -245,4 +292,5 @@
     /**
      * If it has been tagged i.e. matched to a gpx track or retrieved lat/lon from exif
+     * @return {@code true} if it has been tagged
      */
     public boolean isTagged() {
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java	(revision 9243)
@@ -108,6 +108,8 @@
 
     /**
-     * gathers all available data for the tracks and returns them as array of arrays
-     * in the expected column order  */
+     * Gathers all available data for the tracks and returns them as array of arrays
+     * in the expected column order.
+     * @return table data
+     */
     private Object[][] buildTableContents() {
         Object[][] tracks = new Object[layer.data.tracks.size()][5];
@@ -128,5 +130,8 @@
     /**
      * Builds an non-editable table whose 5th column will open a browser when double clicked.
-     * The table will fill its parent. */
+     * The table will fill its parent.
+     * @param content table data
+     * @return non-editable table
+     */
     private JTable buildTable(Object[][] content) {
         final String[] headers = {tr("Name"), tr("Description"), tr("Timespan"), tr("Length"), tr("URL")};
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java	(revision 9243)
@@ -37,5 +37,8 @@
      * Create the panel to filter tracks on GPX layer @param layer by date
      * Preferences will be stored in @param preferencePrefix
-     * If @param enabled = true, the the panel is created as active and filtering occurs immediately.
+     * If @param enabled = true, then the panel is created as active and filtering occurs immediately.
+     * @param layer GPX layer
+     * @param preferencePrefix preference prefix
+     * @param enabled panel initial enabled state
      */
     public DateFilterPanel(GpxLayer layer, String preferencePrefix, boolean enabled) {
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java	(revision 9243)
@@ -126,6 +126,8 @@
      * timestamp on the wav file (e) (in future) voice recognised markers in the sound recording (f)
      * a single marker at the beginning of the track
-     * @param wavFile : the file to be associated with the markers in the new marker layer
-     * @param markers : keeps track of warning messages to avoid repeated warnings
+     * @param wavFile the file to be associated with the markers in the new marker layer
+     * @param ml marker layer
+     * @param firstStartTime first start time in milliseconds, used for (d)
+     * @param markers keeps track of warning messages to avoid repeated warnings
      */
     private void importAudio(File wavFile, MarkerLayer ml, double firstStartTime, Markers markers) {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java	(revision 9243)
@@ -186,4 +186,7 @@
      *  This is useful for multipolygon relations and outer ways of untagged
      *  multipolygon relations.
+     * @param p helper
+     * @param scale scale
+     * @param mc multi cascade
      */
     private void get(OsmPrimitive primitive, boolean closed, WayPrototypesRecord p, Double scale, MultiCascade mc) {
Index: trunk/src/org/openstreetmap/josm/io/OsmWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmWriter.java	(revision 9242)
+++ trunk/src/org/openstreetmap/josm/io/OsmWriter.java	(revision 9243)
@@ -49,4 +49,5 @@
      * Do not call this directly. Use {@link OsmWriterFactory} instead.
      * @param out print writer
+     * @param osmConform if {@code true}, prevents modification attributes to be written to the common part
      * @param version OSM API version (0.6)
      */