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

7050 clean up dates section

Browse Source
This commit is contained in:
William Schaefer 2020-12-09 09:50:42 -05:00
parent 29ee882abc
commit c1672df249
1 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/GeneralPurposeArtifactViewer.java
View File

@ -39,6 +39,7 @@ import javax.swing.JMenuItem;
import javax.swing.JPopupMenu; import javax.swing.JPopupMenu;
import javax.swing.JTextPane; import javax.swing.JTextPane;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import org.apache.commons.lang.StringUtils;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.openide.util.lookup.ServiceProvider; import org.openide.util.lookup.ServiceProvider;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
@ -277,36 +278,10 @@ public class GeneralPurposeArtifactViewer extends AbstractArtifactDetailsPanel i
} }
if (TYPES_WITH_DATE_SECTION.contains(BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_COOKIE.getTypeID())) { if (TYPES_WITH_DATE_SECTION.contains(BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_COOKIE.getTypeID())) {
boolean headerAdded = false; boolean headerAdded = false;
List<BlackboardAttribute> attrList = attributeMap.remove(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_CREATED.getTypeID()); headerAdded = addDates(Bundle.GeneralPurposeArtifactViewer_dates_created(), attributeMap.remove(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_CREATED.getTypeID()), headerAdded);
if (attrList != null) { headerAdded = addDates(Bundle.GeneralPurposeArtifactViewer_dates_start(), attributeMap.remove(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_START.getTypeID()), headerAdded);
if (!headerAdded) { headerAdded = addDates(Bundle.GeneralPurposeArtifactViewer_dates_end(), attributeMap.remove(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_END.getTypeID()), headerAdded);
addHeader(Bundle.GeneralPurposeArtifactViewer_details_datesHeader()); addDates("", attributeMap.remove(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID()), headerAdded);
headerAdded = true;
}
for (BlackboardAttribute bba : attrList) {
addNameValueRow(Bundle.GeneralPurposeArtifactViewer_dates_created(), bba.getDisplayString());
}
}
attrList = attributeMap.remove(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_START.getTypeID());
if (attrList != null) {
if (!headerAdded) {
addHeader(Bundle.GeneralPurposeArtifactViewer_details_datesHeader());
headerAdded = true;
}
for (BlackboardAttribute bba : attrList) {
addNameValueRow(Bundle.GeneralPurposeArtifactViewer_dates_start(), bba.getDisplayString());
}
}
attrList = attributeMap.remove(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_END.getTypeID());
if (attrList != null) {
if (!headerAdded) {
addHeader(Bundle.GeneralPurposeArtifactViewer_details_datesHeader());
headerAdded = true;
}
for (BlackboardAttribute bba : attrList) {
addNameValueRow(Bundle.GeneralPurposeArtifactViewer_dates_end(), bba.getDisplayString());
}
}
} }
addHeader(Bundle.GeneralPurposeArtifactViewer_details_otherHeader()); addHeader(Bundle.GeneralPurposeArtifactViewer_details_otherHeader());
for (int key : attributeMap.keySet()) { for (int key : attributeMap.keySet()) {
@ -322,6 +297,34 @@ public class GeneralPurposeArtifactViewer extends AbstractArtifactDetailsPanel i
} }
} }
/**
* Private helper method to add all dates in a given attribute list.
*
* @param label Specific String to use in place of attributes display
* name.
* @param attrList List of attributes to add dates for.
* @param headerExists If the "Dates" header has already been displayed.
*
* @return True if the "Dates" header has been displayed, false otherwise.
*/
private boolean addDates(String label, List<BlackboardAttribute> attrList, boolean headerExists) {
boolean headerAdded = headerExists;
if (attrList != null) {
if (!headerAdded) {
addHeader(Bundle.GeneralPurposeArtifactViewer_details_datesHeader());
headerAdded = true;
}
String labelToUse = label;
for (BlackboardAttribute bba : attrList) {
if (StringUtils.isBlank(label)) {
labelToUse = bba.getAttributeType().getDisplayName();
}
addNameValueRow(labelToUse, bba.getDisplayString());
}
}
return headerAdded;
}
@NbBundle.Messages({"GeneralPurposeArtifactViewer.details.bookmarkHeader=Bookmark Details", @NbBundle.Messages({"GeneralPurposeArtifactViewer.details.bookmarkHeader=Bookmark Details",
"GeneralPurposeArtifactViewer.details.historyHeader=Visit Details", "GeneralPurposeArtifactViewer.details.historyHeader=Visit Details",
"GeneralPurposeArtifactViewer.details.downloadHeader=Downloaded File", "GeneralPurposeArtifactViewer.details.downloadHeader=Downloaded File",