From b8d52c1a6883cd9d32ff0a312286b6aab0c86530 Mon Sep 17 00:00:00 2001
From: Mark McKinnon <mark.mckinnon@davenport.edu>
Date: Tue, 17 Nov 2020 10:44:28 -0500
Subject: [PATCH] changed artifact names
Changed artifacts names
---
.../sleuthkit/datamodel/BlackboardArtifact.java | 14 +++++++-------
.../src/org/sleuthkit/datamodel/Bundle.properties | 6 +++---
.../sleuthkit/datamodel/Bundle.properties-MERGED | 8 ++++----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
index 5d51298c9..fb5a99558 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
@@ -1269,18 +1269,18 @@ public enum ARTIFACT_TYPE implements SleuthkitVisitableItem {
/**
* DHCP Information that is store for a device.
*/
- TSK_DHCP_INFO(61, "TSK_DHCP_INFO",
+ TSK_DHCP_INFO(61, "TSK_IP_DHCP",
bundle.getString("BlackboardArtifact.tskDhcpInfo.text")),
/**
* Notifications Sent to User.
*/
- TSK_NOTIFICATIONS(62, "TSK_NOTIFICATIONS",
- bundle.getString("BlackboardArtifact.tskNotifications.text")),
+ TSK_NOTIFICATIONS(62, "TSK_PROG_NOTIFICATIONS",
+ bundle.getString("BlackboardArtifact.tskProgNotifications.text")),
/**
* System/Application/File backup.
*/
- TSK_BACKUP (63, "TSK_BACKUP",
- bundle.getString("BlackboardArtifact.tskBackup.text")),
+ TSK_BACKUP (63, "TSK_BACKUP_EVENT",
+ bundle.getString("BlackboardArtifact.tskBackupEvent.text")),
/**
* Programs that have been deleted.
*/
@@ -1289,8 +1289,8 @@ public enum ARTIFACT_TYPE implements SleuthkitVisitableItem {
/**
* Activity on the System/Application.
*/
- TSK_ACTIVITY(65, "TSK_ACTIVITY",
- bundle.getString("BlackboardArtifact.tskActivity.text"));
+ TSK_ACTIVITY(65, "TSK_USER_DEVICE_EVENT",
+ bundle.getString("BlackboardArtifact.tskUserDeviceEvent.text"));
/* To developers: For each new artifact, ensure that:
* - The enum value has 1-line JavaDoc description
* - The artifact catalog (artifact_catalog.dox) is updated to reflect the attributes it uses
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
index 3557bba67..1f08bdb5c 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
+++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
@@ -57,10 +57,10 @@ BlackboardArtifact.tskTrack.text=GPS Track
BlackboardArtifact.tskWebAccountType.text=Web Account Type
BlackboardArtifact.tskScreenShots.text=Screenshots
BlackboardArtifact.tskDhcpInfo.text=DHCP Information
-BlackboardArtifact.tskNotifications.text=Notifications
-BlackboardArtifact.tskBackup.text=Backups
+BlackboardArtifact.tskProgNotifications.text=Program Notifications
+BlackboardArtifact.tskBackupEvent.text=Backup Events
BlackboardArtifact.tskDeletedProg.text=Deleted Programs
-BlackboardArtifact.tskActivity.text=Activity
+BlackboardArtifact.tskUserDeviceEvent.text=User Device Events
BlackboardArtifact.shortDescriptionDate.text=at {0}
BlackboardArtifact.tskAssociatedObject.text=Associated Object
BlackboardAttribute.tskAccountType.text=Account Type
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
index 79521dd87..1f08bdb5c 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
+++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
@@ -55,12 +55,12 @@ BlackboardArtifact.tskUserContentSuspected.text=User Content Suspected
BlackboardArtifact.tskMetadata.text=Metadata
BlackboardArtifact.tskTrack.text=GPS Track
BlackboardArtifact.tskWebAccountType.text=Web Account Type
-BlackboardArtifact.tskScreenShots.text=Screen Shots
+BlackboardArtifact.tskScreenShots.text=Screenshots
BlackboardArtifact.tskDhcpInfo.text=DHCP Information
-BlackboardArtifact.tskNotifications.text=Notification
-BlackboardArtifact.tskBackup.text=Backup
+BlackboardArtifact.tskProgNotifications.text=Program Notifications
+BlackboardArtifact.tskBackupEvent.text=Backup Events
BlackboardArtifact.tskDeletedProg.text=Deleted Programs
-BlackboardArtifact.tskActivity.text=Activity
+BlackboardArtifact.tskUserDeviceEvent.text=User Device Events
BlackboardArtifact.shortDescriptionDate.text=at {0}
BlackboardArtifact.tskAssociatedObject.text=Associated Object
BlackboardAttribute.tskAccountType.text=Account Type
--
GitLab