Index: trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 8438)
+++ trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 8440)
@@ -421,6 +421,6 @@
 
         /**
-         * Create an undirected graph from the given ways.
-         * @param ways Ways to build the graph from
+         * Create an undirected graph from the given node pairs.
+         * @param pairs Node pairs to build the graph from
          * @return node graph structure
          */
Index: trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java	(revision 8438)
+++ trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java	(revision 8440)
@@ -3,5 +3,4 @@
 
 import java.net.URL;
-
 
 /**
@@ -15,5 +14,4 @@
      * returns cache entry key
      *
-     * @param tile
      * @return cache key for tile
      */
Index: trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(revision 8438)
+++ trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(revision 8440)
@@ -696,5 +696,5 @@
      * accessed from very specific (language variant) to more generic (default name).
      *
-     * @see LanguageInfo#getLanguageCodes()
+     * @see LanguageInfo#getLanguageCodes
      * @return the name of this primitive, <code>null</code> if no name exists
      */
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java	(revision 8438)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java	(revision 8440)
@@ -209,5 +209,4 @@
          * @param args arguments
          * @return the first non-null object
-         * @see #coalesce(Object...)
          * @see Utils#firstNonNull(Object[])
          */
Index: trunk/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java	(revision 8438)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java	(revision 8440)
@@ -162,8 +162,4 @@
      *
      * @param multiple true if multiple files may be selected
-     * @beaninfo
-     *       bound: true
-     * description: Sets multiple file selection mode.
-     *
      * @see #isMultiSelectionEnabled
      */
Index: trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java	(revision 8438)
+++ trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java	(revision 8440)
@@ -113,5 +113,5 @@
      * In most cases JOSM and Java uses the same codes, but for some exceptions this is needed.
      *
-     * @param locale the locale. Replies "en" if null.
+     * @param localeName the locale. Replies "en" if null.
      * @return the Java code for the given locale
      * @since 8232
@@ -224,5 +224,5 @@
      * </ul>
      *
-     * @param locale the locale to use, <code>null</code> for default locale
+     * @param l the locale to use, <code>null</code> for default locale
      * @return list of codes
      * @since 8283