Index: trunk/test/unit/org/openstreetmap/josm/data/preferences/PreferencesWriterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/preferences/PreferencesWriterTest.java	(revision 9832)
+++ trunk/test/unit/org/openstreetmap/josm/data/preferences/PreferencesWriterTest.java	(revision 9838)
@@ -36,5 +36,9 @@
             w.visit(setting(new ListListSetting(Arrays.asList(Arrays.asList("bar"))), time));
             assertEquals(String.format(
-                    "  <lists key='null' time='%d'>%n    <list>%n      <entry value='bar'/>%n    </list>%n  </lists>%n", time),
+                    "  <lists key='null' time='%d'>%n" +
+                    "    <list>%n" +
+                    "      <entry value='bar'/>%n" +
+                    "    </list>%n" +
+                    "  </lists>%n", time),
                     out.toString());
         }
@@ -51,5 +55,7 @@
             w.visit(setting(new ListSetting(Arrays.asList("bar")), time));
             assertEquals(String.format(
-                    "  <list key='null' time='%d'>%n    <entry value='bar'/>%n  </list>%n", time),
+                    "  <list key='null' time='%d'>%n" +
+                    "    <entry value='bar'/>%n" +
+                    "  </list>%n", time),
                     out.toString());
         }
@@ -68,5 +74,9 @@
             w.visit(setting(new MapListSetting(Arrays.asList(map)), time));
             assertEquals(String.format(
-                    "  <maps key='null' time='%d'>%n    <map>%n      <tag key='foo' value='bar'/>%n    </map>%n  </maps>%n", time),
+                    "  <maps key='null' time='%d'>%n" +
+                    "    <map>%n" +
+                    "      <tag key='foo' value='bar'/>%n" +
+                    "    </map>%n" +
+                    "  </maps>%n", time),
                     out.toString());
         }
@@ -101,5 +111,8 @@
             assertEquals(String.format(
                     // CHECKSTYLE.OFF: LineLength
-                    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>%n<preferences-defaults xmlns='http://josm.openstreetmap.de/preferences-1.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' version='%d'>%n  <tag key='foo' time='%d' value='bar'/>%n</preferences-defaults>%n",
+                    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>%n" +
+                    "<preferences-defaults xmlns='http://josm.openstreetmap.de/preferences-1.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' version='%d'>%n" +
+                    "  <tag key='foo' time='%d' value='bar'/>%n" +
+                    "</preferences-defaults>%n",
                     // CHECKSTYLE.ON: LineLength
                     Version.getInstance().getVersion(), time),
@@ -110,5 +123,5 @@
     /**
      * Test null value in default preferences.
-     * @throws IOException
+     * @throws IOException if any I/O error occurs
      */
     @Test