Index: /trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java	(revision 9239)
@@ -17,4 +17,5 @@
  *   {@link OsmPrimitive} from the dataset in another layer or the one retrieved from the server.</li>
  * </ul>
+ * @param <T> primitive type of the conflict
  * @since 1750
  */
Index: /trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java	(revision 9239)
@@ -61,4 +61,5 @@
      * Called after big changes in dataset. Usually other events are stopped using Dataset.beginUpdate() and
      * after operation is completed (Dataset.endUpdate()), {@link #dataChanged(DataChangedEvent event)} is called.
+     * @param event data change event
      */
     void dataChanged(DataChangedEvent event);
Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java	(revision 9239)
@@ -121,5 +121,8 @@
     }
 
-    /** Private constructor. */
+    /**
+     * Private constructor.
+     * @param allowLocal whether to allow local domains
+     */
     private DomainValidator(boolean allowLocal) {
        this.allowLocal = allowLocal;
Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java	(revision 9239)
@@ -23,4 +23,7 @@
      * @param relativePath An path to use for constructing relative URLs or
      *        <code>null</code> for no relative URLs
+     * @param parentLayer parent marker layer
+     * @param time Absolute time of marker in seconds since epoch
+     * @param offset Time offset in seconds from the gpx point from which it was derived
      * @return A collection of Marker objects, or <code>null</code>.
      */
Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java	(revision 9239)
@@ -113,4 +113,5 @@
     /**
      * reinstate the old map mode after switching temporarily to do a play head drag
+     * @param reset whether to reset state (pause audio and restore old coordinates)
      */
     private void endDrag(boolean reset) {
@@ -182,6 +183,8 @@
             endDrag(true);
         } else {
-            setCoor(cw.getCoor());
-            ca.play(cw.time - ca.time);
+            if (cw != null) {
+                setCoor(cw.getCoor());
+                ca.play(cw.time - ca.time);
+            }
             endDrag(false);
         }
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java	(revision 9239)
@@ -64,6 +64,6 @@
      * @param c the cascade
      * @param key property key for the width value
-     * @param relativeTo reference width. Only needed, when relative width syntax
-     *              is used, e.g. "+4".
+     * @param relativeTo reference width. Only needed, when relative width syntax is used, e.g. "+4".
+     * @return width
      */
     protected static Float getWidth(Cascade c, String key, Float relativeTo) {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(revision 9239)
@@ -81,4 +81,8 @@
      * Automatically adds default styles in case no proper style was found.
      * Uses the cache, if possible, and saves the results to the cache.
+     * @param osm OSM primitive
+     * @param scale scale
+     * @param nc navigatable component
+     * @return pair containing style list and range
      */
     public Pair<StyleList, Range> getStyleCacheWithRange(OsmPrimitive osm, double scale, NavigatableComponent nc) {
@@ -169,4 +173,8 @@
      * or area) If not, add a default line style from the area color of the multipolygon.
      *
+     * @param osm OSM primitive
+     * @param scale scale
+     * @param nc navigatable component
+     * @return pair containing style list and range
      */
     private Pair<StyleList, Range> getImpl(OsmPrimitive osm, double scale, NavigatableComponent nc) {
@@ -372,4 +380,5 @@
     /**
      * Draw a default node symbol for nodes that have no style?
+     * @return {@code true} if default node symbol must be drawn
      */
     private boolean isDefaultNodes() {
@@ -383,4 +392,5 @@
     /**
      * Draw a default line for ways that do not have an own line style?
+     * @return {@code true} if default line must be drawn
      */
     private boolean isDefaultLines() {
@@ -422,4 +432,5 @@
     /**
      * add a style source; only accessed from MapPaintStyles
+     * @param style style source to add
      */
     void add(StyleSource style) {
@@ -429,4 +440,5 @@
     /**
      * set the style sources; only accessed from MapPaintStyles
+     * @param sources new style sources
      */
     void setStyleSources(Collection<StyleSource> sources) {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java	(revision 9239)
@@ -53,4 +53,5 @@
     /**
      * Creates a new environment.
+     * @param osm OSM primitive
      * @since 8415
      */
@@ -61,4 +62,8 @@
     /**
      * Creates a new environment.
+     * @param osm OSM primitive
+     * @param mc multi cascade
+     * @param layer layer
+     * @param source style source
      */
     public Environment(OsmPrimitive osm, MultiCascade mc, String layer, StyleSource source) {
@@ -90,4 +95,5 @@
     /**
      * Creates a clone of this environment, with the specified primitive.
+     * @param osm OSM primitive
      * @return A clone of this environment, with the specified primitive
      * @see #osm
@@ -177,4 +183,5 @@
     /**
      * Creates a clone of this environment, with the specified {@link Context}.
+     * @param context context
      * @return A clone of this environment, with the specified {@code Context}
      */
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 9239)
@@ -150,4 +150,5 @@
     /**
      * No icon with the given name was found, show a dummy icon instead
+     * @param source style source
      * @return the icon misc/no_icon.png, in descending priority:
      *   - relative to source file
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java	(revision 9239)
@@ -31,4 +31,6 @@
      * a new layer with that name and return it. The new layer will be
      * a clone of the "*" layer, if it exists.
+     * @param layer layer
+     * @return cascade
      */
     public Cascade getOrCreateCascade(String layer) {
@@ -52,7 +54,9 @@
 
     /**
-     * Read-only version of getOrCreateCascade. For convenience, it returns an
+     * Read-only version of {@link #getOrCreateCascade}. For convenience, it returns an
      * empty cascade for non-existing layers. However this empty (read-only) cascade
      * is not added to this MultiCascade object.
+     * @param layer layer
+     * @return cascade
      */
     public Cascade getCascade(String layer) {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/Range.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/Range.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/Range.java	(revision 9239)
@@ -55,4 +55,7 @@
      *
      * result (----------------]
+     * @param x value
+     * @param other other range
+     * @return reduced range
      */
     public Range reduceAround(double x, Range other) {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java	(revision 9239)
@@ -103,4 +103,6 @@
     /**
      * looks up styles for a certain scale value
+     * @param scale scale
+     * @return style list
      */
     public StyleList get(double scale) {
@@ -118,4 +120,6 @@
      * looks up styles for a certain scale value and additionally returns
      * the scale range for the returned styles
+     * @param scale scale
+     * @return pair containing syle list and range
      */
     public Pair<StyleList, Range> getWithRange(double scale) {
@@ -137,4 +141,8 @@
      * add a new styles to the cache. this is only possible, if
      * for this scale range, there is nothing in the cache yet.
+     * @param sl style list
+     * @param lower lower bound
+     * @param upper upper bound
+     * @return interned style cache
      */
     public StyleCache put(StyleList sl, double lower, double upper) {
@@ -165,4 +173,7 @@
      *         (--------]
      *       lower     upper
+     * @param sl style list
+     * @param lower lower bound
+     * @param upper upper bound
      */
     private void putImpl(StyleList sl, double lower, double upper) {
@@ -227,6 +238,6 @@
     /**
      * Like String.intern() (reduce memory consumption).
-     * StyleCache must not be changed after it has
-     * been added to the intern pool.
+     * StyleCache must not be changed after it has been added to the intern pool.
+     * @return style cache
      */
     public StyleCache intern() {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java	(revision 9239)
@@ -76,5 +76,6 @@
      *
      * @param c the style properties
-     * @return the label composition strategy
+     * @param defaultAnnotate whether to return {@link #AUTO_LABEL_COMPOSITION_STRATEGY} if not strategy is found
+     * @return the label composition strategy, or {@code null}
      */
     protected static LabelCompositionStrategy buildLabelCompositionStrategy(Cascade c, boolean defaultAnnotate) {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java	(revision 9239)
@@ -402,4 +402,5 @@
          * @param env the environment
          * @param key the property key
+         * @param layer layer
          * @return the property value
          */
@@ -422,4 +423,5 @@
          * @param env the environment
          * @param key the property key
+         * @param layer layer
          * @return {@code true} if the property is set, {@code false} otherwise
          */
@@ -676,4 +678,5 @@
          * Obtains the JOSM'key {@link org.openstreetmap.josm.data.Preferences} string for key {@code key},
          * and defaults to {@code def} if that is null.
+         * @param env the environment
          * @param key Key in JOSM preference
          * @param def Default value
@@ -1135,4 +1138,7 @@
         /**
          * Constructs a new {@code ParameterFunction}.
+         * @param m method
+         * @param args arguments
+         * @param needsEnvironment whether function needs environment
          */
         public ParameterFunction(Method m, List<Expression> args, boolean needsEnvironment) {
@@ -1208,4 +1214,6 @@
         /**
          * Constructs a new {@code ArrayFunction}.
+         * @param m method
+         * @param args arguments
          */
         public ArrayFunction(Method m, List<Expression> args) {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj	(revision 9239)
@@ -52,5 +52,4 @@
  *
  */
-
 public class MapCSSParser {
     MapCSSStyleSource sheet;
@@ -77,4 +76,7 @@
     /**
      * Constructor which initializes the parser with a certain lexical state.
+     * @param in input
+     * @param encoding contents encoding
+     * @param initState initial state
      */
     public MapCSSParser(InputStream in, String encoding, LexicalState initState) {
@@ -95,4 +97,6 @@
     /**
      * Constructor which initializes the parser with a certain lexical state.
+     * @param in input
+     * @param initState initial state
      */
     public MapCSSParser(Reader in, LexicalState initState) {
@@ -108,5 +112,5 @@
 PARSER_END(MapCSSParser)
 
-/*************
+/**
  * Token definitions
  *
@@ -222,6 +226,5 @@
 
 
-/*************
- *
+/*
  * Preprocessor parser definitions:
  *
@@ -243,4 +246,7 @@
 /**
  * root method for the preprocessor.
+ * @param sheet MapCSS style source
+ * @return result string
+ * @throws ParseException in case of parsing error
  */
 String pp_root(MapCSSStyleSource sheet):
@@ -260,4 +266,5 @@
  *
  * @param write false if this content should be skipped (@pp_media condition is not fulfilled), true otherwise
+ * @throws ParseException in case of parsing error
  */
 void pp_black_box(boolean write):
@@ -284,4 +291,5 @@
  * @param ignore if the content of this rule should be ignored
  * (because we are already inside a @supports block that didn't pass)
+ * @throws ParseException in case of parsing error
  */
 void pp_supports(boolean ignore):
@@ -302,4 +310,5 @@
  * Unlike other parsing rules, grabs trailing whitespace.
  * @return true, if the condition is fulfilled
+ * @throws ParseException in case of parsing error
  */
 boolean pp_supports_condition():
@@ -329,4 +338,5 @@
  *
  * @return true, if the condition is fulfilled
+ * @throws ParseException in case of parsing error
  */
 boolean pp_supports_condition_in_parens():
@@ -350,4 +360,5 @@
  *
  * @return true if the condition is fulfilled
+ * @throws ParseException in case of parsing error
  */
 boolean pp_supports_declaration_condition():
@@ -411,4 +422,5 @@
  *
  * @return true if the condition is fulfilled
+ * @throws ParseException in case of parsing error
  */
 // deprecated
@@ -443,6 +455,5 @@
 }
 
-/*************
- *
+/*
  * Parser definition for the main MapCSS parser:
  *
@@ -542,4 +553,5 @@
 /**
  * white-space
+ * @throws ParseException in case of parsing error
  */
 void s() :
@@ -552,4 +564,5 @@
 /**
  * mix of white-space and comments
+ * @throws ParseException in case of parsing error
  */
 void w() :
@@ -562,4 +575,6 @@
 /**
  * comma delimited list of floats (at least 2, all &gt;= 0)
+ * @return list of floats
+ * @throws ParseException in case of parsing error 
  */
 List<Float> float_array() :
@@ -581,4 +596,6 @@
 /**
  * entry point for the main parser
+ * @param sheet MapCSS style source
+ * @throws ParseException in case of parsing error
  */
 void sheet(MapCSSStyleSource sheet):
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java	(revision 9239)
@@ -94,6 +94,7 @@
 
         /**
-         *
+         * Constructs a new {@code ChildOrParentSelector}.
          * @param a the first selector
+         * @param link link
          * @param b the second selector
          * @param type the selector type
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinemodPrototype.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinemodPrototype.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinemodPrototype.java	(revision 9239)
@@ -31,5 +31,9 @@
     }
 
-    /** get width for overlays */
+    /**
+     * get width for overlays
+     * @param ref reference width
+     * @return width according to {@link #widthMode} with a minimal value of 1
+     */
     public float getWidth(float ref) {
         float res;
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java	(revision 9239)
@@ -140,4 +140,5 @@
      * @param scale ignored if null, otherwise checks if scale is within the range of candidate
      * @param mc side effect: update the valid region for the current MultiCascade
+     * @return {@code true} if {@code candidate} is better than the current match
      */
     private static boolean requiresUpdate(Prototype current, Prototype candidate, Double scale, MultiCascade mc) {
@@ -181,4 +182,5 @@
 
     /**
+     * @param primitive OSM primitive
      * @param closed The primitive is a closed way or we pretend it is closed.
      *  This is useful for multipolygon relations and outer ways of untagged
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 9239)
@@ -274,4 +274,5 @@
      * Construct a PreferencePanel for the preference settings. Layout is GridBagLayout
      * and a centered title label and the description are added.
+     * @param caller Preference settings, that display a top level tab
      * @return The created panel ready to add other controls.
      */
@@ -283,4 +284,5 @@
      * Construct a PreferencePanel for the preference settings. Layout is GridBagLayout
      * and a centered title label and the description are added.
+     * @param caller Preference settings, that display a top level tab
      * @param inScrollPane if <code>true</code> the added tab will show scroll bars
      *        if the panel content is larger than the available space
@@ -288,5 +290,5 @@
      */
     public PreferencePanel createPreferenceTab(TabPreferenceSetting caller, boolean inScrollPane) {
-        CheckParameterUtil.ensureParameterNotNull(caller);
+        CheckParameterUtil.ensureParameterNotNull(caller, "caller");
         PreferencePanel p = new PreferencePanel(caller);
 
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 9239)
@@ -416,5 +416,7 @@
 
     /**
-     * Provide the GUI strings. (There are differences for MapPaint and Preset)
+     * Provide the GUI strings. (There are differences for MapPaint, Preset and TagChecker Rule)
+     * @param ident any {@link I18nString} value
+     * @return the translated string for {@code ident}
      */
     protected abstract String getStr(I18nString ident);
@@ -423,8 +425,30 @@
      * Identifiers for strings that need to be provided.
      */
-    public enum I18nString { AVAILABLE_SOURCES, ACTIVE_SOURCES, NEW_SOURCE_ENTRY_TOOLTIP, NEW_SOURCE_ENTRY,
-        REMOVE_SOURCE_TOOLTIP, EDIT_SOURCE_TOOLTIP, ACTIVATE_TOOLTIP, RELOAD_ALL_AVAILABLE,
-        LOADING_SOURCES_FROM, FAILED_TO_LOAD_SOURCES_FROM, FAILED_TO_LOAD_SOURCES_FROM_HELP_TOPIC,
-        ILLEGAL_FORMAT_OF_ENTRY }
+    public enum I18nString {
+        /** Available (styles|presets|rules) */
+        AVAILABLE_SOURCES,
+        /** Active (styles|presets|rules) */
+        ACTIVE_SOURCES,
+        /** Add a new (style|preset|rule) by entering filename or URL */
+        NEW_SOURCE_ENTRY_TOOLTIP,
+        /** New (style|preset|rule) entry */
+        NEW_SOURCE_ENTRY,
+        /** Remove the selected (styles|presets|rules) from the list of active (styles|presets|rules) */
+        REMOVE_SOURCE_TOOLTIP,
+        /** Edit the filename or URL for the selected active (style|preset|rule) */
+        EDIT_SOURCE_TOOLTIP,
+        /** Add the selected available (styles|presets|rules) to the list of active (styles|presets|rules) */
+        ACTIVATE_TOOLTIP,
+        /** Reloads the list of available (styles|presets|rules) */
+        RELOAD_ALL_AVAILABLE,
+        /** Loading (style|preset|rule) sources */
+        LOADING_SOURCES_FROM,
+        /** Failed to load the list of (style|preset|rule) sources */
+        FAILED_TO_LOAD_SOURCES_FROM,
+        /** /Preferences/(Styles|Presets|Rules)#FailedToLoad(Style|Preset|Rule)Sources */
+        FAILED_TO_LOAD_SOURCES_FROM_HELP_TOPIC,
+        /** Illegal format of entry in (style|preset|rule) list */
+        ILLEGAL_FORMAT_OF_ENTRY
+    }
 
     public boolean hasActiveSourcesChanged() {
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/SubPreferenceSetting.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/SubPreferenceSetting.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/SubPreferenceSetting.java	(revision 9239)
@@ -12,4 +12,5 @@
     /**
      * Returns the preference setting (displayed in the specified preferences tab pane) that contains this preference setting.
+     * @param gui preferences tabbed pane
      * @return parent preference setting
      */
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 9239)
@@ -1018,4 +1018,5 @@
 
     /**
+     * @param action Action to register
      * @return The parameter (for better chaining)
      */
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java	(revision 9239)
@@ -34,4 +34,7 @@
     /**
      * Constructs a new {@code ExportProfileAction}.
+     * @param prefs preferences
+     * @param schemaKey filename prefix
+     * @param prefPattern preference key pattern used to determine which entries are exported
      */
     public ExportProfileAction(Preferences prefs, String schemaKey, String prefPattern) {
@@ -67,5 +70,5 @@
             @Override
             public boolean accept(File f) {
-                return f.isDirectory() || Utils.hasExtension(f, "xml") && f.getName().toLowerCase(Locale.ENGLISH).startsWith(schemaKey);
+                return f.isDirectory() || (Utils.hasExtension(f, "xml") && f.getName().toLowerCase(Locale.ENGLISH).startsWith(schemaKey));
             }
 
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java	(revision 9239)
@@ -36,4 +36,6 @@
      * Constructs a new {@code ListEditor}.
      * @param gui The parent component
+     * @param entry preference entry
+     * @param setting list setting
      */
     public ListEditor(final JComponent gui, PrefEntry entry, ListSetting setting) {
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java	(revision 9239)
@@ -51,4 +51,6 @@
      * Constructs a new {@code ListListEditor}.
      * @param gui The parent component
+     * @param entry preference entry
+     * @param setting list of lists setting
      */
     public ListListEditor(final JComponent gui, PrefEntry entry, ListListSetting setting) {
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java	(revision 9239)
@@ -26,4 +26,6 @@
      * Constructs a new {@code StringEditor}.
      * @param gui The parent component
+     * @param entry preference entry
+     * @param setting string setting
      */
     public StringEditor(final JComponent gui, PrefEntry entry, StringSetting setting) {
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java	(revision 9239)
@@ -53,4 +53,7 @@
     /**
      * Convert 0-based index to preference value.
+     * @param idx 0-based index
+     * @return preference value
+     * @see #zoneToIndex
      */
     protected abstract String indexToZone(int idx);
@@ -58,4 +61,7 @@
     /**
      * Convert preference value to 0-based index.
+     * @param zone preference value
+     * @return 0-based index
+     * @see #indexToZone
      */
     protected abstract int zoneToIndex(String zone);
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionChoice.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionChoice.java	(revision 9238)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionChoice.java	(revision 9239)
@@ -58,4 +58,7 @@
      * Will be called when the preference dialog is dismissed or
      * when the listener from getPreferencePanel is invoked.
+     * @param panel projection preferences panel
+     * @return preferences as a list of strings; may be null to reset everything.
+     * @see #setPreferences
      */
     Collection<String> getPreferences(JPanel panel);
@@ -82,4 +85,5 @@
      * @return the name
      */
+    @Override
     String toString();
 }
Index: /trunk/test/unit/org/openstreetmap/josm/tools/ColorScaleTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/ColorScaleTest.java	(revision 9238)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/ColorScaleTest.java	(revision 9239)
@@ -9,4 +9,7 @@
 import org.junit.Test;
 
+/**
+ * Unit tests for class {@link ColorScale}.
+ */
 public class ColorScaleTest {
 
@@ -15,5 +18,5 @@
      */
     @Test
-    public void testHSBScale() throws Exception {
+    public void testHSBScale() {
         final ColorScale scale = ColorScale.createHSBScale(256);
         assertEquals(new Color(255, 0, 0), scale.getColor(0));