From ec27964166b68ebff10d5bb0333d8e84943f29e8 Mon Sep 17 00:00:00 2001 From: Kelly Kelly <kelly@basistech.com> Date: Thu, 8 Apr 2021 12:56:50 -0400 Subject: [PATCH] Modfied based on review comments --- bindings/java/doxygen/artifact_catalog.dox | 2 +- bindings/java/src/org/sleuthkit/datamodel/Bundle.properties | 1 - .../java/src/org/sleuthkit/datamodel/TimelineEventType.java | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bindings/java/doxygen/artifact_catalog.dox b/bindings/java/doxygen/artifact_catalog.dox index 47e42e6ef..f1c78afaf 100644 --- a/bindings/java/doxygen/artifact_catalog.dox +++ b/bindings/java/doxygen/artifact_catalog.dox @@ -286,7 +286,7 @@ A contact book entry in an application file or database. Programs that have been deleted from the system. ### REQUIRED ATTRIBUTES -- TSK_DATETIME +- TSK_DATETIME (Date/Time the program was deleted) - TSK_PROG_NAME (Program that was deleted) ### OPTIONAL Attributes diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties index ee66b0f03..e1f5ca283 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties +++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties @@ -429,7 +429,6 @@ TimelineEventType.UserDeviceEventEnd.txt=User Device Event End TimelineEventType.ServiceAccount.txt=Service Account TimelineEventType.WIFINetwork.txt=Wifi Network TimelineEventType.WebCache.text=Web Cache -TimelineEventType.InstalledProgram.txt=Program Installed TimelineEventType.BluetoothAdapter.txt=Bluetooth Adapter BaseTypes.geolocation.name=Geolocation BaseTypes.communication.name=Communication diff --git a/bindings/java/src/org/sleuthkit/datamodel/TimelineEventType.java b/bindings/java/src/org/sleuthkit/datamodel/TimelineEventType.java index bbaf8dc9d..7c985e946 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/TimelineEventType.java +++ b/bindings/java/src/org/sleuthkit/datamodel/TimelineEventType.java @@ -231,7 +231,7 @@ public int compare(TimelineEventType o1, TimelineEventType o2) { METADATA_LAST_PRINTED, METADATA_LAST_SAVED, METADATA_CREATED, PROGRAM_EXECUTION, RECENT_DOCUMENTS, REGISTRY, BACKUP_EVENT_START, BACKUP_EVENT, BACKUP_EVENT_END, BLUETOOTH_PAIRING, CALENDAR_ENTRY_START, CALENDAR_ENTRY_END, - DELETE_PROGRAM, + PROGRAM_DELETED, OS_INFO, WIFI_NETWORK, USER_DEVICE_EVENT, USER_DEVICE_EVENT_START, USER_DEVICE_EVENT_END, SERVICE_ACCOUNT, SCREEN_SHOT, PROGRAM_NOTIFICATION, BLUETOOTH_PAIRING_ACCESSED, BLUETOOTH_ADAPTER); @@ -717,7 +717,7 @@ public SortedSet< TimelineEventType> getChildren() { new BlackboardAttribute.Type(TSK_DATETIME_END), new BlackboardAttribute.Type(TSK_DESCRIPTION)); - TimelineEventType DELETE_PROGRAM = new TimelineEventArtifactTypeSingleDescription(49, + TimelineEventType PROGRAM_DELETED = new TimelineEventArtifactTypeSingleDescription(49, getBundle().getString("TimelineEventType.DeletedProgram.txt"),//NON-NLS MISC_TYPES, new BlackboardArtifact.Type(TSK_DELETED_PROG), -- GitLab