Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSettingFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSettingFactory.java	(revision 11343)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSettingFactory.java	(revision 11344)
@@ -2,7 +2,15 @@
 package org.openstreetmap.josm.gui.preferences;
 
+/**
+ * Factory for {@link PreferenceSetting}.
+ * @since 1742
+ */
 @FunctionalInterface
 public interface PreferenceSettingFactory {
 
+    /**
+     * Creates preference settings.
+     * @return created preference settings
+     */
     PreferenceSetting createPreferenceSetting();
 }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 11343)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 11344)
@@ -69,8 +69,15 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
+/**
+ * Toolbar preferences.
+ * @since 172
+ */
 public class ToolbarPreferences implements PreferenceSettingFactory {
 
     private static final String EMPTY_TOOLBAR_MARKER = "<!-empty-!>";
 
+    /**
+     * Action definition.
+     */
     public static class ActionDefinition {
         private final Action action;
@@ -80,12 +87,24 @@
         private final Map<String, Object> parameters = new ConcurrentHashMap<>();
 
+        /**
+         * Constructs a new {@code ActionDefinition}.
+         * @param action action
+         */
         public ActionDefinition(Action action) {
             this.action = action;
         }
 
+        /**
+         * Returns action parameters.
+         * @return action parameters
+         */
         public Map<String, Object> getParameters() {
             return parameters;
         }
 
+        /**
+         * Returns {@link ParameterizedActionDecorator}, if applicable.
+         * @return {@link ParameterizedActionDecorator}, if applicable
+         */
         public Action getParametrizedAction() {
             if (getAction() instanceof ParameterizedAction)
@@ -95,16 +114,32 @@
         }
 
+        /**
+         * Returns action.
+         * @return action
+         */
         public Action getAction() {
             return action;
         }
 
+        /**
+         * Returns action name.
+         * @return action name
+         */
         public String getName() {
             return name;
         }
 
+        /**
+         * Returns action display name.
+         * @return action display name
+         */
         public String getDisplayName() {
             return name.isEmpty() ? (String) action.getValue(Action.NAME) : name;
         }
 
+        /**
+         * Returns display tooltip.
+         * @return display tooltip
+         */
         public String getDisplayTooltip() {
             if (!name.isEmpty())
@@ -118,4 +153,8 @@
         }
 
+        /**
+         * Returns display icon.
+         * @return display icon
+         */
         public Icon getDisplayIcon() {
             if (ico != null)
@@ -127,12 +166,24 @@
         }
 
+        /**
+         * Sets action name.
+         * @param name action name
+         */
         public void setName(String name) {
             this.name = name;
         }
 
+        /**
+         * Returns icon name.
+         * @return icon name
+         */
         public String getIcon() {
             return icon;
         }
 
+        /**
+         * Sets icon name.
+         * @param icon icon name
+         */
         public void setIcon(String icon) {
             this.icon = icon;
@@ -140,12 +191,24 @@
         }
 
+        /**
+         * Determines if this a separator.
+         * @return {@code true} if this a separator
+         */
         public boolean isSeparator() {
             return action == null;
         }
 
+        /**
+         * Returns a new separator.
+         * @return new separator
+         */
         public static ActionDefinition getSeparator() {
             return new ActionDefinition(null);
         }
 
+        /**
+         * Determines if this action has parameters.
+         * @return {@code true} if this action has parameters
+         */
         public boolean hasParameters() {
             if (!(getAction() instanceof ParameterizedAction)) return false;
@@ -163,4 +226,8 @@
         private char[] s;
 
+        /**
+         * Constructs a new {@code ActionParser}.
+         * @param actions actions map - can be null
+         */
         public ActionParser(Map<String, Action> actions) {
             this.actions = actions;
@@ -490,4 +557,7 @@
     }
 
+    /**
+     * Toolbar preferences settings.
+     */
     public class Settings extends DefaultTabPreferenceSetting {
 
Index: trunk/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java	(revision 11343)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java	(revision 11344)
@@ -5,8 +5,16 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 
+/**
+ * Preference settings factory for plugins.
+ * @since 1742
+ */
 public class PluginPreferenceFactory implements PreferenceSettingFactory {
 
     private final PluginProxy plugin;
 
+    /**
+     * Constructs a new {@code PluginPreferenceFactory}.
+     * @param plugin plugin proxy
+     */
     public PluginPreferenceFactory(PluginProxy plugin) {
         this.plugin = plugin;