Changeset 347 in josm for trunk/src/org

Timestamp:

2007-10-07T17:11:46+02:00 (17 years ago)

Author:

framm

Message:

• fixed deletion of relations

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• PropertiesDialog.java (modified) (1 diff)
• RelationListDialog.java (modified) (1 diff)

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

@@ -472 +472 @@
                 TreeMap<Relation, Collection<String>> roles = new TreeMap<Relation, Collection<String>>();
                 for (Relation r : Main.ds.relations) {
-                        for (RelationMember m : r.members) {
-                                if (newSelection.contains(m.member)) {
-                                        Collection<String> value = roles.get(r);
-                                        if (value == null) {
-                                                value = new TreeSet<String>();
-                                                roles.put(r, value);
+                        if (!r.deleted) {
+                                for (RelationMember m : r.members) {
+                                        if (newSelection.contains(m.member)) {
+                                                Collection<String> value = roles.get(r);
+                                                if (value == null) {
+                                                        value = new TreeSet<String>();
+                                                        roles.put(r, value);
+                                                }
+                                                value.add(m.role);
+                                                valueCountM.put(r, valueCount.containsKey(r) ? valueCount.get(r)+1 : 1);
                                         }
-                                        value.add(m.role);
-                                        valueCountM.put(r, valueCount.containsKey(r) ? valueCount.get(r)+1 : 1);
                                 }
                         }

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

@@ -127 +127 @@
                 int i = 0;
                 for (Relation e : Main.ds.relations) {
-                        list.setElementAt(e, i++);
+                        if (!e.deleted)
+                                list.setElementAt(e, i++);
                 }
+                list.setSize(i);
         }