From 153f64394b6b1c7b697c1b9e60a5f730c9661995 Mon Sep 17 00:00:00 2001
From: millmanorama <millmanorama@gmail.com>
Date: Fri, 11 Aug 2017 22:46:06 -0400
Subject: [PATCH] revert changing fillPropertyMap to non-static.
---
.../autopsy/datamodel/AbstractAbstractFileNode.java | 9 +++++----
.../autopsy/datamodel/AbstractFsContentNode.java | 2 +-
.../org/sleuthkit/autopsy/datamodel/Bundle.properties | 5 -----
.../org/sleuthkit/autopsy/datamodel/LayoutFileNode.java | 6 +++---
.../sleuthkit/autopsy/datamodel/LocalDirectoryNode.java | 2 +-
.../org/sleuthkit/autopsy/datamodel/LocalFileNode.java | 2 +-
.../autopsy/datamodel/VirtualDirectoryNode.java | 2 +-
7 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
index 54756fc1d1..a1d85d50df 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
@@ -146,8 +146,8 @@ private void updateSheet() {
"AbstractAbstractFileNode.md5HashColLbl=MD5 Hash",
"AbstractAbstractFileNode.objectId=Object ID",
"AbstractAbstractFileNode.mimeType=MIME Type",
- "AbstractAbstractFileNode.extensionColLbl=Extension"})
- public enum AbstractFilePropertyType {
+ "AbstractAbstractFileNode.extensionColLbl=Extension"})
+ public enum AbstractFilePropertyType {
NAME(AbstractAbstractFileNode_nameColLbl()),
LOCATION(AbstractAbstractFileNode_locationColLbl()),
@@ -170,7 +170,7 @@ public enum AbstractFilePropertyType {
MD5HASH(AbstractAbstractFileNode_md5HashColLbl()),
ObjectID(AbstractAbstractFileNode_objectId()),
MIMETYPE(AbstractAbstractFileNode_mimeType()),
- EXTENSION (AbstractAbstractFileNode_extensionColLbl());
+ EXTENSION(AbstractAbstractFileNode_extensionColLbl());
final private String displayString;
@@ -189,8 +189,9 @@ public String toString() {
*
* @param map map with preserved ordering, where property names/values
* are put
+ * @param content The content to get properties for.
*/
- void fillPropertyMap(Map<String, Object> map) {
+ static public void fillPropertyMap(Map<String, Object> map, AbstractFile content) {
map.put(NAME.toString(), getContentDisplayName(content));
map.put(LOCATION.toString(), getContentPath(content));
map.put(MOD_TIME.toString(), ContentUtils.getStringTime(content.getMtime(), content));
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
index 7b4b5d7bbd..b8a6807c24 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
@@ -70,7 +70,7 @@ protected Sheet createSheet() {
}
Map<String, Object> map = new LinkedHashMap<>();
- fillPropertyMap(map);
+ fillPropertyMap(map, getContent());
final String NO_DESCR = NbBundle.getMessage(this.getClass(), "AbstractFsContentNode.noDesc.text");
for (AbstractFilePropertyType propType : AbstractFilePropertyType.values()) {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties
index ae95c961fb..dd8a8cb5ff 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties
@@ -208,11 +208,6 @@ DeleteReportAction.actionDisplayName.multipleReports=Delete Reports
DeleteReportAction.actionPerformed.showConfirmDialog.title=Confirm Deletion
DeleteReportAction.actionPerformed.showConfirmDialog.single.msg=Do you want to delete 1 report from the case?
DeleteReportAction.actionPerformed.showConfirmDialog.multiple.msg=Do you want to delete {0} reports from the case?
-<<<<<<< HEAD
-=======
-AbstractAbstractFileNode.addFileProperty.tags.name=Tags
-AbstractAbstractFileNode.addFileProperty.tags.displayName=Tags
->>>>>>> upstream/develop
BlackboardArtifactNode.createSheet.tags.name=Tags
BlackboardArtifactNode.createSheet.tags.displayName=Tags
FileTypeExtensionFilters.tskImgFilter.text=Images
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
index 7cfcfcca9f..0d541d7e1a 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
@@ -134,12 +134,12 @@ public Action[] getActions(boolean context) {
}
actionsList.addAll(ContextMenuExtensionPoint.getActions());
- return actionsList.toArray(new Action[0]);
+ return actionsList.toArray(new Action[actionsList.size()]);
}
- @Override
+
void fillPropertyMap(Map<String, Object> map) {
- super.fillPropertyMap(map);
+ AbstractAbstractFileNode.fillPropertyMap(map, getContent());
map.put(LayoutContentPropertyType.PARTS.toString(), content.getNumParts());
}
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/LocalDirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/LocalDirectoryNode.java
index 0fe65ad846..f9bab8d5b2 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/LocalDirectoryNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/LocalDirectoryNode.java
@@ -63,7 +63,7 @@ protected Sheet createSheet() {
// At present, a LocalDirectory will never be a datasource - the top level of a logical
// file set is a VirtualDirectory
Map<String, Object> map = new LinkedHashMap<>();
- fillPropertyMap(map);
+ fillPropertyMap(map, getContent());
final String NO_DESCR = Bundle.LocalDirectoryNode_createSheet_noDesc();
for (Map.Entry<String, Object> entry : map.entrySet()) {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java
index 8cc94dcd4c..e14e41416e 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java
@@ -71,7 +71,7 @@ protected Sheet createSheet() {
}
Map<String, Object> map = new LinkedHashMap<>();
- fillPropertyMap(map);
+ fillPropertyMap(map, getContent());
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "LocalFileNode.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "LocalFileNode.createSheet.name.displayName"),
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
index 545b7469a1..3d78d3f13d 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
@@ -89,7 +89,7 @@ protected Sheet createSheet() {
if (!this.content.isDataSource()) {
Map<String, Object> map = new LinkedHashMap<>();
- fillPropertyMap(map);
+ fillPropertyMap(map, getContent());
final String NO_DESCR = NbBundle.getMessage(this.getClass(), "VirtualDirectoryNode.createSheet.noDesc");
for (Map.Entry<String, Object> entry : map.entrySet()) {
--
GitLab