Changeset 5101 in josm for trunk

Timestamp:

2012-03-18T13:02:49+01:00 (13 years ago)

Author:

xeen

Message:

reduce repaints for DeleteAction with target highlighting enabled (see #7503)

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -192 +192 @@
         if(!drawTargetHighlight)
             return;
-        removeHighlighting();
+
+        Set<OsmPrimitive> newHighlights = new HashSet<OsmPrimitive>();
 
         DeleteParameters parameters = getDeleteParameters(e, modifiers);
@@ -208 +209 @@
             Command delCmd = buildDeleteCommands(e, modifiers, true);
             if(delCmd == null) {
-                Main.map.mapView.repaint();
+                repaintIfRequired(newHighlights);
                 return;
             }
@@ -215 +216 @@
             // safely do the following
             for(OsmPrimitive osm : delCmd.getParticipatingPrimitives()) {
-                osm.setHighlighted(true);
-                oldHighlights.add(osm);
-            }
-        }
-        Main.map.mapView.repaint();
+                newHighlights.add(osm);
+            }
+        }
+        repaintIfRequired(newHighlights);
+    }
+
+    private void repaintIfRequired(Set<OsmPrimitive> newHighlights) {
+        boolean needsRepaint = false;
+        for(OsmPrimitive x : newHighlights) {
+            if(oldHighlights.contains(x)) {
+                continue;
+            }
+            needsRepaint = true;
+            x.setHighlighted(true);
+        }
+        oldHighlights.removeAll(newHighlights);
+        for(OsmPrimitive x : oldHighlights) {
+            x.setHighlighted(false);
+            needsRepaint = true;
+        }
+        oldHighlights = newHighlights;
+        if(needsRepaint) {
+            Main.map.mapView.repaint();
+        }
     }
 
@@ -284 +304 @@
         getCurrentDataSet().setSelected();
         giveUserFeedback(e);
-        Main.map.mapView.repaint();
     }
 
@@ -318 +337 @@
             Main.main.undoRedo.add(cmd);
             if (getCurrentDataSet().getSelectedRelations().contains(toDelete)) {
-                getCurrentDataSet().toggleSelected(toDelete);
+                getCurrentDataSet().toggleSelected(toDelete);
             }
             RelationDialogManager.getRelationDialogManager().close(layer, toDelete);