Changeset 2083 in josm for trunk/src/org/openstreetmap/josm/gui/conflict
- Timestamp:
- 2009-09-09T00:46:01+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
r2070 r2083 42 42 public boolean isCellEditable(int row, int column) { 43 43 switch(column) { 44 45 44 case 1: return true; 45 default: return false; 46 46 } 47 47 } … … 52 52 protected void setValueAt(DefaultTableModel model, Object value, int row, int col) { 53 53 if (model == getMergedTableModel() && col == 1) { 54 RelationMember member = getMergedEntries().get(row); 55 member.role = (String)value; 54 RelationMember memberOld = getMergedEntries().get(row); 55 RelationMember memberNew = new RelationMember((String)value,memberOld.getMember()); 56 getMergedEntries().remove(row); 57 getMergedEntries().add(row,memberNew); 56 58 fireModelDataChanged(); 57 59 }
Note:
See TracChangeset
for help on using the changeset viewer.