diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java index 4398f99206..b0b6c92fca 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java @@ -43,7 +43,7 @@ public abstract class AbstractAbstractFileNode extends A private static final Logger LOGGER = Logger.getLogger(AbstractAbstractFileNode.class.getName()); /** - * @param type of the AbstractFile data to encapsulate + * @param type of the AbstractFile data to encapsulate * @param abstractFile file to encapsulate */ AbstractAbstractFileNode(T abstractFile) { @@ -52,7 +52,7 @@ public abstract class AbstractAbstractFileNode extends A int dotIndex = name.lastIndexOf("."); if (dotIndex > 0) { String ext = name.substring(dotIndex).toLowerCase(); - + // If this is an archive file we will listen for ingest events // that will notify us when new content has been identified. for (String s : FileTypeExtensions.getArchiveExtensions()) { @@ -228,6 +228,13 @@ public abstract class AbstractAbstractFileNode extends A public String toString() { return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.objectId"); + } + }, + MIMETYPE { + @Override + public String toString() { + return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.mimeType"); + } }, } @@ -235,8 +242,8 @@ public abstract class AbstractAbstractFileNode extends A /** * Fill map with AbstractFile properties * - * @param map map with preserved ordering, where property names/values - * are put + * @param map map with preserved ordering, where property names/values are + * put * @param content to extract properties from */ public static void fillPropertyMap(Map map, AbstractFile content) { @@ -268,6 +275,7 @@ public abstract class AbstractAbstractFileNode extends A map.put(AbstractFilePropertyType.HASHSETS.toString(), getHashSetHitsForFile(content)); map.put(AbstractFilePropertyType.MD5HASH.toString(), content.getMd5Hash() == null ? "" : content.getMd5Hash()); map.put(AbstractFilePropertyType.ObjectID.toString(), content.getId()); + map.put(AbstractFilePropertyType.MIMETYPE.toString(), content.getMIMEType() == null ? "" : content.getMIMEType()); } static String getContentDisplayName(AbstractFile file) { diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties index 05d385e858..53724950de 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties @@ -18,6 +18,7 @@ AbstractAbstractFileNode.typeMetaColLbl=Type(Meta) AbstractAbstractFileNode.knownColLbl=Known AbstractAbstractFileNode.inHashsetsColLbl=In Hashsets AbstractAbstractFileNode.md5HashColLbl=MD5 Hash +AbstractAbstractFileNode.mimeType = MIME Type AbstractContentChildren.CreateTSKNodeVisitor.exception.noNodeMsg=No Node defined for the given SleuthkitItem AbstractContentChildren.createAutopsyNodeVisitor.exception.noNodeMsg=No Node defined for the given DisplayableItem AbstractContentNode.exception.cannotChangeSysName.msg=Cannot change the system name.