Changeset 3095 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java

Timestamp:

08.03.2010 09:24:03 (2 years ago)

Author:

jttt

Message:

Changes in multipolygon handling (see #4661), cosmetics

File:

• trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (modified) (2 diffs)

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

@@ -201 +201 @@
     public void decideMultiple() {
 
-        TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
         TagMergeModel model = new TagMergeModel();
         for (int i=0; i < 10; i++) {
@@ -216 +215 @@
         model.decide(new int[] {0, 3, 5}, MergeDecisionType.KEEP_MINE);
         for (int i = 0; i< 10; i++) {
-            item = list.get(i);
+            TagMergeItem item = list.get(i);
             if (i == 0 || i == 3 || i == 5) {
                 assertEquals(MergeDecisionType.KEEP_MINE, item.getMergeDecision());