Changeset 6881 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java

Timestamp:

2014-02-24T17:49:12+01:00 (10 years ago)

Author:

Don-vip

Message:

javadoc/code style/minor refactorization

File:

• trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java

@@ -13 +13 @@
 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 +50 @@
     }
 
+    /**
+     * Setup test.
+     */
     @Before
     public void setUp() {
@@ -141 +143 @@
         model.deleteObserver(observerTest);
     }
-
-
 }