Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java	(revision 6871)
+++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java	(revision 6881)
@@ -60,4 +60,7 @@
     }
 
+    /**
+     * Constructs a new {@code NodeListMergerTest}.
+     */
     public NodeListMergerTest() {
         build();
@@ -70,5 +73,3 @@
         test.setVisible(true);
     }
-
-
 }
Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java	(revision 6871)
+++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java	(revision 6881)
@@ -35,4 +35,7 @@
     }
 
+    /**
+     * Constructs a new {@code PropertiesMergerTest}.
+     */
     public PropertiesMergerTest() {
         build();
@@ -45,4 +48,3 @@
         app.setVisible(true);
     }
-
 }
Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java	(revision 6871)
+++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java	(revision 6881)
@@ -39,4 +39,7 @@
     }
 
+    /**
+     * Constructs a new {@code RelationMemberMergerTest}.
+     */
     public RelationMemberMergerTest() {
         build();
Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java	(revision 6871)
+++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java	(revision 6881)
@@ -6,17 +6,17 @@
 import javax.swing.JFrame;
 
-import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;
-import org.openstreetmap.josm.gui.conflict.pair.tags.TagMerger;
-
 public class TagMergerTest extends JFrame {
 
     private TagMerger tagMerger;
-    
+
     protected void build() {
         tagMerger = new TagMerger();
         getContentPane().setLayout(new BorderLayout());
-        getContentPane().add(tagMerger, BorderLayout.CENTER);        
+        getContentPane().add(tagMerger, BorderLayout.CENTER);
     }
-    
+
+    /**
+     * Constructs a new {@code TagMergerTest}.
+     */
     public TagMergerTest() {
         build();
@@ -29,5 +29,5 @@
         }
     }
-    
+
     public static void main(String args[]) {
         TagMergerTest test  = new TagMergerTest();
@@ -35,4 +35,3 @@
         test.setVisible(true);
     }
-    
 }
Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java	(revision 6871)
+++ trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java	(revision 6881)
@@ -17,7 +17,6 @@
         dialog = new ConflictResolutionDialog(this);
         dialog.setSize(600,600);
+    }
 
-
-    }
     protected void populate() {
         Way w1 = new Way(1);
@@ -36,4 +35,7 @@
     }
 
+    /**
+     * Constructs a new {@code ConflictResolutionDialogTest}.
+     */
     public ConflictResolutionDialogTest() {
         build();
Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java	(revision 6871)
+++ trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java	(revision 6881)
@@ -7,7 +7,4 @@
 
     private ChangesetCacheManager manager;
-
-    public ChangesetCacheManagerTest() {
-    }
 
     public void start() {
Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java	(revision 6871)
+++ trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java	(revision 6881)
@@ -8,7 +8,4 @@
     private ChangesetQueryDialog dialog;
 
-    public ChangesetQueryDialogTest() {
-    }
-
     public void start() {
         dialog = new ChangesetQueryDialog(this);
@@ -17,5 +14,4 @@
     }
 
-
     static public void main(String args[]) {
         new ChangesetQueryDialogTest().start();
Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 6871)
+++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 6881)
@@ -229,5 +229,7 @@
     private DataSet ds;
 
-
+    /**
+     * Setup test.
+     */
     @Before
     public void setUp() throws IOException, IllegalDataException {
Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 6871)
+++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 6881)
@@ -236,4 +236,7 @@
     private DataSet ds;
 
