Changeset 11381 in josm for trunk/src/org/openstreetmap/josm/gui/conflict
- Timestamp:
- 2016-12-12T02:28:14+01:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
r10680 r11381 273 273 public void actionPerformed(ActionEvent arg0) { 274 274 int[] rows = mineTable.getSelectedRows(); 275 if (rows == null || rows.length == 0)275 if (rows.length == 0) 276 276 return; 277 277 model.decide(rows, MergeDecisionType.KEEP_MINE); … … 305 305 public void actionPerformed(ActionEvent arg0) { 306 306 int[] rows = theirTable.getSelectedRows(); 307 if (rows == null || rows.length == 0)307 if (rows.length == 0) 308 308 return; 309 309 model.decide(rows, MergeDecisionType.KEEP_THEIR); … … 403 403 public void actionPerformed(ActionEvent arg0) { 404 404 int[] rows = mergedTable.getSelectedRows(); 405 if (rows == null || rows.length == 0)405 if (rows.length == 0) 406 406 return; 407 407 model.decide(rows, MergeDecisionType.UNDECIDED);
Note:
See TracChangeset
for help on using the changeset viewer.