mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 18:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5478 from kellykelly3/geolocation-selection-fixes

Browse Source 
5861 - Paint the selected waypoint last.
This commit is contained in:
Richard Cordovano 2019-12-09 16:58:37 -05:00 committed by GitHub
commit 7474b62490
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Core/src/org/sleuthkit/autopsy/geolocation/MapPanel.java
View File

@ -35,8 +35,8 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
@ -150,7 +150,7 @@ final public class MapPanel extends javax.swing.JPanel {
Rectangle viewport = mapViewer.getViewportBounds(); Rectangle viewport = mapViewer.getViewportBounds();
List<MapWaypoint> waypoints = new ArrayList<>(); List<MapWaypoint> waypoints = new ArrayList<>();
Iterator<MapWaypoint> iterator = waypointTree.iterator(); Iterator<MapWaypoint> iterator = waypointTree.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
MapWaypoint waypoint = iterator.next(); MapWaypoint waypoint = iterator.next();
@ -197,11 +197,21 @@ final public class MapPanel extends javax.swing.JPanel {
WaypointPainter<Waypoint> waypointPainter = new WaypointPainter<Waypoint>() { WaypointPainter<Waypoint> waypointPainter = new WaypointPainter<Waypoint>() {
@Override @Override
public Set<Waypoint> getWaypoints() { public Set<Waypoint> getWaypoints() {
Set<Waypoint> set = new HashSet<>(); //To assure that the currentlySelectedWaypoint is visible it needs
// to be painted last. LinkedHashSet has a predicable ordering.
Set<Waypoint> set = new LinkedHashSet<>();
if (waypointTree != null) { if (waypointTree != null) {
Iterator<MapWaypoint> iterator = waypointTree.iterator(); Iterator<MapWaypoint> iterator = waypointTree.iterator();
while (iterator.hasNext()) { 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; return set;