Changeset 5090 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

Timestamp:

2012-03-16T17:32:21+01:00 (12 years ago)

Author:

simon04

Message:

fix #4842 - Combine ways silently combines when tag is not present on one way but present on the other

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

@@ -82 +82 @@
     @Override
     public int getRowCount() {
-        if (decisions == null) return 0;
-        return decisions.size();
+        return getNumDecisions();
     }
 
@@ -184 +183 @@
      */
     public int getNumDecisions() {
-        return  getRowCount();
+        return decisions == null ? 0 : decisions.size();
     }