diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties index 0d1dc22659918ee54eecf42244a5b8bd57d4cbe9..9cbcfc13ed6487f3183287b24d2236cb6ec677e2 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties +++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties @@ -362,7 +362,6 @@ WebTypes.webDownloads.name=Web Downloads WebTypes.webCookies.name=Web Cookies Create WebTypes.webCookiesAccessed.name=Web Cookies Accessed WebTypes.webCookiesStart.name=Web Cookies Start -WebTypes.webCookiesEnd.name=Web Cookies End WebTypes.webBookmarks.name=Web Bookmarks WebTypes.webHistory.name=Web History Accessed WebTypes.webHistoryCreated.name=Web History Created diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED index 0d1dc22659918ee54eecf42244a5b8bd57d4cbe9..9cbcfc13ed6487f3183287b24d2236cb6ec677e2 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED +++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED @@ -362,7 +362,6 @@ WebTypes.webDownloads.name=Web Downloads WebTypes.webCookies.name=Web Cookies Create WebTypes.webCookiesAccessed.name=Web Cookies Accessed WebTypes.webCookiesStart.name=Web Cookies Start -WebTypes.webCookiesEnd.name=Web Cookies End WebTypes.webBookmarks.name=Web Bookmarks WebTypes.webHistory.name=Web History Accessed WebTypes.webHistoryCreated.name=Web History Created diff --git a/bindings/java/src/org/sleuthkit/datamodel/TimelineEventType.java b/bindings/java/src/org/sleuthkit/datamodel/TimelineEventType.java index 9eb81b796f8c12a3859ec0350bdd5de77f750ef2..4779e1a30e44f94b99b4d209950c0ad4e5e69cd4 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/TimelineEventType.java +++ b/bindings/java/src/org/sleuthkit/datamodel/TimelineEventType.java @@ -212,8 +212,7 @@ public SortedSet< TimelineEventType> getChildren() { @Override public SortedSet< TimelineEventType> getChildren() { return ImmutableSortedSet.of(WEB_DOWNLOADS, WEB_COOKIE, - WEB_COOKIE_ACCESSED, - WEB_COOKIE_END, WEB_BOOKMARK, + WEB_COOKIE_ACCESSED, WEB_BOOKMARK, WEB_HISTORY, WEB_SEARCH, WEB_FORM_AUTOFILL, WEB_FORM_ADDRESSES, WEB_FORM_ADDRESSES_MODIFIED, WEB_FORM_AUTOFILL_ACCESSED, WEB_CACHE, WEB_HISTORY_CREATED); @@ -657,12 +656,7 @@ public SortedSet<TimelineEventType> getChildren() { new Type(TSK_DATETIME_ACCESSED), new Type(TSK_URL)); - TimelineEventType WEB_COOKIE_END = new URLArtifactEventType(42, - getBundle().getString("WebTypes.webCookiesEnd.name"),// NON-NLS - WEB_ACTIVITY, - new BlackboardArtifact.Type(TSK_WEB_COOKIE), - new Type(TSK_DATETIME_END), - new Type(TSK_URL)); +// WEB_COOKIE_END was id 42, but has been removed. TimelineEventType BACKUP_EVENT_START = new TimelineEventArtifactTypeImpl(43, getBundle().getString("TimelineEventType.BackupEventStart.txt"),// NON-NLS diff --git a/bindings/java/test/org/sleuthkit/datamodel/TimelineEventTypesTest.java b/bindings/java/test/org/sleuthkit/datamodel/TimelineEventTypesTest.java index 4ae85e6b1d3eed21041682173965b1bfcc29f7a6..de4d2b3e04014c7bbf111fd8b273b6aa26a142c5 100644 --- a/bindings/java/test/org/sleuthkit/datamodel/TimelineEventTypesTest.java +++ b/bindings/java/test/org/sleuthkit/datamodel/TimelineEventTypesTest.java @@ -118,7 +118,7 @@ public void testArtifactAttributeEvents() { mapping.put(ARTIFACT_TYPE.TSK_WIFI_NETWORK, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME)); mapping.put(ARTIFACT_TYPE.TSK_WEB_FORM_ADDRESS, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED, ATTRIBUTE_TYPE.TSK_DATETIME_MODIFIED)); mapping.put(ARTIFACT_TYPE.TSK_METADATA_EXIF, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED)); - mapping.put(ARTIFACT_TYPE.TSK_WEB_COOKIE, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED, ATTRIBUTE_TYPE.TSK_DATETIME_CREATED, ATTRIBUTE_TYPE.TSK_DATETIME_END)); + mapping.put(ARTIFACT_TYPE.TSK_WEB_COOKIE, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED, ATTRIBUTE_TYPE.TSK_DATETIME_CREATED)); mapping.put(ARTIFACT_TYPE.TSK_WEB_DOWNLOAD, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED)); mapping.put(ARTIFACT_TYPE.TSK_TL_EVENT, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME)); mapping.put(ARTIFACT_TYPE.TSK_METADATA, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED, ATTRIBUTE_TYPE.TSK_DATETIME_MODIFIED, ATTRIBUTE_TYPE.TSK_LAST_PRINTED_DATETIME));