Changeset 2027 in josm
- Timestamp:
- 2009-09-02T21:51:49+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
r2018 r2027 306 306 void membershipEdit(int row) { 307 307 Relation relation = (Relation)membershipData.getValueAt(row, 0); 308 Main.ma in.map.relationListDialog.selectRelation(relation);308 Main.map.relationListDialog.selectRelation(relation); 309 309 RelationEditor.getEditor( 310 310 Main.map.mapView.getEditLayer(), … … 474 474 c.setFont(c.getFont().deriveFont(Font.ITALIC)); 475 475 } else { 476 final Map.Entry entry = (Map.Entry) v.entrySet().iterator().next(); 476 final Map.Entry entry = (Map.Entry) v.entrySet().iterator().next(); 477 477 str = (String) entry.getKey(); 478 478 } … … 751 751 if (Main.main.getCurrentDataSet() != null) { 752 752 for (Relation r : Main.main.getCurrentDataSet().relations) { 753 if (!r. deleted&& !r.incomplete) {753 if (!r.isDeleted() && !r.incomplete) { 754 754 for (RelationMember m : r.getMembers()) { 755 755 if (newSelection.contains(m.getMember())) { … … 842 842 Relation rel = new Relation(cur); 843 843 Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected(); 844 int index = 0; 845 for (RelationMember rm : cur.getMembers()) { 846 for (OsmPrimitive osm : sel) { 847 if (rm.getMember() == osm) 848 { 849 rel.removeMember(index); 850 break; 851 } 852 } 853 index++; 844 for (OsmPrimitive primitive: sel) { 845 rel.removeMembersFor(primitive); 854 846 } 855 847 Main.main.undoRedo.add(new ChangeCommand(cur, rel));
Note:
See TracChangeset
for help on using the changeset viewer.