Changeset 5299 in josm
- Timestamp:
- 2012-06-24T21:15:57+02:00 (13 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java
r5296 r5299 93 93 setBackground(ConflictColors.BGCOLOR.get()); 94 94 setForeground(ConflictColors.FGCOLOR.get()); 95 setBorder(null); 96 setIcon(null); 95 97 setToolTipText(null); 96 98 } -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java
r5266 r5299 153 153 RelationMember member = (RelationMember)value; 154 154 reset(); 155 if (value == null) 156 return this; 157 158 renderBackground(getModel(table), member, row, column, isSelected); 159 renderForeground(getModel(table), member, row, column, isSelected); 160 switch(column) { 161 case 0: 162 renderRowId(row); 163 break; 164 case 1: 165 if (member == null) { 166 renderEmptyRow(); 167 } else { 155 if (member == null) { 156 renderEmptyRow(); 157 } else { 158 renderBackground(getModel(table), member, row, column, isSelected); 159 renderForeground(getModel(table), member, row, column, isSelected); 160 switch(column) { 161 case 0: 162 renderRowId(row); 163 break; 164 case 1: 168 165 renderRole(member); 166 break; 167 case 2: 168 renderPrimitive(member); 169 break; 170 default: 171 // should not happen 169 172 } 170 break;171 case 2:172 if (member == null) {173 renderEmptyRow();174 } else {175 renderPrimitive(member);176 }177 break;178 default:179 // should not happen180 173 } 181 174 return this; -
trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java
r3577 r5299 84 84 Way theirWay = their.addWay(1); 85 85 86 model.populate(myWay, theirWay); 86 model.populate(myWay, theirWay, null); 87 87 model.copyMyToTop(new int[]{0}); 88 88 … … 108 108 Way theirWay = their.addWay(1); 109 109 110 model.populate(myWay, theirWay); 110 model.populate(myWay, theirWay, null); 111 111 112 112 List<Node> mergedNodes = inspectNodeList(model, "Merged"); … … 135 135 136 136 137 model.populate(myWay, theirWay); 137 model.populate(myWay, theirWay, null); 138 138 139 139 List<Node> mergedNodes = inspectNodeList(model, "Merged"); … … 161 161 Way theirWay = their.addWay(1); 162 162 163 model.populate(myWay, theirWay); 163 model.populate(myWay, theirWay, null); 164 164 165 165 List<Node> mergedNodes = inspectNodeList(model, "Merged"); … … 188 188 Way theirWay = their.addWay(1); 189 189 190 model.populate(myWay, theirWay); 190 model.populate(myWay, theirWay, null); 191 191 model.copyMyToEnd(new int[]{0}); 192 192 … … 209 209 Way theirWay = their.addWay(1); 210 210 211 model.populate(myWay, theirWay); 211 model.populate(myWay, theirWay, null); 212 212 213 213 List<Node> mergedNodes = inspectNodeList(model, "Merged"); … … 235 235 Way theirWay = their.addWay(1); 236 236 237 model.populate(myWay, theirWay); 237 model.populate(myWay, theirWay, null); 238 238 239 239 List<Node> mergedNodes = inspectNodeList(model, "Merged"); … … 263 263 Way theirWay = their.addWay(1); 264 264 265 model.populate(myWay, theirWay); 265 model.populate(myWay, theirWay, null); 266 266 267 267 List<Node> mergedNodes = inspectNodeList(model, "Merged"); … … 294 294 Way theirWay = their.addWay(1); 295 295 296 model.populate(myWay, theirWay); 296 model.populate(myWay, theirWay, null); 297 297 List<Node> mergedNodes = inspectNodeList(model, "Merged"); 298 298 mergedNodes.add(new Node(10)); … … 322 322 Way theirWay = their.addWay(1); 323 323 324 model.populate(myWay, theirWay); 324 model.populate(myWay, theirWay, null); 325 325 List<Node> mergedNodes = inspectNodeList(model, "Merged"); 326 326 mergedNodes.add(new Node(10)); … … 350 350 Way theirWay = their.addWay(1); 351 351 352 model.populate(myWay, theirWay); 352 model.populate(myWay, theirWay, null); 353 353 List<Node> mergedNodes = inspectNodeList(model, "Merged"); 354 354 mergedNodes.add(new Node(10)); … … 383 383 Way theirWay = their.addWay(1); 384 384 385 model.populate(myWay, theirWay); 385 model.populate(myWay, theirWay, null); 386 386 List<Node> mergedNodes = inspectNodeList(model, "Merged"); 387 387 mergedNodes.add(new Node(10)); … … 412 412 Way theirWay = their.addWay(1); 413 413 414 model.populate(myWay, theirWay); 414 model.populate(myWay, theirWay, null); 415 415 List<Node> mergedNodes = inspectNodeList(model, "Merged"); 416 416 mergedNodes.add(new Node(10)); … … 442 442 Way theirWay = their.addWay(1); 443 443 444 model.populate(myWay, theirWay); 444 model.populate(myWay, theirWay, null); 445 445 List<Node> mergedNodes = inspectNodeList(model, "Merged"); 446 446 mergedNodes.add(new Node(10)); … … 474 474 Way theirWay = new Way(1); 475 475 476 model.populate(myWay, theirWay); 476 model.populate(myWay, theirWay, null); 477 477 List<Node> mergedNodes = inspectNodeList(model, "Merged"); 478 478 mergedNodes.add(new Node(10)); … … 500 500 Way theirWay = new Way(1); 501 501 502 model.populate(myWay, theirWay); 502 model.populate(myWay, theirWay, null); 503 503 List<Node> mergedNodes = inspectNodeList(model, "Merged"); 504 504 mergedNodes.add(new Node(10)); … … 530 530 Way theirWay = new Way(1); 531 531 532 model.populate(myWay, theirWay); 532 model.populate(myWay, theirWay, null); 533 533 List<Node> mergedNodes = inspectNodeList(model, "Merged"); 534 534 mergedNodes.add(new Node(10)); … … 563 563 Way theirWay = new Way(1); 564 564 565 model.populate(myWay, theirWay); 565 model.populate(myWay, theirWay, null); 566 566 List<Node> mergedNodes = inspectNodeList(model, "Merged"); 567 567 mergedNodes.add(new Node(10)); … … 589 589 Way theirWay = new Way(1); 590 590 591 model.populate(myWay, theirWay); 591 model.populate(myWay, theirWay, null); 592 592 List<Node> mergedNodes = inspectNodeList(model, "Merged"); 593 593 mergedNodes.add(new Node(10)); … … 619 619 Way theirWay = new Way(1); 620 620 621 model.populate(myWay, theirWay); 621 model.populate(myWay, theirWay, null); 622 622 List<Node> mergedNodes = inspectNodeList(model, "Merged"); 623 623 mergedNodes.add(new Node(10));
Note:
See TracChangeset
for help on using the changeset viewer.