From c932cbbbc5937ef1e8b982d761dc6f529167bafb Mon Sep 17 00:00:00 2001 From: Tim McIver Date: Wed, 12 Dec 2012 17:49:56 -0500 Subject: [PATCH] Updated code to reflect changes in DataModel. --- .../autopsy/datamodel/AbstractFsContentNode.java | 13 +++---------- .../sleuthkit/autopsy/report/ReportBodyFile.java | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java index 6e9439f40b..9e576bbca1 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java @@ -207,13 +207,6 @@ public abstract class AbstractFsContentNode extends Abstrac * @param content to extract properties from */ public static void fillPropertyMap(Map map, FsContent content) { - - // created the dirFlag string - String dirFlagStr = content.isDirNameFlagSet(TSK_FS_NAME_FLAG_ENUM.ALLOC) - ? TSK_FS_NAME_FLAG_ENUM.ALLOC.toString() : TSK_FS_NAME_FLAG_ENUM.UNALLOC.toString(); - - // create the meta flag integer - int metaFlagsInt = TSK_FS_META_FLAG_ENUM.toInt(content.getMetaFlags()); map.put(FsContentPropertyType.NAME.toString(), getFsContentName(content)); map.put(FsContentPropertyType.LOCATION.toString(), DataConversion.getformattedPath(ContentUtils.getDisplayPath(content), 0, 1)); @@ -222,9 +215,9 @@ public abstract class AbstractFsContentNode extends Abstrac map.put(FsContentPropertyType.ACCESS_TIME.toString(), ContentUtils.getStringTime(content.getAtime(), content)); map.put(FsContentPropertyType.CREATED_TIME.toString(), ContentUtils.getStringTime(content.getCrtime(), content)); map.put(FsContentPropertyType.SIZE.toString(), content.getSize()); - map.put(FsContentPropertyType.FLAGS_DIR.toString(), dirFlagStr); - map.put(FsContentPropertyType.FLAGS_META.toString(), Integer.toString(metaFlagsInt)); - map.put(FsContentPropertyType.MODE.toString(), TSK_FS_META_MODE_ENUM.toString(content.getModes(), content.getMetaType())); + map.put(FsContentPropertyType.FLAGS_DIR.toString(), content.getDirFlagAsString()); + map.put(FsContentPropertyType.FLAGS_META.toString(), content.getMetaFlagsAsString()); + map.put(FsContentPropertyType.MODE.toString(), content.getModesAsString()); map.put(FsContentPropertyType.USER_ID.toString(), content.getUid()); map.put(FsContentPropertyType.GROUP_ID.toString(), content.getGid()); map.put(FsContentPropertyType.META_ADDR.toString(), content.getMetaAddr()); diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java b/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java index 1034d4a6b9..1efb929315 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java @@ -123,7 +123,7 @@ public class ReportBodyFile implements ReportModule { out.write("|"); out.write(Long.toString(file.getMetaAddr())); out.write("|"); - String modeString = TSK_FS_META_MODE_ENUM.toString(file.getModes(), file.getMetaType()); + String modeString = file.getModesAsString(); if(modeString != null) { out.write(modeString); }