Changeset 2027 in josm for trunk/src/org

Timestamp:

2009-09-02T21:51:49+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3372: NPE when removing two ways from a relation via properties dialog

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -306 +306 @@
     void membershipEdit(int row) {
         Relation relation = (Relation)membershipData.getValueAt(row, 0);
-        Main.main.map.relationListDialog.selectRelation(relation);
+        Main.map.relationListDialog.selectRelation(relation);
         RelationEditor.getEditor(
                 Main.map.mapView.getEditLayer(),
@@ -474 +474 @@
                             c.setFont(c.getFont().deriveFont(Font.ITALIC));
                         } else {
-                            final Map.Entry entry = (Map.Entry) v.entrySet().iterator().next(); 
+                            final Map.Entry entry = (Map.Entry) v.entrySet().iterator().next();
                             str = (String) entry.getKey();
                         }
@@ -751 +751 @@
         if (Main.main.getCurrentDataSet() != null) {
             for (Relation r : Main.main.getCurrentDataSet().relations) {
-                if (!r.deleted && !r.incomplete) {
+                if (!r.isDeleted() && !r.incomplete) {
                     for (RelationMember m : r.getMembers()) {
                         if (newSelection.contains(m.getMember())) {
@@ -842 +842 @@
             Relation rel = new Relation(cur);
             Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
-            int index = 0;
-            for (RelationMember rm : cur.getMembers()) {
-                for (OsmPrimitive osm : sel) {
-                    if (rm.getMember() == osm)
-                    {
-                        rel.removeMember(index);
-                        break;
-                    }
-                }
-                index++;
+            for (OsmPrimitive primitive: sel) {
+                rel.removeMembersFor(primitive);
             }
             Main.main.undoRedo.add(new ChangeCommand(cur, rel));