+    /**
+     * Setup test.
+     */
     @Before
     public void setUp() throws IOException, IllegalDataException {
Index: trunk/test/unit/org/openstreetmap/TestUtils.java
===================================================================
--- trunk/test/unit/org/openstreetmap/TestUtils.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/TestUtils.java	(revision 6881)
@@ -2,5 +2,10 @@
 package org.openstreetmap;
 
-import org.junit.Before;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Map;
+
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
@@ -10,10 +15,4 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.TextTagParser;
-
-import java.util.Map;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 public class TestUtils {
Index: trunk/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java	(revision 6881)
@@ -5,5 +5,4 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -11,6 +10,9 @@
 public class SearchCompilerTest {
 
+    /**
+     * Setup test.
+     */
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         Main.initApplicationPreferences();
     }
Index: trunk/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java	(revision 6881)
@@ -6,5 +6,4 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.Tag;
 
@@ -21,5 +20,5 @@
         Main.initApplicationPreferences();
     }
-    
+
     /**
      * Test of {@link ReverseWayTagCorrector.TagSwitcher#apply} method.
@@ -93,5 +92,5 @@
         assertSwitch(new Tag("type", "drawdown"), new Tag("type", "drawdown"));
     }
-    
+
     private void assertSwitch(Tag oldTag, Tag newTag) {
         Assert.assertEquals(ReverseWayTagCorrector.TagSwitcher.apply(oldTag), newTag);
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java	(revision 6881)
@@ -12,6 +12,4 @@
 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
 import org.openstreetmap.josm.data.APIDataSet;
-import org.openstreetmap.josm.data.Preferences;
-
 
 public class APIDataSetTest {
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 6881)
@@ -18,46 +18,8 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projections;
 
 public class DataSetMergerTest {
-    /*private static Logger logger = Logger.getLogger(DataSetMergerTest.class.getName());
-
-    static Properties testProperties;
-
-    @BeforeClass
-    static public void init() {
-
-        if(System.getProperty("josm.home") == null){
-            testProperties = new Properties();
-
-            // load properties
-            //
-            try {
-                testProperties.load(DataSetMergerTest.class.getResourceAsStream("/test-unit-env.properties"));
-            } catch(Exception e){
-                logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "/test-unit-env.properties"));
-                fail(MessageFormat.format("failed to load property file ''{0}''", "/test-unit-env.properties"));
-            }
-
-            // check josm.home
-            //
-            String josmHome = testProperties.getProperty("josm.home");
-            if (josmHome == null) {
-                fail(MessageFormat.format("property ''{0}'' not set in test environment", "josm.home"));
-            } else {
-                File f = new File(josmHome);
-                if (! f.exists() || ! f.canRead()) {
-                    fail(MessageFormat.format("property ''{0}'' points to ''{1}'' which is either not existing or not readable", "josm.home", josmHome));
-                }
-            }
-            System.setProperty("josm.home", josmHome);
-        }
-        Main.pref.init(false);
-
-        // init projection
-        Main.proj = new Mercator();
-    }*/
 
     @BeforeClass
@@ -69,4 +31,7 @@
     private DataSet their;
 
+    /**
+     * Setup test.
+     */
     @Before
     public void setUp() {
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java	(revision 6881)
@@ -17,5 +17,4 @@
 import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
 import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projections;
@@ -24,7 +23,9 @@
 import org.openstreetmap.josm.io.OsmReader;
 
-
 public class FilterTest {
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void setUp() {
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java	(revision 6881)
@@ -36,6 +36,5 @@
 
     /**
-     * Add a tag to an empty node and test the query and get methods.
-     *
+     * Adds a tag to an empty node and test the query and get methods.
      */
     @Test
@@ -51,5 +50,5 @@
 
     /**
-     * Add two tags to an empty node and test the query and get methods.
+     * Adds two tags to an empty node and test the query and get methods.
      */
     @Test
@@ -68,6 +67,5 @@
 
     /**
-     * Remove tags from a node with two tags and test the state of the node.
-     *
+     * Removes tags from a node with two tags and test the state of the node.
      */
     @Test
@@ -96,6 +94,5 @@
 
     /**
-     * Remove all tags from a node
-     *
+     * Removes all tags from a node.
      */
     @Test
@@ -132,5 +129,4 @@
      * Test hasEqualSemanticAttributes on two nodes with different tags.
      */
-
     @Test
     public void hasEqualSemanticAttributes_2() {
@@ -147,4 +143,3 @@
         assertTrue(!n1.hasEqualSemanticAttributes(n2));
     }
-
 }
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java	(revision 6881)
@@ -9,5 +9,4 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projections;
@@ -27,4 +26,7 @@
     private DataSet dataSet = new DataSet();
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void setUp() {
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java	(revision 6881)
@@ -14,5 +14,4 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projections;
@@ -82,4 +81,3 @@
         removeAllTest(ds);
     }
-
 }
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java	(revision 6881)
@@ -8,5 +8,4 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projections;
@@ -14,4 +13,7 @@
 public class RelationTest {
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void setUp() {
@@ -104,4 +106,3 @@
         Assert.assertEquals(new BBox(w1), r1.getBBox());
     }
-
 }
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java	(revision 6881)
@@ -1,5 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm.history;
-
 
 import static org.junit.Assert.assertEquals;
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 6881)
@@ -12,5 +12,4 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -35,4 +34,7 @@
     }
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void setUp() {
Index: trunk/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java	(revision 6881)
@@ -41,5 +41,4 @@
             maxErrLon = Math.max(maxErrLon, Math.abs(lon - ll.lon()));
         }
-        //System.err.println(String.format("maxerror lat: %s maxerror lon: %s", maxErrLat, maxErrLon));
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java	(revision 6881)
@@ -1,5 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.projection;
-
 
 import java.io.BufferedReader;
@@ -25,5 +24,4 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -147,4 +145,7 @@
     }
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void setUp() {
@@ -198,5 +199,4 @@
             throw new AssertionError(fail.toString());
         }
