Changeset 3146 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

Timestamp:

2010-03-19T22:05:48+01:00 (14 years ago)

Author:

jttt

Message:

Use referrers when loading members of primitive in PropertiesDialog

File:

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

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

@@ -267 +267 @@
             value = null; // delete the key instead
         }
-        if (key.equals(newkey) && tr("<different>").equals(value)) {
+        if (key.equals(newkey) && tr("<different>").equals(value))
             return;
-        }
         if (key.equals(newkey) || value == null) {
             Main.main.undoRedo.add(new ChangePropertyCommand(sel, newkey, value));
@@ -763 +762 @@
 
         Map<Relation, Collection<RelationMember>> roles = new HashMap<Relation, Collection<RelationMember>>();
-        if (Main.main.getCurrentDataSet() != null) {
-            for (Relation r : Main.main.getCurrentDataSet().getRelations()) {
-                if (!r.isFiltered() && !r.isIncomplete() && !r.isDeleted()) {
+        for (OsmPrimitive primitive: newSelection) {
+            for (OsmPrimitive ref: primitive.getReferrers()) {
+                if (ref instanceof Relation && !ref.isFiltered() && !ref.isIncomplete() && !ref.isDeleted()) {
+                    Relation r = (Relation) ref;
                     for (RelationMember m : r.getMembers()) {
-                        if (newSelection.contains(m.getMember())) {
+                        if (m.getMember() == primitive) {
                             Collection<RelationMember> value = roles.get(r);
                             if (value == null) {
@@ -779 +779 @@
             }
         }
+
         for (Entry<Relation, Collection<RelationMember>> e : roles.entrySet()) {
             membershipData.addRow(new Object[]{e.getKey(), e.getValue()});