Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9821)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9822)
@@ -1399,5 +1399,5 @@
     }
 
-    private class SettingToXml implements SettingVisitor {
+    private static class SettingToXml implements SettingVisitor {
         private final StringBuilder b;
         private final boolean noPassword;
@@ -1515,4 +1515,6 @@
      * @param settings preferences settings
      * @param nopass if password must be excluded
+     * @param defaults true, if default values are converted to XML, false for
+     * regular preferences
      * @return XML
      */
Index: /trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java	(revision 9821)
+++ /trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java	(revision 9822)
@@ -127,5 +127,7 @@
                 String localName = parser.getLocalName();
                 if (!topLevelElementName.equals(localName)) {
-                    throw new XMLStreamException(tr("Expected element ''{0}'', but got ''{1}''", topLevelElementName, localName), parser.getLocation());
+                    throw new XMLStreamException(
+                            tr("Expected element ''{0}'', but got ''{1}''", topLevelElementName, localName),
+                            parser.getLocation());
                 }
                 try {
@@ -322,5 +324,5 @@
      * Check if the current element is nil (meaning the value of the setting is null).
      * @return true, if the current element is nil
-     * @see https://msdn.microsoft.com/en-us/library/2b314yt2(v=vs.85).aspx
+     * @see <a href="https://msdn.microsoft.com/en-us/library/2b314yt2(v=vs.85).aspx">Nillable Attribute on MS Developer Network</a>
      */
     private boolean isNil() {