Index: /trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /trunk/.settings/org.eclipse.jdt.core.prefs	(revision 9248)
+++ /trunk/.settings/org.eclipse.jdt.core.prefs	(revision 9249)
@@ -55,5 +55,5 @@
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 9248)
+++ /trunk/build.xml	(revision 9249)
@@ -276,4 +276,5 @@
                 encoding="UTF-8"    
                 packagenames="org.openstreetmap.josm.*,org.openstreetmap.gui.jmapviewer.*"
+        	    excludepackagenames="org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.*"
                 windowtitle="JOSM"
                 use="true"
Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java	(revision 9248)
+++ /trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java	(revision 9249)
@@ -32,5 +32,4 @@
  *         RegexValidator validator = new RegexValidator(regexs, false);
  * </pre>
- * <p>
  * <ul>
  *   <li>Validate <code>true</code> or <code>false</code>:
Index: /trunk/src/org/openstreetmap/josm/gui/FileDrop.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 9248)
+++ /trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 9249)
@@ -34,4 +34,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.OpenFileAction;
+import org.openstreetmap.josm.gui.FileDrop.TransferableObject;
 
 // CHECKSTYLE.OFF: HideUtilityClassConstructor
@@ -65,5 +66,4 @@
  * object (such as <tt>System.out</tt>) into the full constructor. A <tt>null</tt>
  * value will result in no extra debugging information being output.
- * <p>
  *
  * <p>I'm releasing this code into the Public Domain. Enjoy.
Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java	(revision 9248)
+++ /trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java	(revision 9249)
@@ -35,5 +35,5 @@
      *
      * @param helpTopicUrl  the absolute help topic URL
-     * @param dotest
+     * @param dotest if {@code true}, checks if help content is empty
      * @return the content, filtered and transformed for being displayed in the internal help browser
      * @throws HelpContentReaderException if problem occurs
Index: /trunk/src/org/openstreetmap/josm/gui/util/StayOpenCheckBoxMenuItem.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/util/StayOpenCheckBoxMenuItem.java	(revision 9248)
+++ /trunk/src/org/openstreetmap/josm/gui/util/StayOpenCheckBoxMenuItem.java	(revision 9249)
@@ -3,5 +3,4 @@
 
 import javax.swing.Action;
-import javax.swing.Icon;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.MenuElement;
@@ -9,5 +8,4 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-
 
 /**
@@ -33,50 +31,9 @@
 
   /**
-   * @see JCheckBoxMenuItem#JCheckBoxMenuItem()
-   */
-  public StayOpenCheckBoxMenuItem() {
-    super();
-  }
-
-  /**
-   * @see JCheckBoxMenuItem#JCheckBoxMenuItem(Action)
+   * Contructs a new {@code StayOpenCheckBoxMenuItem} whose properties are taken from the Action supplied.
+   * @param a action
    */
   public StayOpenCheckBoxMenuItem(Action a) {
     super(a);
-  }
-
-  /**
-   * @see JCheckBoxMenuItem#JCheckBoxMenuItem(Icon)
-   */
-  public StayOpenCheckBoxMenuItem(Icon icon) {
-    super(icon);
-  }
-
-  /**
-   * @see JCheckBoxMenuItem#JCheckBoxMenuItem(String)
-   */
-  public StayOpenCheckBoxMenuItem(String text) {
-    super(text);
-  }
-
-  /**
-   * @see JCheckBoxMenuItem#JCheckBoxMenuItem(String, boolean)
-   */
-  public StayOpenCheckBoxMenuItem(String text, boolean selected) {
-    super(text, selected);
-  }
-
-  /**
-   * @see JCheckBoxMenuItem#JCheckBoxMenuItem(String, Icon)
-   */
-  public StayOpenCheckBoxMenuItem(String text, Icon icon) {
-    super(text, icon);
-  }
-
-  /**
-   * @see JCheckBoxMenuItem#JCheckBoxMenuItem(String, Icon, boolean)
-   */
-  public StayOpenCheckBoxMenuItem(String text, Icon icon, boolean selected) {
-    super(text, icon, selected);
   }
 
