From 6ea0f752e543efcdac5970cb4c260fe3174123c5 Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Mon, 9 Dec 2019 11:46:55 -0500 Subject: [PATCH 1/3] Assure that the selected waypoint is painted last --- .../sleuthkit/autopsy/geolocation/MapPanel.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java b/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java index 9b648e7658..27108e0db7 100755 --- a/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java +++ b/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java @@ -37,6 +37,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.logging.Level; @@ -150,7 +151,7 @@ final public class MapPanel extends javax.swing.JPanel { Rectangle viewport = mapViewer.getViewportBounds(); List waypoints = new ArrayList<>(); - + Iterator iterator = waypointTree.iterator(); while (iterator.hasNext()) { MapWaypoint waypoint = iterator.next(); @@ -197,11 +198,21 @@ final public class MapPanel extends javax.swing.JPanel { WaypointPainter waypointPainter = new WaypointPainter() { @Override public Set getWaypoints() { - Set set = new HashSet<>(); + //To assure that the currentlySelectedWaypoint is visible it needs + // to be pained last. LinkedHashSet has a predicable ordering. + Set set = new LinkedHashSet<>(); if (waypointTree != null) { Iterator iterator = waypointTree.iterator(); while (iterator.hasNext()) { - set.add(iterator.next()); + MapWaypoint point = iterator.next(); + if (point != currentlySelectedWaypoint) { + set.add(point); + } + } + // Add the currentlySelectedWaypoint to the end so that + // it will be painted last. + if (currentlySelectedWaypoint != null) { + set.add(currentlySelectedWaypoint); } } return set; From 9519dd589b8ebf0fbfcad117c602b31d041699a6 Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Mon, 9 Dec 2019 11:49:04 -0500 Subject: [PATCH 2/3] Removed unused import --- Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java b/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java index 27108e0db7..6b31d031a0 100755 --- a/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java +++ b/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java @@ -35,7 +35,6 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; -import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; From 1a261327e735303b04c8a2e43286407145321670 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Mon, 9 Dec 2019 16:58:02 -0500 Subject: [PATCH 3/3] Update MapPanel.java Correct typo in comment. --- Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java b/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java index 6b31d031a0..7be6ac25a8 100755 --- a/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java +++ b/Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java @@ -198,7 +198,7 @@ final public class MapPanel extends javax.swing.JPanel { @Override public Set getWaypoints() { //To assure that the currentlySelectedWaypoint is visible it needs - // to be pained last. LinkedHashSet has a predicable ordering. + // to be painted last. LinkedHashSet has a predicable ordering. Set set = new LinkedHashSet<>(); if (waypointTree != null) { Iterator iterator = waypointTree.iterator();