diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/GeolocationSummary.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/GeolocationSummary.java index 7ed3da95b5..4f78e1ece2 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/GeolocationSummary.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/GeolocationSummary.java @@ -242,14 +242,14 @@ public class GeolocationSummary implements DefaultArtifactUpdateGovernor { * the event where either time is null. * * @param minTime The minimum time. If null is provided, this function will - * return true. + * return false. * @param time The time to check. If null is provided and the min time is * non-null, then this function will return false. - * @return If minTime == null then true. If minTime != null && time == null + * @return If minTime == null then false. If minTime != null && time == null * then false. Otherwise time >= minTime. */ private boolean greaterThanOrEqual(Long minTime, Long time) { - if ((minTime == null) || (time != null && time >= minTime)) { + if (minTime != null && time != null && time >= minTime) { return true; } else { return false; diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties index fcb1585dfa..5f89cc6bb1 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties @@ -43,10 +43,10 @@ PastCasesPanel.notableFileLabel.text=Cases with Common Items That Were Tagged as PastCasesPanel.sameIdLabel.text=Past Cases with the Same Device IDs DataSourceSummaryTabbedPane.noDataSourceLabel.text=No data source has been selected. TimelinePanel.activityRangeLabel.text=Activity Range -GeolocationPanel.withinDistanceLabel.text=Locations further than 150Km from a city are not included -GeolocationPanel.mostRecentLabel.text=Recent Cities from Geolocation Results -GeolocationPanel.withinDistanceLabel1.text=Locations further than 150Km from a city are not included -GeolocationPanel.mostCommonLabel.text=Most Common Cities from Geolocation Results +GeolocationPanel.withinDistanceLabel.text=Locations further than 150km from a city will be listed as 'Unknown' +GeolocationPanel.mostRecentLabel.text=Recent Cities from Geolocation Artifacts +GeolocationPanel.withinDistanceLabel1.text=Locations further than 150km from a city will be listed as 'Unknown' +GeolocationPanel.mostCommonLabel.text=Most Common Cities from Geolocation Artifacts GeolocationPanel.recentViewInGeolocationBtn.text=View in Map GeolocationPanel.commonViewInGeolocationBtn.text=View in Map RecentFilesPanel.rightClickForMoreOptions1.text=Right click on row for more options diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED index 7750bad3e6..bab618929f 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED @@ -110,10 +110,10 @@ PastCasesPanel.notableFileLabel.text=Cases with Common Items That Were Tagged as PastCasesPanel.sameIdLabel.text=Past Cases with the Same Device IDs DataSourceSummaryTabbedPane.noDataSourceLabel.text=No data source has been selected. TimelinePanel.activityRangeLabel.text=Activity Range -GeolocationPanel.withinDistanceLabel.text=Locations further than 150Km from a city are not included -GeolocationPanel.mostRecentLabel.text=Recent Cities from Geolocation Results -GeolocationPanel.withinDistanceLabel1.text=Locations further than 150Km from a city are not included -GeolocationPanel.mostCommonLabel.text=Most Common Cities from Geolocation Results +GeolocationPanel.withinDistanceLabel.text=Locations further than 150km from a city will be listed as 'Unknown' +GeolocationPanel.mostRecentLabel.text=Recent Cities from Geolocation Artifacts +GeolocationPanel.withinDistanceLabel1.text=Locations further than 150km from a city will be listed as 'Unknown' +GeolocationPanel.mostCommonLabel.text=Most Common Cities from Geolocation Artifacts GeolocationPanel.recentViewInGeolocationBtn.text=View in Map GeolocationPanel.commonViewInGeolocationBtn.text=View in Map RecentFilesPanel.rightClickForMoreOptions1.text=Right click on row for more options