Changeset 5102 in josm for trunk/src

Timestamp:

2012-03-18T14:03:12+01:00 (12 years ago)

Author:

xeen

Message:

fix broken way segment highlighting introduced in @5101

File:

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

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

@@ -58 +58 @@
      */
     private Set<OsmPrimitive> oldHighlights = new HashSet<OsmPrimitive>();
+    private WaySegment oldHighlightedWaySegment = null;
 
     private boolean drawTargetHighlight;
@@ -194 +195 @@
 
         Set<OsmPrimitive> newHighlights = new HashSet<OsmPrimitive>();
-
         DeleteParameters parameters = getDeleteParameters(e, modifiers);
 
@@ -200 +200 @@
             // deleting segments is the only action not working on OsmPrimitives
             // so we have to handle them separately.
-            DataSet ds = getCurrentDataSet();
-            if(ds != null) {
-                ds.setHighlightedWaySegments(Collections.singleton(parameters.nearestSegment));
-            }
+            repaintIfRequired(newHighlights, parameters.nearestSegment);
         } else {
             // don't call buildDeleteCommands for DeleteMode.segment because it doesn't support
             // silent operation and SplitWayAction will show dialogs. A lot.
             Command delCmd = buildDeleteCommands(e, modifiers, true);
-            if(delCmd == null) {
-                repaintIfRequired(newHighlights);
-                return;
-            }
-
-            // all other cases delete OsmPrimitives directly, so we can
-            // safely do the following
-            for(OsmPrimitive osm : delCmd.getParticipatingPrimitives()) {
-                newHighlights.add(osm);
-            }
-        }
-        repaintIfRequired(newHighlights);
-    }
-
-    private void repaintIfRequired(Set<OsmPrimitive> newHighlights) {
+            if(delCmd != null) {
+                // all other cases delete OsmPrimitives directly, so we can
+                // safely do the following
+                for(OsmPrimitive osm : delCmd.getParticipatingPrimitives()) {
+                    newHighlights.add(osm);
+                }
+            }
+            repaintIfRequired(newHighlights, null);
+        }
+    }
+
+    private void repaintIfRequired(Set<OsmPrimitive> newHighlights, WaySegment newHighlightedWaySegment) {
         boolean needsRepaint = false;
+        DataSet ds = getCurrentDataSet();
+
+        if(newHighlightedWaySegment == null && oldHighlightedWaySegment != null) {
+            if(ds != null) {
+                ds.clearHighlightedWaySegments();
+                needsRepaint = true;
+            }
+            oldHighlightedWaySegment = null;
+        } else if(newHighlightedWaySegment != null && !newHighlightedWaySegment.equals(oldHighlightedWaySegment)) {
+            if(ds != null) {
+                ds.setHighlightedWaySegments(Collections.singleton(newHighlightedWaySegment));
+                needsRepaint = true;
+            }
+            oldHighlightedWaySegment = newHighlightedWaySegment;
+        }
+
         for(OsmPrimitive x : newHighlights) {
             if(oldHighlights.contains(x)) {