mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-20 03:24:55 +00:00
Merge pull request #5513 from kellykelly3/5885-geolocation-suck-drag-cursor
5899 Fixing scrolling behavior on window reopen
This commit is contained in:
commit
b0f51c8ded
@ -86,6 +86,8 @@ public final class GeolocationTopComponent extends TopComponent {
|
|||||||
// This is the hardcoded report name from KMLReport.java
|
// This is the hardcoded report name from KMLReport.java
|
||||||
private static final String REPORT_KML = "ReportKML.kml";
|
private static final String REPORT_KML = "ReportKML.kml";
|
||||||
|
|
||||||
|
private boolean mapInitalized = false;
|
||||||
|
|
||||||
@Messages({
|
@Messages({
|
||||||
"GLTopComponent_name=Geolocation",
|
"GLTopComponent_name=Geolocation",
|
||||||
"GLTopComponent_initilzation_error=An error occurred during waypoint initilization. Geolocation data maybe incomplete."
|
"GLTopComponent_initilzation_error=An error occurred during waypoint initilization. Geolocation data maybe incomplete."
|
||||||
@ -197,18 +199,23 @@ public final class GeolocationTopComponent extends TopComponent {
|
|||||||
mapPanel.clearWaypoints();
|
mapPanel.clearWaypoints();
|
||||||
geoFilterPanel.clearDataSourceList();
|
geoFilterPanel.clearDataSourceList();
|
||||||
geoFilterPanel.updateDataSourceList();
|
geoFilterPanel.updateDataSourceList();
|
||||||
try {
|
|
||||||
mapPanel.initMap();
|
// Let's make sure we only do this on the first open
|
||||||
} catch (GeoLocationDataException ex) {
|
if (!mapInitalized) {
|
||||||
JOptionPane.showMessageDialog(this,
|
try {
|
||||||
Bundle.GeolocationTC_connection_failure_message(),
|
mapPanel.initMap();
|
||||||
Bundle.GeolocationTC_connection_failure_message_title(),
|
mapInitalized = true;
|
||||||
JOptionPane.ERROR_MESSAGE);
|
} catch (GeoLocationDataException ex) {
|
||||||
MessageNotifyUtil.Notify.error(
|
JOptionPane.showMessageDialog(this,
|
||||||
Bundle.GeolocationTC_connection_failure_message_title(),
|
Bundle.GeolocationTC_connection_failure_message(),
|
||||||
Bundle.GeolocationTC_connection_failure_message());
|
Bundle.GeolocationTC_connection_failure_message_title(),
|
||||||
logger.log(Level.SEVERE, ex.getMessage(), ex);
|
JOptionPane.ERROR_MESSAGE);
|
||||||
return; // Doen't set the waypoints.
|
MessageNotifyUtil.Notify.error(
|
||||||
|
Bundle.GeolocationTC_connection_failure_message_title(),
|
||||||
|
Bundle.GeolocationTC_connection_failure_message());
|
||||||
|
logger.log(Level.SEVERE, ex.getMessage(), ex);
|
||||||
|
return; // Doen't set the waypoints.
|
||||||
|
}
|
||||||
}
|
}
|
||||||
mapPanel.setWaypoints(new ArrayList<>());
|
mapPanel.setWaypoints(new ArrayList<>());
|
||||||
updateWaypoints();
|
updateWaypoints();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user