Changeset 5090 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2012-03-16T17:32:21+01:00 (12 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/conflict/tags
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
r3083 r5090 82 82 @Override 83 83 public int getRowCount() { 84 if (decisions == null) return 0; 85 return decisions.size(); 84 return getNumDecisions(); 86 85 } 87 86 … … 184 183 */ 185 184 public int getNumDecisions() { 186 return getRowCount();185 return decisions == null ? 0 : decisions.size(); 187 186 } 188 187 -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
r3083 r5090 179 179 180 180 public int getNumDecisions() { 181 return getRowCount();181 return decisions == null ? 0 : decisions.size(); 182 182 } 183 183
Note:
See TracChangeset
for help on using the changeset viewer.