Changeset 18792 in josm for trunk/src

Timestamp:

2023-08-07T17:21:45+02:00 (16 months ago)

Author:

taylor.smock

Message:

Fix #23018: The Name Suggestion Index preset causes dramatic slowing in line drawing and following

The root cause is that every time the dataset fires a DataChangedEvent, we
rebuild the relation list. This causes a search in the presets, which can become
very expensive with the NSI. To fix this, we instead iterate through each
individual event in the DataChangedEvent, and perform the appropriate action.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/event/DataSetListener.java (modified) (1 diff)
• gui/dialogs/RelationListDialog.java (modified) (1 diff)
• plugins/PluginHandler.java (modified) (1 diff)

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

@@ -64 +64 @@
      */
     void dataChanged(DataChangedEvent event);
+
+    /**
+     * Call each subevent of a {@link DataChangedEvent}. This should only ever be called from
+     * {@link #dataChanged(DataChangedEvent)}.
+     * @param event The event to call the individual elements from
+     * @implNote Implementors should decide what they want to do with {@code event == null},
+     * {@code event.getEvents() == null}, and {@code event.getEvents().isEmpty()}.
+     * @since 18792
+     */
+    default void dataChangedIndividualEvents(DataChangedEvent event) {
+        for (AbstractDatasetChangedEvent subEvent : event.getEvents()) {
+            if (subEvent instanceof PrimitivesAddedEvent) {
+                this.primitivesAdded((PrimitivesAddedEvent) subEvent);
+            } else if (subEvent instanceof PrimitivesRemovedEvent) {
+                this.primitivesRemoved((PrimitivesRemovedEvent) subEvent);
+            } else if (subEvent instanceof TagsChangedEvent) {
+                this.tagsChanged((TagsChangedEvent) subEvent);
+            } else if (subEvent instanceof NodeMovedEvent) {
+                this.nodeMoved((NodeMovedEvent) subEvent);
+            } else if (subEvent instanceof WayNodesChangedEvent) {
+                this.wayNodesChanged((WayNodesChangedEvent) subEvent);
+            } else if (subEvent instanceof RelationMembersChangedEvent) {
+                this.relationMembersChanged((RelationMembersChangedEvent) subEvent);
+            } else {
+                this.otherDatasetChange(subEvent);
+            }
+        }
+    }
 }

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

@@ -736 +736 @@
     @Override
     public void dataChanged(DataChangedEvent event) {
-        initFromData(MainApplication.getLayerManager().getActiveData());
+        // I have no clue how it would be empty, but just in case use the original code.
+        // {@code null} is used during initialization
+        if (event == null || Utils.isEmpty(event.getEvents())) {
+            initFromData(MainApplication.getLayerManager().getActiveData());
+        } else {
+            dataChangedIndividualEvents(event);
+        }
     }
 

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -649 +649 @@
 
     private static void alertJavaUpdateRequired(Component parent, String plugin, int requiredVersion) {
-        final ButtonSpec[] options = new ButtonSpec[] {
+        final ButtonSpec[] options = {
                 new ButtonSpec(tr("OK"), ImageProvider.get("ok"), tr("Click to close the dialog"), null),
                 new ButtonSpec(tr("Update Java"), ImageProvider.get("java"), tr("Update Java"), null)