Changeset 11627 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

Timestamp:

2017-02-26T00:59:32+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #3346 - improve drastically the performance of fixing duplicate nodes by:

• caching data sources area computation
• moving layer invalidation from UndoRedoHandler.addNoRedraw to UndoRedoHandler.add
• avoiding any EDT call when building tag conflict dialog if it's not meant to be displayed

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

@@ -129 +129 @@
         case 4: /* decision */
             d.decide((RelationMemberConflictDecisionType) value);
-            refresh();
+            refresh(false);
             break;
         default: // Do nothing
@@ -159 +159 @@
      */
     public void populate(Collection<Relation> relations, Collection<? extends OsmPrimitive> memberPrimitives) {
+        populate(relations, memberPrimitives, true);
+    }
+
+    /**
+     * Populates the model with the relation members belonging to one of the relations in <code>relations</code>
+     * and referring to one of the primitives in <code>memberPrimitives</code>.
+     *
+     * @param relations  the parent relations. Empty list assumed if null.
+     * @param memberPrimitives the child primitives. Empty list assumed if null.
+     * @param fireEvent {@code true} to call {@code fireTableDataChanged} (can be a slow operation)
+     * @since 11626
+     */
+    void populate(Collection<Relation> relations, Collection<? extends OsmPrimitive> memberPrimitives, boolean fireEvent) {
         decisions.clear();
         relations = relations == null ? Collections.<Relation>emptyList() : relations;
@@ -169 +182 @@
         this.relations = relations;
         this.primitives = memberPrimitives;
-        refresh();
+        refresh(fireEvent);
     }
 
@@ -199 +212 @@
      */
     public void prepareDefaultRelationDecisions() {
-
+        prepareDefaultRelationDecisions(true);
+    }
+
+    /**
+     * Prepare the default decisions for the current model.
+     *
+     * Keep/delete decisions are made if every member has the same role and the members are in consecutive order within the relation.
+     * For multiple occurrences those conditions are tested stepwise for each occurrence.
+     *
+     * @param fireEvent {@code true} to call {@code fireTableDataChanged} (can be a slow operation)
+     * @since 11626
+     */
+    void prepareDefaultRelationDecisions(boolean fireEvent) {
         if (primitives.stream().allMatch(Node.class::isInstance)) {
             final Collection<OsmPrimitive> primitivesInDecisions = new HashSet<>();
@@ -256 +281 @@
         }
 
-        refresh();
+        refresh(fireEvent);
     }
 
@@ -300 +325 @@
      */
     public void refresh() {
+        refresh(true);
+    }
+
+    /**
+     * Refreshes the model state. Invoke this method to trigger necessary change
+     * events after an update of the model data.
+     * @param fireEvent {@code true} to call {@code fireTableDataChanged} (can be a slow operation)
+     * @since 11626
+     */
+    void refresh(boolean fireEvent) {
         updateNumConflicts();
-        GuiHelper.runInEDTAndWait(this::fireTableDataChanged);
+        if (fireEvent) {
+            GuiHelper.runInEDTAndWait(this::fireTableDataChanged);
+        }
     }