Changeset 15378 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-09-26T22:40:50+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #13592 - refresh relation member table connectivity after a change of member ways nodes

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (1 diff)
• data/osm/event/DatasetEventManager.java (modified) (3 diffs)
• gui/dialogs/relation/MemberTableModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -930 +930 @@
     private void fireEventToListeners(AbstractDatasetChangedEvent event) {
         for (DataSetListener listener : listeners) {
+            Logging.trace("Firing {0} to {1} (dataset)", event, listener);
             event.fire(listener);
         }

trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -197 +198 @@
         for (ListenerInfo listener: listeners) {
             if (!listener.consolidate) {
+                Logging.trace("Firing {0} to {1} (normal)", event, listener.listener);
                 event.fire(listener.listener);
             }
@@ -205 +207 @@
         for (ListenerInfo listener: listeners) {
             if (listener.consolidate) {
+                Logging.trace("Firing {0} to {1} (consolidated)", event, listener.listener);
                 event.fire(listener.listener);
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -174 +174 @@
     @Override
     public void wayNodesChanged(WayNodesChangedEvent event) {
-        // ignore
+        if (hasMembersReferringTo(Collections.singleton(event.getChangedWay()))) {
+            // refresh connectivity
+            for (int i = 0; i < members.size(); i++) {
+                fireTableCellUpdated(i, 2 /* the column with the connectivity arrow */);
+            }
+        }
     }
 
@@ -666 +671 @@
         if (primitives == null || primitives.isEmpty())
             return false;
-        Set<OsmPrimitive> referrers = new HashSet<>();
-        for (RelationMember member : members) {
-            referrers.add(member.getMember());
-        }
-        for (OsmPrimitive referred : primitives) {
-            if (referrers.contains(referred))
-                return true;
-        }
-        return false;
+        Set<OsmPrimitive> referrers = members.stream().map(RelationMember::getMember).collect(Collectors.toSet());
+        return primitives.stream().anyMatch(referrers::contains);
     }