Changeset 3095 in josm for trunk/test


Ignore:
Timestamp:
2010-03-08T09:24:03+01:00 (15 years ago)
Author:
jttt
Message:

Changes in multipolygon handling (see #4661), cosmetics

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java

    r3025 r3095  
    201201    public void decideMultiple() {
    202202
    203         TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
    204203        TagMergeModel model = new TagMergeModel();
    205204        for (int i=0; i < 10; i++) {
     
    216215        model.decide(new int[] {0, 3, 5}, MergeDecisionType.KEEP_MINE);
    217216        for (int i = 0; i< 10; i++) {
    218             item = list.get(i);
     217            TagMergeItem item = list.get(i);
    219218            if (i == 0 || i == 3 || i == 5) {
    220219                assertEquals(MergeDecisionType.KEEP_MINE, item.getMergeDecision());
Note: See TracChangeset for help on using the changeset viewer.