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 6643)
+++ 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 6643)
+++ 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 6643)
+++ 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 6643)
+++ 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 6643)
+++ 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 6643)
+++ 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 6643)
+++ 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 6643)
+++ 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 6643)
+++ 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 {