mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 10:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
Brian Carrier 2019-07-16 10:43:20 -04:00
parent aa4cd9223e
commit 60494261e4
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/timeline/ui/EventTypeUtils.java
View File

@ -91,9 +91,9 @@ final public class EventTypeUtils {
imageFileName = "raw_access_logs.png"; imageFileName = "raw_access_logs.png";
} else if (typeID == TimelineEventType.USER_CREATED.getTypeID()) { } else if (typeID == TimelineEventType.USER_CREATED.getTypeID()) {
imageFileName = "hand_point.png"; imageFileName = "hand_point.png";
} else if (typeID == EventType.WEB_FORM_AUTOFILL.getTypeID()) { } else if (typeID == TimelineEventType.WEB_FORM_AUTOFILL.getTypeID()) {
imageFileName = "artifact-icon.png"; imageFileName = "artifact-icon.png";
} else if (typeID == EventType.WEB_FORM_ADDRESSES.getTypeID()) { } else if (typeID == TimelineEventType.WEB_FORM_ADDRESSES.getTypeID()) {
imageFileName = "artifact-icon.png"; imageFileName = "artifact-icon.png";
}else { }else {
imageFileName = "timeline_marker.png"; imageFileName = "timeline_marker.png";

1
Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventNodeBase.java
View File

@ -84,7 +84,6 @@ import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.DetailViewEvent;
import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.SleuthkitCase;
import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.datamodel.TimelineEventType; import org.sleuthkit.datamodel.TimelineEventType;
import org.sleuthkit.datamodel.TimelineEventType;
import org.sleuthkit.datamodel.TimelineEvent; import org.sleuthkit.datamodel.TimelineEvent;
/** /**

2
Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/DetailsViewModel.java
View File

@ -51,12 +51,10 @@ import org.sleuthkit.autopsy.timeline.utils.CacheLoaderImpl;
import org.sleuthkit.autopsy.timeline.utils.RangeDivision; import org.sleuthkit.autopsy.timeline.utils.RangeDivision;
import org.sleuthkit.autopsy.timeline.zooming.TimeUnits; import org.sleuthkit.autopsy.timeline.zooming.TimeUnits;
import org.sleuthkit.autopsy.timeline.zooming.ZoomState; import org.sleuthkit.autopsy.timeline.zooming.ZoomState;
import org.sleuthkit.datamodel.TimelineEvent;
import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.SleuthkitCase;
import org.sleuthkit.datamodel.TimelineManager; import org.sleuthkit.datamodel.TimelineManager;
import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.datamodel.TimelineEventType; import org.sleuthkit.datamodel.TimelineEventType;
import org.sleuthkit.datamodel.TimelineEventType;
import org.sleuthkit.datamodel.TimelineEvent; import org.sleuthkit.datamodel.TimelineEvent;
import org.sleuthkit.datamodel.TimelineFilter; import org.sleuthkit.datamodel.TimelineFilter;