Changeset 2565 in josm for trunk/src/org/openstreetmap/josm/gui/conflict
- Timestamp:
- 2009-12-03T20:26:00+01:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
r2512 r2565 18 18 import org.openstreetmap.josm.data.osm.Relation; 19 19 import org.openstreetmap.josm.data.osm.RelationMember; 20 import org.openstreetmap.josm.data.osm. BackreferencedDataSet.RelationToChildReference;20 import org.openstreetmap.josm.data.osm.RelationToChildReference; 21 21 22 22 /** … … 92 92 RelationMemberConflictDecision d = decisions.get(row); 93 93 switch(column) { 94 95 96 97 98 94 case 0: /* relation */ return d.getRelation(); 95 case 1: /* pos */ return Integer.toString(d.getPos() + 1); // position in "user space" starting at 1 96 case 2: /* role */ return d.getRole(); 97 case 3: /* original */ return d.getOriginalPrimitive(); 98 case 4: /* decision */ return d.getDecision(); 99 99 } 100 100 return null; … … 105 105 RelationMemberConflictDecision d = decisions.get(row); 106 106 switch(column) { 107 108 109 110 111 112 113 107 case 2: /* role */ 108 d.setRole((String)value); 109 break; 110 case 4: /* decision */ 111 d.decide((RelationMemberConflictDecisionType)value); 112 refresh(); 113 break; 114 114 } 115 115 fireTableDataChanged(); … … 233 233 } else { 234 234 switch(decision.getDecision()) { 235 236 237 238 239 240 241 242 243 244 245 246 235 case KEEP: 236 rmNew = new RelationMember(decision.getRole(),newPrimitive); 237 modifiedRelation.addMember(rmNew); 238 isChanged |= ! rm.equals(rmNew); 239 break; 240 case REMOVE: 241 isChanged = true; 242 // do nothing 243 break; 244 case UNDECIDED: 245 // FIXME: this is an error 246 break; 247 247 } 248 248 } … … 278 278 } 279 279 switch(decision.getDecision()) { 280 281 282 283 284 285 286 287 280 case REMOVE: return true; 281 case KEEP: 282 if (!relation.getMember(i).getRole().equals(decision.getRole())) 283 return true; 284 if (relation.getMember(i).getMember() != newPrimitive) 285 return true; 286 case UNDECIDED: 287 // FIXME: handle error 288 288 } 289 289 }
Note:
See TracChangeset
for help on using the changeset viewer.