-
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java	(revision 6881)
@@ -12,5 +12,4 @@
 public class ProjectionTest {
 
-    private static final boolean debug = false;
     private static Random rand = new Random(System.currentTimeMillis());
 
@@ -64,13 +63,13 @@
             double maxErrLat = 0, maxErrLon = 0;
             Bounds b = p.getWorldBoundsLatLon();
-    
+
             text += String.format("*** %s %s%n", p.toString(), p.toCode());
             for (int num=0; num < 1000; ++num) {
-    
+
                 double lat = rand.nextDouble() * (b.getMax().lat() - b.getMin().lat()) + b.getMin().lat();
                 double lon = rand.nextDouble() * (b.getMax().lon() - b.getMin().lon()) + b.getMin().lon();
-    
+
                 LatLon ll = new LatLon(lat, lon);
-    
+
                 for (int i=0; i<10; ++i) {
                     EastNorth en = p.latlon2eastNorth(ll);
@@ -80,5 +79,5 @@
                 maxErrLon = Math.max(maxErrLon, Math.abs(lon - ll.lon()));
             }
-    
+
             String mark = "";
             if (maxErrLat + maxErrLon > 1e-5) {
Index: trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java	(revision 6881)
@@ -13,4 +13,7 @@
     private boolean debug = false;
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void setUp() {
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java	(revision 6881)
@@ -7,5 +7,4 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -15,10 +14,10 @@
 
 /**
- * JUnit Test of "Duplicate node" validation test. 
+ * JUnit Test of "Duplicate node" validation test.
  */
 public class DuplicateNodeTest {
 
     /**
-     * Setup test by initializing JOSM preferences and projection. 
+     * Setup test by initializing JOSM preferences and projection.
      */
     @BeforeClass
@@ -44,5 +43,5 @@
         test.visit(ds.allPrimitives());
         test.endTest();
-        
+
         assertEquals(1, test.getErrors().size());
     }
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java	(revision 6881)
@@ -28,4 +28,7 @@
 public class MapCSSTagCheckerTest {
 
+    /**
+     * Setup test.
+     */
     @Before
     public void setUp() throws Exception {
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java	(revision 6881)
@@ -2,15 +2,9 @@
 package org.openstreetmap.josm.data.validation.tests;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.Tag;
-import org.openstreetmap.josm.data.validation.Severity;
-import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset;
-import org.openstreetmap.josm.gui.tagging.TaggingPresetItem;
-import org.openstreetmap.josm.gui.tagging.TaggingPresetItems;
-import org.openstreetmap.josm.gui.tagging.TaggingPresetReader;
-import org.openstreetmap.josm.gui.tagging.TaggingPresetSearchAction;
+import static org.CustomMatchers.hasSize;
+import static org.CustomMatchers.isEmpty;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertThat;
 
 import java.util.Arrays;
@@ -20,12 +14,16 @@
 import java.util.Set;
 
-import static org.CustomMatchers.hasSize;
-import static org.CustomMatchers.isEmpty;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.validation.Severity;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItem;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetReader;
 
 /**
- * JUnit Test of "Opening hours" validation test. 
+ * JUnit Test of "Opening hours" validation test.
  */
 public class OpeningHourTestTest {
@@ -33,4 +31,7 @@
     private static final OpeningHourTest OPENING_HOUR_TEST = new OpeningHourTest();
 
+    /**
+     * Setup test.
+     */
     @Before
     public void setUp() throws Exception {
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java	(revision 6881)
@@ -19,4 +19,7 @@
     UnconnectedWays bib;
 
+    /**
+     * Setup test.
+     */
     @Before
     public void setUp() throws Exception {
Index: trunk/test/unit/org/openstreetmap/josm/gui/SystemOfMeasurementTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/SystemOfMeasurementTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/gui/SystemOfMeasurementTest.java	(revision 6881)
@@ -1,15 +1,14 @@
 package org.openstreetmap.josm.gui;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.gui.NavigatableComponent.SystemOfMeasurement;
-
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.util.Locale;
 
 /**
@@ -25,5 +24,5 @@
         Main.initApplicationPreferences();
     }
-    
+
     /**
      * Test of {@link SystemOfMeasurement#getDistText} method.
@@ -31,5 +30,5 @@
     @Test
     public void testGetDistText() {
-        
+
         assertEquals("< 0.01 m", NavigatableComponent.METRIC_SOM.getDistText(-1));
         assertEquals("< 0.01 m", NavigatableComponent.METRIC_SOM.getDistText(-0.99));
@@ -38,5 +37,5 @@
 
         assertEquals("0.01 m", NavigatableComponent.METRIC_SOM.getDistText(0.01));
-        
+
         assertEquals("0.99 m", NavigatableComponent.METRIC_SOM.getDistText(0.99));
         assertEquals("1.00 m", NavigatableComponent.METRIC_SOM.getDistText(1.0));
@@ -67,4 +66,7 @@
     }
 
+    /**
+     * Test of {@link SystemOfMeasurement#getDistText} method with a non-English locale.
+     */
     @Test
     public void testGetDistTextLocalized() {
@@ -88,5 +90,5 @@
 
         assertEquals("0.01 m²", NavigatableComponent.METRIC_SOM.getAreaText(0.01));
-        
+
         assertEquals("0.99 m²", NavigatableComponent.METRIC_SOM.getAreaText(0.99));
         assertEquals("1.00 m²", NavigatableComponent.METRIC_SOM.getAreaText(1.0));
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 6881)
@@ -13,5 +13,4 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -51,4 +50,7 @@
     }
 
+    /**
+     * Setup test.
+     */
     @Before
     public void setUp() {
@@ -141,5 +143,3 @@
         model.deleteObserver(observerTest);
     }
-
-
 }
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java	(revision 6881)
@@ -1,4 +1,12 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.tagging;
+
+import static org.CustomMatchers.hasSize;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
 
 import org.junit.Assert;
@@ -10,12 +18,4 @@
 import org.xml.sax.SAXException;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-
-import static org.CustomMatchers.hasSize;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
 /**
  * Unit tests of {@link TaggingPresetReader} class.
@@ -23,6 +23,9 @@
 public class TaggingPresetReaderTest {
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
-    public static void setUpClass() {
+    public static void setUp() {
         Main.initApplicationPreferences();
     }
@@ -30,6 +33,6 @@
     /**
      * Gets path to test data directory for given ticketid.
-     * @param ticketid 
-     * @return 
+     * @param ticketid
+     * @return
      */
     protected static String getRegressionDataDir(int ticketid) {
@@ -41,5 +44,5 @@
      * @param ticketid
      * @param filename
-     * @return 
+     * @return
      */
     protected static String getRegressionDataFile(int ticketid, String filename) {
@@ -85,4 +88,3 @@
         Assert.assertTrue("Default presets are empty", presets.size()>0);
     }
-    
 }
Index: trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java	(revision 6881)
@@ -10,9 +10,12 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 
 public class TextTagParserTest {
+
+    /**
+     * Setup test.
+     */
     @BeforeClass
-    public static void before() {
+    public static void setUp() {
         Main.initApplicationPreferences();
     }
@@ -26,5 +29,5 @@
         s = "\"2 \\\"3\\\" 4\"";       s1 = "2 \"3\" 4";
         Assert.assertEquals(s1, TextTagParser.unescape(s));
-        
+
         s = "\"2 3 ===4===\"";       s1 = "2 3 ===4===";
         Assert.assertEquals(s1, TextTagParser.unescape(s));
@@ -33,5 +36,5 @@
         Assert.assertEquals(s1, TextTagParser.unescape(s));
     }
-    
+
     @Test
     public void testTNformat() {
@@ -63,10 +66,10 @@
         tags = TextTagParser.readTagsFromText(txt);
         Assert.assertEquals(correctTags, tags);
-        
+
         txt = "\"a\"  :     \"1 1 1\", \"b2\"  :\"2 \\\"3 qwe\\\" 4\"";
         correctTags= new HashMap<String, String>() { { put("a", "1 1 1"); put("b2", "2 \"3 qwe\" 4");}};
         tags = TextTagParser.readTagsFromText(txt);
         Assert.assertEquals(correctTags, tags);
-        
+
         txt = " \"aыыы\"   :    \"val\\\"\\\"\\\"ue1\"";
         correctTags= new HashMap<String, String>() { { put("aыыы", "val\"\"\"ue1");} };
@@ -74,5 +77,5 @@
         Assert.assertEquals(correctTags, tags);
     }
-    
+
     @Test
     public void testFreeformat() {
@@ -84,5 +87,5 @@
         Assert.assertEquals(correctTags, tags);
     }
-    
+
     @Test
     public void errorDetect() {
@@ -90,5 +93,5 @@
         Map<String, String> tags = TextTagParser.readTagsFromText(txt);
         Assert.assertEquals(Collections.EMPTY_MAP, tags);
-        
+
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java	(revision 6871)
+++ trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java	(revision 6881)
@@ -19,6 +19,9 @@
 public class TemplateEngineTest {
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
-    public static void before() {
+    public static void setUp() {
         Main.initApplicationPreferences();
     }