From a6f1190c94c1612e56972b3130da101d16c0db8a Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Mon, 28 Dec 2020 14:56:08 -0500 Subject: [PATCH 1/3] bundle updates and consistency change --- .../datasourcesummary/datamodel/GeolocationSummary.java | 4 ++-- .../sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties | 4 ++-- .../autopsy/datasourcesummary/ui/Bundle.properties-MERGED | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/GeolocationSummary.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/GeolocationSummary.java index 4f6813d92b..d7905d1d4b 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 * 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 9b6bedfcb1..5f89cc6bb1 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties @@ -43,9 +43,9 @@ 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.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 are not included +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 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 87281318ad..4155f890c6 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED @@ -110,9 +110,9 @@ 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.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 are not included +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 From 1d697c496af4863142880a9da8c37da9697cdf93 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Mon, 28 Dec 2020 15:02:29 -0500 Subject: [PATCH 2/3] comment update --- .../autopsy/datasourcesummary/datamodel/GeolocationSummary.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/GeolocationSummary.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/GeolocationSummary.java index d7905d1d4b..d9f2b9a910 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/GeolocationSummary.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/GeolocationSummary.java @@ -245,7 +245,7 @@ public class GeolocationSummary implements DefaultArtifactUpdateGovernor { * 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) { From e663bb3776f570674fb26af3e5a5e9b9f4438e2a Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Wed, 30 Dec 2020 08:13:17 -0500 Subject: [PATCH 3/3] merge fix --- .../autopsy/datasourcesummary/ui/Bundle.properties | 7 ------- .../autopsy/datasourcesummary/ui/Bundle.properties-MERGED | 7 ------- 2 files changed, 14 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties index 2661ec0293..5f89cc6bb1 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties @@ -43,17 +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 -<<<<<<< HEAD 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.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 ->>>>>>> ab87da96f48897bae09a6164e16ff1e9bc68b8be 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 d62d6a59fe..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,17 +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 -<<<<<<< HEAD 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.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 ->>>>>>> ab87da96f48897bae09a6164e16ff1e9bc68b8be GeolocationPanel.recentViewInGeolocationBtn.text=View in Map GeolocationPanel.commonViewInGeolocationBtn.text=View in Map RecentFilesPanel.rightClickForMoreOptions1.text=Right click on row for more options