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

Timestamp:

2016-08-01T23:06:53+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13250 - performance optimization when sorting sorting members of a complex relation (patch by gpetermann_muenchen)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) (7 diffs)

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

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.BitSet;
 import java.util.Collection;
 import java.util.Collections;
@@ -267 +268 @@
         getSelectionModel().setValueIsAdjusting(true);
         getSelectionModel().clearSelection();
+        BitSet selected = new BitSet();
         for (int row : selectedRows) {
             row--;
-            getSelectionModel().addSelectionInterval(row, row);
-        }
+            selected.set(row);
+        }
+        addToSelectedMembers(selected);
         getSelectionModel().setValueIsAdjusting(false);
         fireMakeMemberVisible(selectedRows[0] - 1);
@@ -290 +293 @@
         getSelectionModel().setValueIsAdjusting(true);
         getSelectionModel().clearSelection();
+        BitSet selected = new BitSet();
         for (int row : selectedRows) {
             row++;
-            getSelectionModel().addSelectionInterval(row, row);
-        }
+            selected.set(row);
+        }
+        addToSelectedMembers(selected);
         getSelectionModel().setValueIsAdjusting(false);
         fireMakeMemberVisible(selectedRows[0] + 1);
@@ -530 +535 @@
         }
         fireTableDataChanged();
+        BitSet selected = new BitSet();
         for (int row : idx) {
-            getSelectionModel().addSelectionInterval(row, row);
-        }
+            selected.set(row);
+        }
+        addToSelectedMembers(selected);
     }
 
@@ -616 +623 @@
         getSelectionModel().setValueIsAdjusting(true);
         getSelectionModel().clearSelection();
+        BitSet selected = new BitSet();
         for (int row : selectedIndices) {
-            getSelectionModel().addSelectionInterval(row, row);
-        }
+            selected.set(row);
+        }
+        addToSelectedMembers(selected);
         getSelectionModel().setValueIsAdjusting(false);
         // make the first selected member visible
@@ -628 +637 @@
 
     /**
-     * Replies true if the index-th relation members referrs
+     * Add one or more members indices to the selection.
+     * Detect groups of consecutive indices.
+     * Only one costly call of addSelectionInterval is performed for each group
+
+     * @param selectedIndices selected indices as a bitset
+     * @return number of groups
+     */
+    private int addToSelectedMembers(BitSet selectedIndices) {
+        if (selectedIndices == null || selectedIndices.isEmpty()) {
+            return 0;
+        }
+        // select the members
+        //
+        int start = selectedIndices.nextSetBit(0);
+        int end;
+        int steps = 0;
+        int last = selectedIndices.length();
+        while (start >= 0) {
+            end = selectedIndices.nextClearBit(start);
+            steps++;
+            getSelectionModel().addSelectionInterval(start, end-1);
+            start = selectedIndices.nextSetBit(end);
+            if (start < 0 || end == last)
+                break;
+        }
+        return steps;
+    }
+
+    /**
+     * Replies true if the index-th relation members refers
      * to an editable relation, i.e. a relation which is not
      * incomplete.
      *
      * @param index the index
-     * @return true, if the index-th relation members referrs
+     * @return true, if the index-th relation members refers
      * to an editable relation, i.e. a relation which is not
      * incomplete
@@ -694 +732 @@
         getSelectionModel().setValueIsAdjusting(true);
         getSelectionModel().clearSelection();
+        BitSet selected = new BitSet();
         for (int i = 0; i < members.size(); i++) {
             RelationMember m = members.get(i);
             if (primitives.contains(m.getMember())) {
-                this.getSelectionModel().addSelectionInterval(i, i);
-            }
-        }
+                selected.set(i);
+            }
+        }
+        addToSelectedMembers(selected);
         getSelectionModel().setValueIsAdjusting(false);
         if (!getSelectedIndices().isEmpty()) {