Changeset 3471 in josm for trunk/src

Timestamp:

2010-08-25T22:01:42+02:00 (14 years ago)

Author:

jttt

Message:

Fix #5379 Fixing duplicate nodes very slow when filter dock is open

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (2 diffs)
• data/osm/FilterWorker.java (modified) (3 diffs)
• data/osm/OsmPrimitive.java (modified) (2 diffs)
• gui/dialogs/FilterTableModel.java (modified) (3 diffs)

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

@@ -279 +279 @@
             boolean success = false;
             if (primitive instanceof Node) {
-                success = nodes.remove((Node) primitive);
+                success = nodes.remove(primitive);
             } else if (primitive instanceof Way) {
-                success = ways.remove((Way) primitive);
+                success = ways.remove(primitive);
             } else if (primitive instanceof Relation) {
-                success = relations.remove((Relation) primitive);
+                success = relations.remove(primitive);
             }
             if (!success)
@@ -436 +436 @@
             selectedPrimitives = new LinkedHashSet<OsmPrimitive>();
             changed = addSelected(selection, false)
-                            || (!wasEmpty && selectedPrimitives.isEmpty());
+            || (!wasEmpty && selectedPrimitives.isEmpty());
             if (changed) {
                 selectionSnapshot = null;

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

@@ -32 +32 @@
      * (but hides them only if they are not used by any unfiltered way).
      */
-    public static void executeFilters(Collection<OsmPrimitive> all, FilterMatcher filterMatcher) {
+    public static boolean executeFilters(Collection<OsmPrimitive> all, FilterMatcher filterMatcher) {
+
+        boolean changed = false;
 
         // First relation and ways
@@ -38 +40 @@
             if (!(primitive instanceof Node)) {
                 if (filterMatcher.isHidden(primitive)) {
-                    primitive.setDisabledState(true);
+                    changed = changed | primitive.setDisabledState(true);
                 } else if (filterMatcher.isDisabled(primitive)) {
-                    primitive.setDisabledState(false);
+                    changed = changed | primitive.setDisabledState(false);
                 } else {
-                    primitive.unsetDisabledState();
+                    changed = changed | primitive.unsetDisabledState();
                 }
             }
@@ -51 +53 @@
             if (primitive instanceof Node) {
                 if (filterMatcher.isHidden(primitive)) {
-                    primitive.setDisabledState(true);
+                    changed = changed | primitive.setDisabledState(true);
                 } else if (filterMatcher.isDisabled(primitive)) {
-                    primitive.setDisabledState(false);
+                    changed = changed | primitive.setDisabledState(false);
                 } else {
-                    primitive.unsetDisabledState();
+                    changed = changed | primitive.unsetDisabledState();
                 }
             }
         }
+
+        return changed;
     }
 
     public static boolean executeFilters(OsmPrimitive primitive, FilterMatcher filterMatcher) {
-        boolean hidden = primitive.isDisabledAndHidden();
-        boolean disabled = primitive.isDisabled();
+        boolean changed = false;
         if (filterMatcher.isHidden(primitive)) {
-            primitive.setDisabledState(true);
+            changed = changed | primitive.setDisabledState(true);
         } else if (filterMatcher.isDisabled(primitive)) {
-            primitive.setDisabledState(false);
+            changed = changed | primitive.setDisabledState(false);
         } else {
-            primitive.unsetDisabledState();
+            changed = changed | primitive.unsetDisabledState();
         }
-        return hidden != primitive.isDisabledAndHidden() || disabled != primitive.isDisabled();
+        return changed;
     }
 

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

@@ -617 +617 @@
      *             just shown in gray color.
      */
-    public void setDisabledState(boolean hide) {
+    public boolean setDisabledState(boolean hide) {
         boolean locked = writeLock();
         try {
+            int oldFlags = flags;
             updateFlagsNoLock(FLAG_DISABLED, true);
             updateFlagsNoLock(FLAG_HIDE_IF_DISABLED, hide);
+            return oldFlags != flags;
         } finally {
             writeUnlock(locked);
@@ -632 +634 @@
      * again.
      */
-    public void unsetDisabledState() {
-        updateFlags(FLAG_DISABLED + FLAG_HIDE_IF_DISABLED, false);
+    public boolean unsetDisabledState() {
+        boolean locked = writeLock();
+        try {
+            int oldFlags = flags;
+            updateFlagsNoLock(FLAG_DISABLED + FLAG_HIDE_IF_DISABLED, false);
+            return oldFlags != flags;
+        } finally {
+            writeUnlock(locked);
+        }
     }
 

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

@@ -64 +64 @@
     public void executeFilters() {
         DataSet ds = Main.main.getCurrentDataSet();
+        boolean changed = false;
         if (ds == null) {
             disabledAndHiddenCount = 0;
             disabledCount = 0;
+            changed = true;
         } else {
             final Collection<OsmPrimitive> deselect = new HashSet<OsmPrimitive>();
@@ -75 +77 @@
                 final Collection<OsmPrimitive> all = ds.allNonDeletedCompletePrimitives();
 
-                FilterWorker.executeFilters(all, filterMatcher);
+                changed = FilterWorker.executeFilters(all, filterMatcher);
 
                 disabledCount = 0;
@@ -101 +103 @@
         }
 
-        if (Main.isDisplayingMapView()) {
+        if (Main.isDisplayingMapView() && changed) {
             Main.map.mapView.repaint();
             Main.map.filterDialog.updateDialogHeader();