Index: unk/src/org/openstreetmap/josm/gui/util/StayOpenMenuItem.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/util/StayOpenMenuItem.java	(revision 9248)
+++ 	(revision )
@@ -1,85 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.util;
-
-import javax.swing.Action;
-import javax.swing.Icon;
-import javax.swing.JMenuItem;
-import javax.swing.MenuElement;
-import javax.swing.MenuSelectionManager;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-/**
- * An extension of JMenuItem that doesn't close the menu when selected.
- *
- * @author Darryl https://tips4java.wordpress.com/2010/09/12/keeping-menus-open/
- */
-public class StayOpenMenuItem extends JMenuItem {
-
-  private static volatile MenuElement[] path;
-
-  {
-    getModel().addChangeListener(new ChangeListener() {
-
-      @Override
-      public void stateChanged(ChangeEvent e) {
-        if (getModel().isArmed() && isShowing()) {
-          path = MenuSelectionManager.defaultManager().getSelectedPath();
-        }
-      }
-    });
-  }
-
-  /**
-   * @see JMenuItem#JMenuItem()
-   */
-  public StayOpenMenuItem() {
-    super();
-  }
-
-  /**
-   * @see JMenuItem#JMenuItem(javax.swing.Action)
-   */
-  public StayOpenMenuItem(Action a) {
-    super(a);
-  }
-
-  /**
-   * @see JMenuItem#JMenuItem(javax.swing.Icon)
-   */
-  public StayOpenMenuItem(Icon icon) {
-    super(icon);
-  }
-
-  /**
-   * @see JMenuItem#JMenuItem(java.lang.String)
-   */
-  public StayOpenMenuItem(String text) {
-    super(text);
-  }
-
-  /**
-   * @see JMenuItem#JMenuItem(java.lang.String, javax.swing.Icon)
-   */
-  public StayOpenMenuItem(String text, Icon icon) {
-    super(text, icon);
-  }
-
-  /**
-   * @see JMenuItem#JMenuItem(java.lang.String, int)
-   */
-  public StayOpenMenuItem(String text, int mnemonic) {
-    super(text, mnemonic);
-  }
-
-  /**
-   * Overridden to reopen the menu.
-   *
-   * @param pressTime the time to "hold down" the button, in milliseconds
-   */
-  @Override
-  public void doClick(int pressTime) {
-    super.doClick(pressTime);
-    MenuSelectionManager.defaultManager().setSelectedPath(path);
-  }
-}
Index: unk/src/org/openstreetmap/josm/gui/util/StayOpenRadioButtonMenuItem.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/util/StayOpenRadioButtonMenuItem.java	(revision 9248)
+++ 	(revision )
@@ -1,99 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.util;
-
-import javax.swing.Action;
-import javax.swing.Icon;
-import javax.swing.JRadioButtonMenuItem;
-import javax.swing.MenuElement;
-import javax.swing.MenuSelectionManager;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-/**
- * An extension of JRadioButtonMenuItem that doesn't close the menu when selected.
- *
- * @author Darryl https://tips4java.wordpress.com/2010/09/12/keeping-menus-open/
- */
-public class StayOpenRadioButtonMenuItem extends JRadioButtonMenuItem {
-
-  private static volatile MenuElement[] path;
-
-  {
-    getModel().addChangeListener(new ChangeListener() {
-
-      @Override
-      public void stateChanged(ChangeEvent e) {
-        if (getModel().isArmed() && isShowing()) {
-          path = MenuSelectionManager.defaultManager().getSelectedPath();
-        }
-      }
-    });
-  }
-
-  /**
-   * @see JRadioButtonMenuItem#JRadioButtonMenuItem()
-   */
-  public StayOpenRadioButtonMenuItem() {
-    super();
-  }
-
-  /**
-   * @see JRadioButtonMenuItem#JRadioButtonMenuItem(Action)
-   */
-  public StayOpenRadioButtonMenuItem(Action a) {
-    super(a);
-  }
-
-  /**
-   * @see JRadioButtonMenuItem#JRadioButtonMenuItem(Icon)
-   */
-  public StayOpenRadioButtonMenuItem(Icon icon) {
-    super(icon);
-  }
-
-  /**
-   * @see JRadioButtonMenuItem#JRadioButtonMenuItem(Icon, boolean)
-   */
-  public StayOpenRadioButtonMenuItem(Icon icon, boolean selected) {
-    super(icon, selected);
-  }
-
-  /**
-   * @see JRadioButtonMenuItem#JRadioButtonMenuItem(String)
-   */
-  public StayOpenRadioButtonMenuItem(String text) {
-    super(text);
-  }
-
-  /**
-   * @see JRadioButtonMenuItem#JRadioButtonMenuItem(String, boolean)
-   */
-  public StayOpenRadioButtonMenuItem(String text, boolean selected) {
-    super(text, selected);
-  }
-
-  /**
-   * @see JRadioButtonMenuItem#JRadioButtonMenuItem(String, Icon)
-   */
-  public StayOpenRadioButtonMenuItem(String text, Icon icon) {
-    super(text, icon);
-  }
-
-  /**
-   * @see JRadioButtonMenuItem#JRadioButtonMenuItem(String, Icon, boolean)
-   */
-  public StayOpenRadioButtonMenuItem(String text, Icon icon, boolean selected) {
-    super(text, icon, selected);
-  }
-
-  /**
-   * Overridden to reopen the menu.
-   *
-   * @param pressTime the time to "hold down" the button, in milliseconds
-   */
-  @Override
-  public void doClick(int pressTime) {
-    super.doClick(pressTime);
-    MenuSelectionManager.defaultManager().setSelectedPath(path);
-  }
-}
Index: /trunk/src/org/openstreetmap/josm/tools/HttpClient.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/HttpClient.java	(revision 9248)
+++ /trunk/src/org/openstreetmap/josm/tools/HttpClient.java	(revision 9249)
@@ -328,5 +328,5 @@
          * @return {@code Expire} HTTP header
          * @see HttpURLConnection#getExpiration()
-         * @since 
+         * @since 9232
          */
         public long getExpiration() {