Changeset 9547 in josm for trunk/test/unit

Timestamp:

2016-01-20T01:28:07+01:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• corrector/ReverseWayNoTagCorrectorTest.java (modified) (2 diffs)
• gui/conflict/pair/nodes/NodeListMergeModelTest.java (modified) (1 diff)
• gui/conflict/pair/properties/PropertiesMergeModelTest.java (modified) (1 diff)
• gui/conflict/pair/tags/TagMergeItemTest.java (modified) (1 diff)
• gui/conflict/pair/tags/TagMergeModelTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrectorTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.corrector;
+
+import static org.junit.Assert.assertEquals;
 
 import org.junit.BeforeClass;
@@ -6 +8 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.osm.Tag;
-
-import static org.junit.Assert.*;
 
 /**

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListMergeModel;
 
 public class NodeListMergeModelTest {

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

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
-import org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMergeModel;
 
 public class PropertiesMergeModelTest {

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItemTest.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
-import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;
 
 /**

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModelTest.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
-import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;
-import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeModel;
 
 /**