Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 11613)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 11615)
@@ -140,4 +140,9 @@
         Command createCommand(OsmPrimitive p, Selector matchingSelector);
 
+        /**
+         * Checks that object is either an {@link Expression} or a {@link String}.
+         * @param obj object to check
+         * @throws IllegalArgumentException if object is not an {@code Expression} or a {@code String}
+         */
         static void checkObject(final Object obj) {
             CheckParameterUtil.ensureThat(obj instanceof Expression || obj instanceof String,
@@ -252,4 +257,7 @@
     }
 
+    /**
+     * Tag check.
+     */
     public static class TagCheck implements Predicate<OsmPrimitive> {
         /** The selector of this {@code TagCheck} */
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java	(revision 11613)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java	(revision 11615)
@@ -28,9 +28,7 @@
  *
  *   <li>{@link DeriveLabelFromNameTagsCompositionStrategy} - the label is given by the value
- *   of one
- *   of the configured "name tags". The list of relevant name tags can be configured
+ *   of one of the configured "name tags". The list of relevant name tags can be configured
  *   in the JOSM preferences
- *   content of a tag whose name specified in the MapCSS style file, see the preference
- *   options <tt>mappaint.nameOrder</tt> and <tt>mappaint.nameComplementOrder</tt>.</li>
+ *   see the preference options <tt>mappaint.nameOrder</tt> and <tt>mappaint.nameComplementOrder</tt>.</li>
  * </ul>
  * @since  3987 (creation)
@@ -50,4 +48,7 @@
     String compose(OsmPrimitive primitive);
 
+    /**
+     * Strategy where the label is given by a static text specified in the MapCSS style file.
+     */
     class StaticLabelCompositionStrategy implements LabelCompositionStrategy {
         private final String defaultLabel;
@@ -85,4 +86,7 @@
     }
 
+    /**
+     * Strategy where the label is given by the content of a tag whose name specified in the MapCSS style file.
+     */
     class TagLookupCompositionStrategy implements LabelCompositionStrategy {
 
@@ -129,4 +133,9 @@
     }
 
+    /**
+     * Strategy where the label is given by the value of one of the configured "name tags".
+     * The list of relevant name tags can be configured in the JOSM preferences
+     * see the preference options <tt>mappaint.nameOrder</tt> and <tt>mappaint.nameComplementOrder</tt>
+     */
     class DeriveLabelFromNameTagsCompositionStrategy implements LabelCompositionStrategy, PreferenceChangedListener {
 
Index: trunk/src/org/openstreetmap/josm/gui/widgets/ButtonColumn.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/ButtonColumn.java	(revision 11613)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/ButtonColumn.java	(revision 11615)
@@ -1,4 +1,3 @@
 // License: GPL. For details, see LICENSE file.
-
 package org.openstreetmap.josm.gui.widgets;
 
@@ -19,8 +18,7 @@
 
 /**
- *
  * Class based on:  http://www.camick.com/java/source/ButtonColumn.java
  * https://tips4java.wordpress.com/2009/07/12/table-button-column/
- *
+ * @since 10536
  */
 public class ButtonColumn extends AbstractCellEditor implements TableCellRenderer, TableCellEditor, ActionListener {
@@ -38,9 +36,13 @@
     }
 
+    /**
+     * Constructs a new {@code ButtonColumn}.
+     * @param action action
+     * @param buttonName button name
+     */
     public ButtonColumn(Action action, String buttonName) {
         this(action);
         this.buttonName = buttonName;
     }
-
 
     /**
@@ -116,4 +118,3 @@
         return renderButton;
     }
-
 }