Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 13075)
+++ /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 13076)
@@ -671,4 +671,5 @@
          * @param foundMatches The number of matches added to the result.
          * @param setting The setting used.
+         * @param parent parent component
          */
         void receiveSearchResult(DataSet ds, Collection<OsmPrimitive> result, int foundMatches, SearchSetting setting, Component parent);
Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 13075)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 13076)
@@ -39,12 +39,15 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.data.preferences.ColorInfo;
 import org.openstreetmap.josm.data.preferences.DoubleProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
-import org.openstreetmap.josm.data.preferences.ColorInfo;
 import org.openstreetmap.josm.data.preferences.LongProperty;
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.data.preferences.PreferencesReader;
 import org.openstreetmap.josm.data.preferences.PreferencesWriter;
+import org.openstreetmap.josm.io.OfflineAccessException;
+import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.spi.preferences.AbstractPreferences;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.IBaseDirectories;
 import org.openstreetmap.josm.spi.preferences.IPreferences;
@@ -54,7 +57,4 @@
 import org.openstreetmap.josm.spi.preferences.Setting;
 import org.openstreetmap.josm.spi.preferences.StringSetting;
-import org.openstreetmap.josm.io.OfflineAccessException;
-import org.openstreetmap.josm.io.OnlineResource;
-import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ColorHelper;
@@ -336,4 +336,6 @@
 
     /**
+     * @param key preference key
+     * @return listener list for this key
      * @deprecated deprecated private method
      */
@@ -383,4 +385,7 @@
 
     /**
+     * @param key preference key
+     * @param oldValue old value
+     * @param newValue new value
      * @deprecated deprecated private method
      */
@@ -431,4 +436,7 @@
 
     /**
+     * @param createIfMissing if true, automatically creates this directory,
+     * in case it is missing
+     * @return the preferences directory
      * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()}
      */
@@ -451,4 +459,7 @@
 
     /**
+     * @param createIfMissing if true, automatically creates this directory,
+     * in case it is missing
+     * @return the user data directory
      * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()}
      */
@@ -496,4 +507,7 @@
 
     /**
+     * @param createIfMissing if true, automatically creates this directory,
+     * in case it is missing
+     * @return the cache directory
      * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()}
      */
@@ -945,4 +959,6 @@
     /**
      * only for preferences
+     * @param o color key
+     * @return translated color name
      * @deprecated (since 12987) no longer supported
      */
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuButton.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuButton.java	(revision 13075)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuButton.java	(revision 13076)
@@ -6,6 +6,6 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
 import java.awt.geom.Path2D;
 
@@ -23,4 +23,5 @@
 
     /**
+     * Constructs a new {@code PopupMenuButton}.
      * @see JButton#JButton()
      */
@@ -31,4 +32,6 @@
 
     /**
+     * Constructs a new {@code PopupMenuButton}.
+     * @param a the <code>Action</code> used to specify the new button
      * @see JButton#JButton(Action)
      */
@@ -39,4 +42,6 @@
 
     /**
+     * Constructs a new {@code PopupMenuButton}.
+     * @param i the Icon image to display on the button
      * @see JButton#JButton(Icon)
      */
@@ -47,4 +52,6 @@
 
     /**
+     * Constructs a new {@code PopupMenuButton}.
+     * @param t the text of the button
      * @see JButton#JButton(String)
      */
@@ -55,4 +62,7 @@
 
     /**
+     * Constructs a new {@code PopupMenuButton}.
+     * @param t the text of the button
+     * @param i the Icon image to display on the button
      * @see JButton#JButton(String, Icon)
      */
@@ -64,4 +74,5 @@
     /**
      * Pass-through to {@link JButton#JButton()} allowing associated popup menu to be set
+     * @param m the associated popup menu
      */
     public PopupMenuButton(JPopupMenu m) {
@@ -72,4 +83,6 @@
     /**
      * Pass-through to {@link JButton#JButton(Action)} allowing associated popup menu to be set
+     * @param a the <code>Action</code> used to specify the new button
+     * @param m the associated popup menu
      */
     public PopupMenuButton(Action a, JPopupMenu m) {
@@ -80,4 +93,6 @@
     /**
      * Pass-through to {@link JButton#JButton(Icon)} allowing associated popup menu to be set
+     * @param i the Icon image to display on the button
+     * @param m the associated popup menu
      */
     public PopupMenuButton(Icon i, JPopupMenu m) {
@@ -88,4 +103,6 @@
     /**
      * Pass-through to {@link JButton#JButton(String)} allowing associated popup menu to be set
+     * @param t the text of the button
+     * @param m the associated popup menu
      */
     public PopupMenuButton(String t, JPopupMenu m) {
@@ -96,4 +113,7 @@
     /**
      * Pass-through to {@link JButton#JButton(String, Icon)} allowing associated popup menu to be set
+     * @param t the text of the button
+     * @param i the Icon image to display on the button
+     * @param m the associated popup menu
      */
     public PopupMenuButton(String t, Icon i, JPopupMenu m) {
@@ -113,4 +133,5 @@
     /**
      * Get the popup menu associated with this button
+     * @return the popup menu associated with this button
      */
     public JPopupMenu getPopupMenu() {
Index: /trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java	(revision 13075)
+++ /trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java	(revision 13076)
@@ -15,8 +15,15 @@
     private final List<TemplateEntry> entries;
 
+    /**
+     * Constructs a new {@code Condition} with predefined template entries.
+     * @param entries template entries
+     */
     public Condition(Collection<TemplateEntry> entries) {
         this.entries = new ArrayList<>(entries);
     }
 
+    /**
+     * Constructs a new {@code Condition}.
+     */
     public Condition() {
         this.entries = new ArrayList<>();
@@ -24,4 +31,6 @@
 
     /**
+     * Returns template entries.
+     * @return template entries
      * @deprecated (since 13003) use constructor {@link #Condition(java.util.Collection)} to set the entries
      */