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

rename property sheet variables for PMD/Codacy

Browse Source
This commit is contained in:
Brian Carrier 2018-04-15 09:57:47 -04:00
parent a2f15b234a
commit c19e0fbb0c
31 changed files with 367 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Core/src/org/sleuthkit/autopsy/casemodule/MultiUserNode.java
View File

@ -115,19 +115,19 @@ final class MultiUserNode extends AbstractNode {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(Bundle.CaseNode_column_name(), Bundle.CaseNode_column_name(), Bundle.CaseNode_column_name(), sheetSet.put(new NodeProperty<>(Bundle.CaseNode_column_name(), Bundle.CaseNode_column_name(), Bundle.CaseNode_column_name(),
caseName)); caseName));
ss.put(new NodeProperty<>(Bundle.CaseNode_column_createdTime(), Bundle.CaseNode_column_createdTime(), Bundle.CaseNode_column_createdTime(), sheetSet.put(new NodeProperty<>(Bundle.CaseNode_column_createdTime(), Bundle.CaseNode_column_createdTime(), Bundle.CaseNode_column_createdTime(),
caseCreatedDate)); caseCreatedDate));
ss.put(new NodeProperty<>(Bundle.CaseNode_column_metadataFilePath(), Bundle.CaseNode_column_metadataFilePath(), Bundle.CaseNode_column_metadataFilePath(), sheetSet.put(new NodeProperty<>(Bundle.CaseNode_column_metadataFilePath(), Bundle.CaseNode_column_metadataFilePath(), Bundle.CaseNode_column_metadataFilePath(),
caseMetadataFilePath)); caseMetadataFilePath));
return s; return sheet;
} }
@Override @Override

8
Core/src/org/sleuthkit/autopsy/communications/AccountDeviceInstanceNode.java
View File

@ -74,11 +74,11 @@ final class AccountDeviceInstanceNode extends AbstractNode {
@Override @Override
@NbBundle.Messages(value = {"AccountNode.device=Device", "AccountNode.accountName=Account", "AccountNode.accountType=Type", "AccountNode.messageCount=Msgs"}) @NbBundle.Messages(value = {"AccountNode.device=Device", "AccountNode.accountName=Account", "AccountNode.accountType=Type", "AccountNode.messageCount=Msgs"})
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set properties = s.get(Sheet.PROPERTIES); Sheet.Set properties = sheet.get(Sheet.PROPERTIES);
if (properties == null) { if (properties == null) {
properties = Sheet.createPropertiesSet(); properties = Sheet.createPropertiesSet();
s.put(properties); sheet.put(properties);
} }
properties.put(new NodeProperty<>("type", properties.put(new NodeProperty<>("type",
Bundle.AccountNode_accountType(), Bundle.AccountNode_accountType(),
@ -92,7 +92,7 @@ final class AccountDeviceInstanceNode extends AbstractNode {
Bundle.AccountNode_device(), Bundle.AccountNode_device(),
"device", "device",
accountDeviceInstanceKey.getDataSourceName())); // NON-NLS accountDeviceInstanceKey.getDataSourceName())); // NON-NLS
return s; return sheet;
} }
@Override @Override

42
Core/src/org/sleuthkit/autopsy/communications/RelationshipNode.java
View File

@ -56,14 +56,14 @@ final class RelationshipNode extends BlackboardArtifactNode {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = new Sheet(); Sheet sheet = new Sheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>("Type", "Type", "Type", getDisplayName())); sheetSet.put(new NodeProperty<>("Type", "Type", "Type", getDisplayName()));
final BlackboardArtifact artifact = getArtifact(); final BlackboardArtifact artifact = getArtifact();
BlackboardArtifact.ARTIFACT_TYPE fromID = BlackboardArtifact.ARTIFACT_TYPE.fromID(getArtifact().getArtifactTypeID()); BlackboardArtifact.ARTIFACT_TYPE fromID = BlackboardArtifact.ARTIFACT_TYPE.fromID(getArtifact().getArtifactTypeID());
@ -71,42 +71,42 @@ final class RelationshipNode extends BlackboardArtifactNode {
//Consider refactoring this to reduce boilerplate //Consider refactoring this to reduce boilerplate
switch (fromID) { switch (fromID) {
case TSK_EMAIL_MSG: case TSK_EMAIL_MSG:
ss.put(new NodeProperty<>("From", "From", "From", sheetSet.put(new NodeProperty<>("From", "From", "From",
StringUtils.strip(getAttributeDisplayString(artifact, TSK_EMAIL_FROM), " \t\n;"))); StringUtils.strip(getAttributeDisplayString(artifact, TSK_EMAIL_FROM), " \t\n;")));
ss.put(new NodeProperty<>("To", "To", "To", sheetSet.put(new NodeProperty<>("To", "To", "To",
StringUtils.strip(getAttributeDisplayString(artifact, TSK_EMAIL_TO), " \t\n;"))); StringUtils.strip(getAttributeDisplayString(artifact, TSK_EMAIL_TO), " \t\n;")));
ss.put(new NodeProperty<>("Date", "Date", "Date", sheetSet.put(new NodeProperty<>("Date", "Date", "Date",
getAttributeDisplayString(artifact, TSK_DATETIME_SENT))); getAttributeDisplayString(artifact, TSK_DATETIME_SENT)));
ss.put(new NodeProperty<>("Subject", "Subject", "Subject", sheetSet.put(new NodeProperty<>("Subject", "Subject", "Subject",
getAttributeDisplayString(artifact, TSK_SUBJECT))); getAttributeDisplayString(artifact, TSK_SUBJECT)));
try { try {
ss.put(new NodeProperty<>("Attms", "Attms", "Attms", artifact.getChildrenCount())); sheetSet.put(new NodeProperty<>("Attms", "Attms", "Attms", artifact.getChildrenCount()));
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
logger.log(Level.WARNING, "Error loading attachment count for " + artifact, ex); logger.log(Level.WARNING, "Error loading attachment count for " + artifact, ex);
} }
break; break;
case TSK_MESSAGE: case TSK_MESSAGE:
ss.put(new NodeProperty<>("From", "From", "From", sheetSet.put(new NodeProperty<>("From", "From", "From",
getAttributeDisplayString(artifact, TSK_PHONE_NUMBER_FROM))); getAttributeDisplayString(artifact, TSK_PHONE_NUMBER_FROM)));
ss.put(new NodeProperty<>("To", "To", "To", sheetSet.put(new NodeProperty<>("To", "To", "To",
getAttributeDisplayString(artifact, TSK_PHONE_NUMBER_TO))); getAttributeDisplayString(artifact, TSK_PHONE_NUMBER_TO)));
ss.put(new NodeProperty<>("Date", "Date", "Date", sheetSet.put(new NodeProperty<>("Date", "Date", "Date",
getAttributeDisplayString(artifact, TSK_DATETIME))); getAttributeDisplayString(artifact, TSK_DATETIME)));
ss.put(new NodeProperty<>("Subject", "Subject", "Subject", sheetSet.put(new NodeProperty<>("Subject", "Subject", "Subject",
getAttributeDisplayString(artifact, TSK_SUBJECT))); getAttributeDisplayString(artifact, TSK_SUBJECT)));
try { try {
ss.put(new NodeProperty<>("Attms", "Attms", "Attms", artifact.getChildrenCount())); sheetSet.put(new NodeProperty<>("Attms", "Attms", "Attms", artifact.getChildrenCount()));
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
logger.log(Level.WARNING, "Error loading attachment count for " + artifact, ex); logger.log(Level.WARNING, "Error loading attachment count for " + artifact, ex);
} }
break; break;
case TSK_CALLLOG: case TSK_CALLLOG:
ss.put(new NodeProperty<>("From", "From", "From", sheetSet.put(new NodeProperty<>("From", "From", "From",
getAttributeDisplayString(artifact, TSK_PHONE_NUMBER_FROM))); getAttributeDisplayString(artifact, TSK_PHONE_NUMBER_FROM)));
ss.put(new NodeProperty<>("To", "To", "To", sheetSet.put(new NodeProperty<>("To", "To", "To",
getAttributeDisplayString(artifact, TSK_PHONE_NUMBER_TO))); getAttributeDisplayString(artifact, TSK_PHONE_NUMBER_TO)));
ss.put(new NodeProperty<>("Date", "Date", "Date", sheetSet.put(new NodeProperty<>("Date", "Date", "Date",
getAttributeDisplayString(artifact, TSK_DATETIME_START))); getAttributeDisplayString(artifact, TSK_DATETIME_START)));
break; break;
default: default:
@ -114,9 +114,9 @@ final class RelationshipNode extends BlackboardArtifactNode {
} }
} }
addTagProperty(ss); addTagProperty(sheetSet);
return s; return sheet;
} }
/** /**

22
Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.java
View File

@ -716,20 +716,20 @@ public class MessageContentViewer extends javax.swing.JPanel implements DataCont
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = new Sheet(); Sheet sheet = new Sheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
AbstractFile file = getContent(); AbstractFile file = getContent();
ss.put(new NodeProperty<>("Name", "Name", "Name", file.getName())); sheetSet.put(new NodeProperty<>("Name", "Name", "Name", file.getName()));
ss.put(new NodeProperty<>("Size", "Size", "Size", file.getSize())); sheetSet.put(new NodeProperty<>("Size", "Size", "Size", file.getSize()));
ss.put(new NodeProperty<>("Mime Type", "Mime Type", "Mime Type", StringUtils.defaultString(file.getMIMEType()))); sheetSet.put(new NodeProperty<>("Mime Type", "Mime Type", "Mime Type", StringUtils.defaultString(file.getMIMEType())));
ss.put(new NodeProperty<>("Known", "Known", "Known", file.getKnown().getName())); sheetSet.put(new NodeProperty<>("Known", "Known", "Known", file.getKnown().getName()));
addTagProperty(ss); addTagProperty(sheetSet);
return s; return sheet;
} }
} }
} }

6
Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
View File

@ -257,18 +257,18 @@ public abstract class AbstractAbstractFileNode<T extends AbstractFile> extends A
* Used by subclasses of AbstractAbstractFileNode to add the tags property * Used by subclasses of AbstractAbstractFileNode to add the tags property
* to their sheets. * to their sheets.
* *
* @param ss the modifiable Sheet.Set returned by * @param sheetSet the modifiable Sheet.Set returned by
* Sheet.get(Sheet.PROPERTIES) * Sheet.get(Sheet.PROPERTIES)
*/ */
@NbBundle.Messages("AbstractAbstractFileNode.tagsProperty.displayName=Tags") @NbBundle.Messages("AbstractAbstractFileNode.tagsProperty.displayName=Tags")
protected void addTagProperty(Sheet.Set ss) { protected void addTagProperty(Sheet.Set sheetSet) {
List<ContentTag> tags = new ArrayList<>(); List<ContentTag> tags = new ArrayList<>();
try { try {
tags.addAll(Case.getOpenCase().getServices().getTagsManager().getContentTagsByContent(content)); tags.addAll(Case.getOpenCase().getServices().getTagsManager().getContentTagsByContent(content));
} catch (TskCoreException | NoCurrentCaseException ex) { } catch (TskCoreException | NoCurrentCaseException ex) {
logger.log(Level.SEVERE, "Failed to get tags for content " + content.getName(), ex); logger.log(Level.SEVERE, "Failed to get tags for content " + content.getName(), ex);
} }
ss.put(new NodeProperty<>("Tags", AbstractAbstractFileNode_tagsProperty_displayName(), sheetSet.put(new NodeProperty<>("Tags", AbstractAbstractFileNode_tagsProperty_displayName(),
NO_DESCR, tags.stream().map(t -> t.getName().getDisplayName()) NO_DESCR, tags.stream().map(t -> t.getName().getDisplayName())
.distinct() .distinct()
.collect(Collectors.joining(", ")))); .collect(Collectors.joining(", "))));

18
Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
View File

@ -63,11 +63,11 @@ public abstract class AbstractFsContentNode<T extends AbstractFile> extends Abst
@Override @Override
@NbBundle.Messages("AbstractFsContentNode.noDesc.text=no description") @NbBundle.Messages("AbstractFsContentNode.noDesc.text=no description")
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
@ -76,16 +76,16 @@ public abstract class AbstractFsContentNode<T extends AbstractFile> extends Abst
final String NO_DESCR = Bundle.AbstractFsContentNode_noDesc_text(); final String NO_DESCR = Bundle.AbstractFsContentNode_noDesc_text();
for (AbstractFilePropertyType propType : AbstractFilePropertyType.values()) { for (AbstractFilePropertyType propType : AbstractFilePropertyType.values()) {
final String propString = propType.toString(); final String propString = propType.toString();
ss.put(new NodeProperty<>(propString, propString, NO_DESCR, map.get(propString))); sheetSet.put(new NodeProperty<>(propString, propString, NO_DESCR, map.get(propString)));
} }
if (directoryBrowseMode) { if (directoryBrowseMode) {
ss.put(new NodeProperty<>(HIDE_PARENT, HIDE_PARENT, HIDE_PARENT, HIDE_PARENT)); sheetSet.put(new NodeProperty<>(HIDE_PARENT, HIDE_PARENT, HIDE_PARENT, HIDE_PARENT));
} }
// add tags property to the sheet // add tags property to the sheet
addTagProperty(ss); addTagProperty(sheetSet);
return s; return sheet;
} }
} }

50
Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
View File

@ -314,17 +314,17 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
fillPropertyMap(map, artifact); fillPropertyMap(map, artifact);
ss.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.srcFile.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.srcFile.name"),
NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.srcFile.displayName"), NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.srcFile.displayName"),
NO_DESCR, NO_DESCR,
this.getSourceName())); this.getSourceName()));
@ -333,11 +333,11 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
BlackboardAttribute attribute = artifact.getAttribute(new BlackboardAttribute.Type(ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT)); BlackboardAttribute attribute = artifact.getAttribute(new BlackboardAttribute.Type(ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT));
if (attribute != null) { if (attribute != null) {
BlackboardArtifact associatedArtifact = Case.getOpenCase().getSleuthkitCase().getBlackboardArtifact(attribute.getValueLong()); BlackboardArtifact associatedArtifact = Case.getOpenCase().getSleuthkitCase().getBlackboardArtifact(attribute.getValueLong());
ss.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.artifactType.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.artifactType.name"),
NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.artifactType.displayName"), NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.artifactType.displayName"),
NO_DESCR, NO_DESCR,
associatedArtifact.getDisplayName() + " " + NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.artifact.displayName"))); associatedArtifact.getDisplayName() + " " + NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.artifact.displayName")));
ss.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.artifactDetails.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.artifactDetails.name"),
NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.artifactDetails.displayName"), NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.artifactDetails.displayName"),
NO_DESCR, NO_DESCR,
associatedArtifact.getShortDescription())); associatedArtifact.getShortDescription()));
@ -348,7 +348,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
} }
for (Map.Entry<String, Object> entry : map.entrySet()) { for (Map.Entry<String, Object> entry : map.entrySet()) {
ss.put(new NodeProperty<>(entry.getKey(), sheetSet.put(new NodeProperty<>(entry.getKey(),
entry.getKey(), entry.getKey(),
NO_DESCR, NO_DESCR,
entry.getValue())); entry.getValue()));
@ -357,7 +357,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
//append custom node properties //append custom node properties
if (customProperties != null) { if (customProperties != null) {
for (NodeProperty<? extends Object> np : customProperties) { for (NodeProperty<? extends Object> np : customProperties) {
ss.put(np); sheetSet.put(np);
} }
} }
@ -375,11 +375,11 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
actualMimeType = ""; //NON-NLS actualMimeType = ""; //NON-NLS
} }
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.ext.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.ext.name"),
NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.ext.displayName"), NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.ext.displayName"),
NO_DESCR, NO_DESCR,
ext)); ext));
ss.put(new NodeProperty<>( sheetSet.put(new NodeProperty<>(
NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.mimeType.name"), NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.mimeType.name"),
NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.mimeType.displayName"), NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.mimeType.displayName"),
NO_DESCR, NO_DESCR,
@ -395,7 +395,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
} }
if (sourcePath.isEmpty() == false) { if (sourcePath.isEmpty() == false) {
ss.put(new NodeProperty<>( sheetSet.put(new NodeProperty<>(
NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.filePath.name"), NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.filePath.name"),
NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.filePath.displayName"), NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.filePath.displayName"),
NO_DESCR, NO_DESCR,
@ -404,27 +404,27 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
if (Arrays.asList(SHOW_FILE_METADATA).contains(artifactTypeId)) { if (Arrays.asList(SHOW_FILE_METADATA).contains(artifactTypeId)) {
AbstractFile file = associated instanceof AbstractFile ? (AbstractFile) associated : null; AbstractFile file = associated instanceof AbstractFile ? (AbstractFile) associated : null;
ss.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileModifiedTime.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileModifiedTime.name"),
NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileModifiedTime.displayName"), NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileModifiedTime.displayName"),
"", "",
file == null ? "" : ContentUtils.getStringTime(file.getMtime(), file))); file == null ? "" : ContentUtils.getStringTime(file.getMtime(), file)));
ss.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileChangedTime.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileChangedTime.name"),
NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileChangedTime.displayName"), NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileChangedTime.displayName"),
"", "",
file == null ? "" : ContentUtils.getStringTime(file.getCtime(), file))); file == null ? "" : ContentUtils.getStringTime(file.getCtime(), file)));
ss.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileAccessedTime.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileAccessedTime.name"),
NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileAccessedTime.displayName"), NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileAccessedTime.displayName"),
"", "",
file == null ? "" : ContentUtils.getStringTime(file.getAtime(), file))); file == null ? "" : ContentUtils.getStringTime(file.getAtime(), file)));
ss.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileCreatedTime.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileCreatedTime.name"),
NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileCreatedTime.displayName"), NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileCreatedTime.displayName"),
"", "",
file == null ? "" : ContentUtils.getStringTime(file.getCrtime(), file))); file == null ? "" : ContentUtils.getStringTime(file.getCrtime(), file)));
ss.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileSize.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileSize.name"),
NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileSize.displayName"), NbBundle.getMessage(BlackboardArtifactNode.class, "ContentTagNode.createSheet.fileSize.displayName"),
"", "",
associated.getSize())); associated.getSize()));
ss.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_artifactMD5_name(), sheetSet.put(new NodeProperty<>(Bundle.BlackboardArtifactNode_createSheet_artifactMD5_name(),
Bundle.BlackboardArtifactNode_createSheet_artifactMD5_displayName(), Bundle.BlackboardArtifactNode_createSheet_artifactMD5_displayName(),
"", "",
file == null ? "" : StringUtils.defaultString(file.getMd5Hash()))); file == null ? "" : StringUtils.defaultString(file.getMd5Hash())));
@ -443,7 +443,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
} }
if (dataSourceStr.isEmpty() == false) { if (dataSourceStr.isEmpty() == false) {
ss.put(new NodeProperty<>( sheetSet.put(new NodeProperty<>(
NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.dataSrc.name"), NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.dataSrc.name"),
NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.dataSrc.displayName"), NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.dataSrc.displayName"),
NO_DESCR, NO_DESCR,
@ -451,21 +451,21 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
} }
} }
addTagProperty(ss); addTagProperty(sheetSet);
return s; return sheet;
} }
/** /**
* Used by (subclasses of) BlackboardArtifactNode to add the tags property * Used by (subclasses of) BlackboardArtifactNode to add the tags property
* to their sheets. * to their sheets.
* *
* @param ss the modifiable Sheet.Set returned by * @param sheetSet the modifiable Sheet.Set returned by
* Sheet.get(Sheet.PROPERTIES) * Sheet.get(Sheet.PROPERTIES)
*/ */
@NbBundle.Messages({ @NbBundle.Messages({
"BlackboardArtifactNode.createSheet.tags.displayName=Tags"}) "BlackboardArtifactNode.createSheet.tags.displayName=Tags"})
protected void addTagProperty(Sheet.Set ss) throws MissingResourceException { protected void addTagProperty(Sheet.Set sheetSet) throws MissingResourceException {
// add properties for tags // add properties for tags
List<Tag> tags = new ArrayList<>(); List<Tag> tags = new ArrayList<>();
try { try {
@ -474,7 +474,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
} catch (TskCoreException | NoCurrentCaseException ex) { } catch (TskCoreException | NoCurrentCaseException ex) {
LOGGER.log(Level.SEVERE, "Failed to get tags for artifact " + artifact.getDisplayName(), ex); LOGGER.log(Level.SEVERE, "Failed to get tags for artifact " + artifact.getDisplayName(), ex);
} }
ss.put(new NodeProperty<>("Tags", Bundle.BlackboardArtifactNode_createSheet_tags_displayName(), sheetSet.put(new NodeProperty<>("Tags", Bundle.BlackboardArtifactNode_createSheet_tags_displayName(),
NO_DESCR, tags.stream().map(t -> t.getName().getDisplayName()).collect(Collectors.joining(", ")))); NO_DESCR, tags.stream().map(t -> t.getName().getDisplayName()).collect(Collectors.joining(", "))));
} }

14
Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java
View File

@ -133,17 +133,17 @@ public class DataSourcesNode extends DisplayableItemNode {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "DataSourcesNode.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "DataSourcesNode.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "DataSourcesNode.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "DataSourcesNode.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "DataSourcesNode.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "DataSourcesNode.createSheet.name.desc"),
NAME)); NAME));
return s; return sheet;
} }
} }

28
Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java
View File

@ -140,18 +140,18 @@ public class DeletedContent implements AutopsyVisitableItem {
"DeletedContent.createSheet.name.displayName=Name", "DeletedContent.createSheet.name.displayName=Name",
"DeletedContent.createSheet.name.desc=no description"}) "DeletedContent.createSheet.name.desc=no description"})
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>("Name", //NON-NLS sheetSet.put(new NodeProperty<>("Name", //NON-NLS
Bundle.DeletedContent_createSheet_name_displayName(), Bundle.DeletedContent_createSheet_name_displayName(),
Bundle.DeletedContent_createSheet_name_desc(), Bundle.DeletedContent_createSheet_name_desc(),
NAME)); NAME));
return s; return sheet;
} }
@Override @Override
@ -314,19 +314,19 @@ public class DeletedContent implements AutopsyVisitableItem {
"DeletedContent.createSheet.filterType.displayName=Type", "DeletedContent.createSheet.filterType.displayName=Type",
"DeletedContent.createSheet.filterType.desc=no description"}) "DeletedContent.createSheet.filterType.desc=no description"})
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>("Type", //NON_NLS sheetSet.put(new NodeProperty<>("Type", //NON_NLS
Bundle.DeletedContent_createSheet_filterType_displayName(), Bundle.DeletedContent_createSheet_filterType_displayName(),
Bundle.DeletedContent_createSheet_filterType_desc(), Bundle.DeletedContent_createSheet_filterType_desc(),
filter.getDisplayName())); filter.getDisplayName()));
return s; return sheet;
} }
@Override @Override

42
Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
View File

@ -199,19 +199,19 @@ public class EmailExtracted implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.desc"),
getName())); getName()));
return s; return sheet;
} }
@Override @Override
@ -339,19 +339,19 @@ public class EmailExtracted implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.desc"),
getName())); getName()));
return s; return sheet;
} }
@Override @Override
@ -435,19 +435,19 @@ public class EmailExtracted implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.desc"),
getName())); getName()));
return s; return sheet;
} }
@Override @Override

30
Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
View File

@ -158,18 +158,18 @@ public class ExtractedContent implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ExtractedContentNode.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ExtractedContentNode.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "ExtractedContentNode.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "ExtractedContentNode.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "ExtractedContentNode.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "ExtractedContentNode.createSheet.name.desc"),
NAME)); NAME));
return s; return sheet;
} }
@Override @Override
@ -342,24 +342,24 @@ public class ExtractedContent implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.artType.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.artType.name"),
NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.artType.displayName"), NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.artType.displayName"),
NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.artType.desc"), NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.artType.desc"),
type.getDisplayName())); type.getDisplayName()));
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.childCnt.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.childCnt.name"),
NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.childCnt.displayName"), NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.childCnt.displayName"),
NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.childCnt.desc"), NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.childCnt.desc"),
childCount)); childCount));
return s; return sheet;
} }
@Override @Override

28
Core/src/org/sleuthkit/autopsy/datamodel/FileSize.java
View File

@ -135,18 +135,18 @@ public class FileSize implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileSize.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileSize.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "FileSize.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "FileSize.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "FileSize.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "FileSize.createSheet.name.desc"),
NAME)); NAME));
return s; return sheet;
} }
@Override @Override
@ -320,19 +320,19 @@ public class FileSize implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileSize.createSheet.filterType.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileSize.createSheet.filterType.name"),
NbBundle.getMessage(this.getClass(), "FileSize.createSheet.filterType.displayName"), NbBundle.getMessage(this.getClass(), "FileSize.createSheet.filterType.displayName"),
NbBundle.getMessage(this.getClass(), "FileSize.createSheet.filterType.desc"), NbBundle.getMessage(this.getClass(), "FileSize.createSheet.filterType.desc"),
filter.getDisplayName())); filter.getDisplayName()));
return s; return sheet;
} }
@Override @Override

14
Core/src/org/sleuthkit/autopsy/datamodel/FileTypes.java
View File

@ -137,19 +137,19 @@ public final class FileTypes implements AutopsyVisitableItem {
"FileTypes.createSheet.name.displayName=Name", "FileTypes.createSheet.name.displayName=Name",
"FileTypes.createSheet.name.desc=no description"}) "FileTypes.createSheet.name.desc=no description"})
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(Bundle.FileTypes_createSheet_name_name(), sheetSet.put(new NodeProperty<>(Bundle.FileTypes_createSheet_name_name(),
Bundle.FileTypes_createSheet_name_displayName(), Bundle.FileTypes_createSheet_name_displayName(),
Bundle.FileTypes_createSheet_name_desc(), Bundle.FileTypes_createSheet_name_desc(),
NAME NAME
)); ));
return s; return sheet;
} }
@Override @Override

32
Core/src/org/sleuthkit/autopsy/datamodel/FileTypesByExtension.java
View File

@ -183,11 +183,11 @@ public final class FileTypesByExtension implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
if (filter != null && (filter.equals(FileTypesByExtension.RootFilter.TSK_DOCUMENT_FILTER) || filter.equals(FileTypesByExtension.RootFilter.TSK_EXECUTABLE_FILTER))) { if (filter != null && (filter.equals(FileTypesByExtension.RootFilter.TSK_DOCUMENT_FILTER) || filter.equals(FileTypesByExtension.RootFilter.TSK_EXECUTABLE_FILTER))) {
String extensions = ""; String extensions = "";
@ -195,11 +195,11 @@ public final class FileTypesByExtension implements AutopsyVisitableItem {
extensions += "'" + ext + "', "; extensions += "'" + ext + "', ";
} }
extensions = extensions.substring(0, extensions.lastIndexOf(',')); extensions = extensions.substring(0, extensions.lastIndexOf(','));
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.fileExt.name"), NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.fileExt.displayName"), NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.fileExt.desc"), extensions)); sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.fileExt.name"), NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.fileExt.displayName"), NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.fileExt.desc"), extensions));
} else { } else {
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.name.name"), NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.name.desc"), getDisplayName())); sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.name.name"), NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.name.desc"), getDisplayName()));
} }
return s; return sheet;
} }
@Override @Override
@ -303,22 +303,22 @@ public final class FileTypesByExtension implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.filterType.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.filterType.name"),
NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.filterType.displayName"), NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.filterType.displayName"),
NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.filterType.desc"), NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.filterType.desc"),
filter.getDisplayName())); filter.getDisplayName()));
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.fileExt.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.fileExt.name"),
NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.fileExt.displayName"), NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.fileExt.displayName"),
NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.fileExt.desc"), NbBundle.getMessage(this.getClass(), "FileTypesByExtNode.createSheet.fileExt.desc"),
String.join(", ", filter.getFilter()))); String.join(", ", filter.getFilter())));
return s; return sheet;
} }
@Override @Override

28
Core/src/org/sleuthkit/autopsy/datamodel/FileTypesByMimeType.java
View File

@ -310,14 +310,14 @@ public final class FileTypesByMimeType extends Observable implements AutopsyVisi
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileTypesByMimeTypeNode.createSheet.mediaType.name"), NbBundle.getMessage(this.getClass(), "FileTypesByMimeTypeNode.createSheet.mediaType.displayName"), NbBundle.getMessage(this.getClass(), "FileTypesByMimeTypeNode.createSheet.mediaType.desc"), getDisplayName())); sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileTypesByMimeTypeNode.createSheet.mediaType.name"), NbBundle.getMessage(this.getClass(), "FileTypesByMimeTypeNode.createSheet.mediaType.displayName"), NbBundle.getMessage(this.getClass(), "FileTypesByMimeTypeNode.createSheet.mediaType.desc"), getDisplayName()));
return s; return sheet;
} }
@Override @Override
@ -401,14 +401,14 @@ public final class FileTypesByMimeType extends Observable implements AutopsyVisi
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileTypesByMimeTypeNode.createSheet.mediaSubtype.name"), NbBundle.getMessage(this.getClass(), "FileTypesByMimeTypeNode.createSheet.mediaSubtype.displayName"), NbBundle.getMessage(this.getClass(), "FileTypesByMimeTypeNode.createSheet.mediaSubtype.desc"), getDisplayName())); sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileTypesByMimeTypeNode.createSheet.mediaSubtype.name"), NbBundle.getMessage(this.getClass(), "FileTypesByMimeTypeNode.createSheet.mediaSubtype.displayName"), NbBundle.getMessage(this.getClass(), "FileTypesByMimeTypeNode.createSheet.mediaSubtype.desc"), getDisplayName()));
return s; return sheet;
} }
@Override @Override

28
Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
View File

@ -166,19 +166,19 @@ public class HashsetHits implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.desc"),
getName())); getName()));
return s; return sheet;
} }
@Override @Override
@ -314,19 +314,19 @@ public class HashsetHits implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.desc"),
getName())); getName()));
return s; return sheet;
} }
@Override @Override

26
Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java
View File

@ -135,38 +135,38 @@ public class ImageNode extends AbstractContentNode<Image> {
"ImageNode.createSheet.deviceId.displayName=Device ID", "ImageNode.createSheet.deviceId.displayName=Device ID",
"ImageNode.createSheet.deviceId.desc=Device ID of the image"}) "ImageNode.createSheet.deviceId.desc=Device ID of the image"})
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ImageNode.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ImageNode.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "ImageNode.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "ImageNode.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "ImageNode.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "ImageNode.createSheet.name.desc"),
getDisplayName())); getDisplayName()));
ss.put(new NodeProperty<>(Bundle.ImageNode_createSheet_type_name(), sheetSet.put(new NodeProperty<>(Bundle.ImageNode_createSheet_type_name(),
Bundle.ImageNode_createSheet_type_displayName(), Bundle.ImageNode_createSheet_type_displayName(),
Bundle.ImageNode_createSheet_type_desc(), Bundle.ImageNode_createSheet_type_desc(),
Bundle.ImageNode_createSheet_type_text())); Bundle.ImageNode_createSheet_type_text()));
ss.put(new NodeProperty<>(Bundle.ImageNode_createSheet_size_name(), sheetSet.put(new NodeProperty<>(Bundle.ImageNode_createSheet_size_name(),
Bundle.ImageNode_createSheet_size_displayName(), Bundle.ImageNode_createSheet_size_displayName(),
Bundle.ImageNode_createSheet_size_desc(), Bundle.ImageNode_createSheet_size_desc(),
this.content.getSize())); this.content.getSize()));
ss.put(new NodeProperty<>(Bundle.ImageNode_createSheet_sectorSize_name(), sheetSet.put(new NodeProperty<>(Bundle.ImageNode_createSheet_sectorSize_name(),
Bundle.ImageNode_createSheet_sectorSize_displayName(), Bundle.ImageNode_createSheet_sectorSize_displayName(),
Bundle.ImageNode_createSheet_sectorSize_desc(), Bundle.ImageNode_createSheet_sectorSize_desc(),
this.content.getSsize())); this.content.getSsize()));
ss.put(new NodeProperty<>(Bundle.ImageNode_createSheet_md5_name(), sheetSet.put(new NodeProperty<>(Bundle.ImageNode_createSheet_md5_name(),
Bundle.ImageNode_createSheet_md5_displayName(), Bundle.ImageNode_createSheet_md5_displayName(),
Bundle.ImageNode_createSheet_md5_desc(), Bundle.ImageNode_createSheet_md5_desc(),
this.content.getMd5())); this.content.getMd5()));
ss.put(new NodeProperty<>(Bundle.ImageNode_createSheet_timezone_name(), sheetSet.put(new NodeProperty<>(Bundle.ImageNode_createSheet_timezone_name(),
Bundle.ImageNode_createSheet_timezone_displayName(), Bundle.ImageNode_createSheet_timezone_displayName(),
Bundle.ImageNode_createSheet_timezone_desc(), Bundle.ImageNode_createSheet_timezone_desc(),
this.content.getTimeZone())); this.content.getTimeZone()));
@ -174,7 +174,7 @@ public class ImageNode extends AbstractContentNode<Image> {
try (CaseDbQuery query = Case.getOpenCase().getSleuthkitCase().executeQuery("SELECT device_id FROM data_source_info WHERE obj_id = " + this.content.getId());) { try (CaseDbQuery query = Case.getOpenCase().getSleuthkitCase().executeQuery("SELECT device_id FROM data_source_info WHERE obj_id = " + this.content.getId());) {
ResultSet deviceIdSet = query.getResultSet(); ResultSet deviceIdSet = query.getResultSet();
if (deviceIdSet.next()) { if (deviceIdSet.next()) {
ss.put(new NodeProperty<>(Bundle.ImageNode_createSheet_deviceId_name(), sheetSet.put(new NodeProperty<>(Bundle.ImageNode_createSheet_deviceId_name(),
Bundle.ImageNode_createSheet_deviceId_displayName(), Bundle.ImageNode_createSheet_deviceId_displayName(),
Bundle.ImageNode_createSheet_deviceId_desc(), Bundle.ImageNode_createSheet_deviceId_desc(),
deviceIdSet.getString("device_id"))); deviceIdSet.getString("device_id")));
@ -183,7 +183,7 @@ public class ImageNode extends AbstractContentNode<Image> {
logger.log(Level.SEVERE, "Failed to get device id for the following image: " + this.content.getId(), ex); logger.log(Level.SEVERE, "Failed to get device id for the following image: " + this.content.getId(), ex);
} }
return s; return sheet;
} }
@Override @Override

42
Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java
View File

@ -162,19 +162,19 @@ public class InterestingHits implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.desc"),
getName())); getName()));
return s; return sheet;
} }
@Override @Override
@ -302,19 +302,19 @@ public class InterestingHits implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.name"), NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.desc"),
getName())); getName()));
return s; return sheet;
} }
@Override @Override
@ -392,17 +392,17 @@ public class InterestingHits implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.name"), NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.desc"),
getName())); getName()));
return s; return sheet;
} }
@Override @Override

16
Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java
View File

@ -73,16 +73,16 @@ public class KeyValueNode extends AbstractNode {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
// table view drops first column of properties under assumption // table view drops first column of properties under assumption
// that it contains the node's name // that it contains the node's name
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "KeyValueNode.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "KeyValueNode.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "KeyValueNode.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "KeyValueNode.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "KeyValueNode.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "KeyValueNode.createSheet.name.desc"),
data.getName())); data.getName()));
@ -90,13 +90,13 @@ public class KeyValueNode extends AbstractNode {
for (Map.Entry<String, Object> entry : data.getMap().entrySet()) { for (Map.Entry<String, Object> entry : data.getMap().entrySet()) {
String key = entry.getKey(); String key = entry.getKey();
Object value = entry.getValue(); Object value = entry.getValue();
ss.put(new NodeProperty<>(key, sheetSet.put(new NodeProperty<>(key,
key, key,
NbBundle.getMessage(this.getClass(), "KeyValueNode.createSheet.map.desc"), NbBundle.getMessage(this.getClass(), "KeyValueNode.createSheet.map.desc"),
value)); value));
} }
return s; return sheet;
} }
/** /**

62
Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
View File

@ -355,20 +355,20 @@ public class KeywordHits implements AutopsyVisitableItem {
"KeywordHits.createSheet.name.displayName=Name", "KeywordHits.createSheet.name.displayName=Name",
"KeywordHits.createSheet.name.desc=no description"}) "KeywordHits.createSheet.name.desc=no description"})
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>( sheetSet.put(new NodeProperty<>(
KeywordHits_createSheet_name_name(), KeywordHits_createSheet_name_name(),
KeywordHits_createSheet_name_displayName(), KeywordHits_createSheet_name_displayName(),
KeywordHits_createSheet_name_desc(), KeywordHits_createSheet_name_desc(),
getName())); getName()));
return s; return sheet;
} }
@Override @Override
@ -547,26 +547,26 @@ public class KeywordHits implements AutopsyVisitableItem {
"KeywordHits.createSheet.numChildren.displayName=Number of Children", "KeywordHits.createSheet.numChildren.displayName=Number of Children",
"KeywordHits.createSheet.numChildren.desc=no description"}) "KeywordHits.createSheet.numChildren.desc=no description"})
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>( sheetSet.put(new NodeProperty<>(
KeywordHits_createSheet_listName_name(), KeywordHits_createSheet_listName_name(),
KeywordHits_createSheet_listName_displayName(), KeywordHits_createSheet_listName_displayName(),
KeywordHits_createSheet_listName_desc(), KeywordHits_createSheet_listName_desc(),
listName)); listName));
ss.put(new NodeProperty<>( sheetSet.put(new NodeProperty<>(
KeywordHits_createSheet_numChildren_name(), KeywordHits_createSheet_numChildren_name(),
KeywordHits_createSheet_numChildren_displayName(), KeywordHits_createSheet_numChildren_displayName(),
KeywordHits_createSheet_numChildren_desc(), KeywordHits_createSheet_numChildren_desc(),
keywordResults.getKeywords(listName).size())); keywordResults.getKeywords(listName).size()));
return s; return sheet;
} }
@Override @Override
@ -645,25 +645,25 @@ public class KeywordHits implements AutopsyVisitableItem {
"KeywordHits.createSheet.filesWithHits.displayName=Files with Hits", "KeywordHits.createSheet.filesWithHits.displayName=Files with Hits",
"KeywordHits.createSheet.filesWithHits.desc=no description"}) "KeywordHits.createSheet.filesWithHits.desc=no description"})
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>( sheetSet.put(new NodeProperty<>(
KeywordHits_createSheet_listName_name(), KeywordHits_createSheet_listName_name(),
KeywordHits_createSheet_listName_displayName(), KeywordHits_createSheet_listName_displayName(),
KeywordHits_createSheet_listName_desc(), KeywordHits_createSheet_listName_desc(),
getDisplayName())); getDisplayName()));
ss.put(new NodeProperty<>( sheetSet.put(new NodeProperty<>(
KeywordHits_createSheet_filesWithHits_name(), KeywordHits_createSheet_filesWithHits_name(),
KeywordHits_createSheet_filesWithHits_displayName(), KeywordHits_createSheet_filesWithHits_displayName(),
KeywordHits_createSheet_filesWithHits_desc(), KeywordHits_createSheet_filesWithHits_desc(),
countTotalDescendants())); countTotalDescendants()));
return s; return sheet;
} }
} }
@ -783,26 +783,26 @@ public class KeywordHits implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>( sheetSet.put(new NodeProperty<>(
KeywordHits_createSheet_listName_name(), KeywordHits_createSheet_listName_name(),
KeywordHits_createSheet_listName_displayName(), KeywordHits_createSheet_listName_displayName(),
KeywordHits_createSheet_listName_desc(), KeywordHits_createSheet_listName_desc(),
getDisplayName())); getDisplayName()));
ss.put(new NodeProperty<>( sheetSet.put(new NodeProperty<>(
KeywordHits_createSheet_filesWithHits_name(), KeywordHits_createSheet_filesWithHits_name(),
KeywordHits_createSheet_filesWithHits_displayName(), KeywordHits_createSheet_filesWithHits_displayName(),
KeywordHits_createSheet_filesWithHits_desc(), KeywordHits_createSheet_filesWithHits_desc(),
keywordResults.getArtifactIds(setName, keyword, instance).size())); keywordResults.getArtifactIds(setName, keyword, instance).size()));
return s; return sheet;
} }
} }

18
Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
View File

@ -71,30 +71,30 @@ public class LayoutFileNode extends AbstractAbstractFileNode<LayoutFile> {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
fillPropertyMap(map); fillPropertyMap(map);
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "LayoutFileNode.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "LayoutFileNode.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "LayoutFileNode.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "LayoutFileNode.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "LayoutFileNode.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "LayoutFileNode.createSheet.name.desc"),
getName())); getName()));
final String NO_DESCR = NbBundle.getMessage(this.getClass(), "LayoutFileNode.createSheet.noDescr.text"); final String NO_DESCR = NbBundle.getMessage(this.getClass(), "LayoutFileNode.createSheet.noDescr.text");
for (Map.Entry<String, Object> entry : map.entrySet()) { for (Map.Entry<String, Object> entry : map.entrySet()) {
ss.put(new NodeProperty<>(entry.getKey(), entry.getKey(), NO_DESCR, entry.getValue())); sheetSet.put(new NodeProperty<>(entry.getKey(), entry.getKey(), NO_DESCR, entry.getValue()));
} }
// add tags property to the sheet // add tags property to the sheet
addTagProperty(ss); addTagProperty(sheetSet);
return s; return sheet;
} }
@Override @Override

18
Core/src/org/sleuthkit/autopsy/datamodel/LocalDirectoryNode.java
View File

@ -48,14 +48,14 @@ public class LocalDirectoryNode extends SpecialDirectoryNode {
"LocalDirectoryNode.createSheet.name.desc=no description", "LocalDirectoryNode.createSheet.name.desc=no description",
"LocalDirectoryNode.createSheet.noDesc=no description"}) "LocalDirectoryNode.createSheet.noDesc=no description"})
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(Bundle.LocalDirectoryNode_createSheet_name_name(), sheetSet.put(new NodeProperty<>(Bundle.LocalDirectoryNode_createSheet_name_name(),
Bundle.LocalDirectoryNode_createSheet_name_displayName(), Bundle.LocalDirectoryNode_createSheet_name_displayName(),
Bundle.LocalDirectoryNode_createSheet_name_desc(), Bundle.LocalDirectoryNode_createSheet_name_desc(),
getName())); getName()));
@ -67,11 +67,11 @@ public class LocalDirectoryNode extends SpecialDirectoryNode {
final String NO_DESCR = Bundle.LocalDirectoryNode_createSheet_noDesc(); final String NO_DESCR = Bundle.LocalDirectoryNode_createSheet_noDesc();
for (Map.Entry<String, Object> entry : map.entrySet()) { for (Map.Entry<String, Object> entry : map.entrySet()) {
ss.put(new NodeProperty<>(entry.getKey(), entry.getKey(), NO_DESCR, entry.getValue())); sheetSet.put(new NodeProperty<>(entry.getKey(), entry.getKey(), NO_DESCR, entry.getValue()));
} }
addTagProperty(ss); addTagProperty(sheetSet);
return s; return sheet;
} }
@Override @Override

18
Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java
View File

@ -67,30 +67,30 @@ public class LocalFileNode extends AbstractAbstractFileNode<AbstractFile> {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
fillPropertyMap(map, getContent()); fillPropertyMap(map, getContent());
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "LocalFileNode.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "LocalFileNode.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "LocalFileNode.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "LocalFileNode.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "LocalFileNode.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "LocalFileNode.createSheet.name.desc"),
getName())); getName()));
final String NO_DESCR = NbBundle.getMessage(this.getClass(), "LocalFileNode.createSheet.noDescr.text"); final String NO_DESCR = NbBundle.getMessage(this.getClass(), "LocalFileNode.createSheet.noDescr.text");
for (Map.Entry<String, Object> entry : map.entrySet()) { for (Map.Entry<String, Object> entry : map.entrySet()) {
ss.put(new NodeProperty<>(entry.getKey(), entry.getKey(), NO_DESCR, entry.getValue())); sheetSet.put(new NodeProperty<>(entry.getKey(), entry.getKey(), NO_DESCR, entry.getValue()));
} }
// add tags property to the sheet // add tags property to the sheet
addTagProperty(ss); addTagProperty(sheetSet);
return s; return sheet;
} }
@Override @Override

14
Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterNode.java
View File

@ -62,20 +62,20 @@ public class RecentFilesFilterNode extends DisplayableItemNode {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>( sheetSet.put(new NodeProperty<>(
NbBundle.getMessage(this.getClass(), "RecentFilesFilterNode.createSheet.filterType.name"), NbBundle.getMessage(this.getClass(), "RecentFilesFilterNode.createSheet.filterType.name"),
NbBundle.getMessage(this.getClass(), "RecentFilesFilterNode.createSheet.filterType.displayName"), NbBundle.getMessage(this.getClass(), "RecentFilesFilterNode.createSheet.filterType.displayName"),
NbBundle.getMessage(this.getClass(), "RecentFilesFilterNode.createSheet.filterType.desc"), NbBundle.getMessage(this.getClass(), "RecentFilesFilterNode.createSheet.filterType.desc"),
filter.getDisplayName())); filter.getDisplayName()));
return s; return sheet;
} }
@Override @Override

14
Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesNode.java
View File

@ -52,18 +52,18 @@ public class RecentFilesNode extends DisplayableItemNode {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "RecentFilesNode.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "RecentFilesNode.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "RecentFilesNode.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "RecentFilesNode.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "RecentFilesNode.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "RecentFilesNode.createSheet.name.desc"),
NAME)); NAME));
return s; return sheet;
} }
@Override @Override

14
Core/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java
View File

@ -65,19 +65,19 @@ public class ResultsNode extends DisplayableItemNode {
"ResultsNode.createSheet.name.displayName=Name", "ResultsNode.createSheet.name.displayName=Name",
"ResultsNode.createSheet.name.desc=no description"}) "ResultsNode.createSheet.name.desc=no description"})
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(Bundle.ResultsNode_createSheet_name_name(), sheetSet.put(new NodeProperty<>(Bundle.ResultsNode_createSheet_name_name(),
Bundle.ResultsNode_createSheet_name_displayName(), Bundle.ResultsNode_createSheet_name_displayName(),
Bundle.ResultsNode_createSheet_name_desc(), Bundle.ResultsNode_createSheet_name_desc(),
NAME NAME
)); ));
return s; return sheet;
} }
@Override @Override

14
Core/src/org/sleuthkit/autopsy/datamodel/ViewsNode.java
View File

@ -59,18 +59,18 @@ public class ViewsNode extends DisplayableItemNode {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ViewsNode.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ViewsNode.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "ViewsNode.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "ViewsNode.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "ViewsNode.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "ViewsNode.createSheet.name.desc"),
NAME)); NAME));
return s; return sheet;
} }
@Override @Override

26
Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
View File

@ -75,14 +75,14 @@ public class VirtualDirectoryNode extends SpecialDirectoryNode {
"VirtualDirectoryNode.createSheet.deviceId.displayName=Device ID", "VirtualDirectoryNode.createSheet.deviceId.displayName=Device ID",
"VirtualDirectoryNode.createSheet.deviceId.desc=Device ID of the image"}) "VirtualDirectoryNode.createSheet.deviceId.desc=Device ID of the image"})
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VirtualDirectoryNode.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VirtualDirectoryNode.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), NbBundle.getMessage(this.getClass(),
"VirtualDirectoryNode.createSheet.name.displayName"), "VirtualDirectoryNode.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "VirtualDirectoryNode.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "VirtualDirectoryNode.createSheet.name.desc"),
@ -94,22 +94,22 @@ public class VirtualDirectoryNode extends SpecialDirectoryNode {
final String NO_DESCR = NbBundle.getMessage(this.getClass(), "VirtualDirectoryNode.createSheet.noDesc"); final String NO_DESCR = NbBundle.getMessage(this.getClass(), "VirtualDirectoryNode.createSheet.noDesc");
for (Map.Entry<String, Object> entry : map.entrySet()) { for (Map.Entry<String, Object> entry : map.entrySet()) {
ss.put(new NodeProperty<>(entry.getKey(), entry.getKey(), NO_DESCR, entry.getValue())); sheetSet.put(new NodeProperty<>(entry.getKey(), entry.getKey(), NO_DESCR, entry.getValue()));
} }
addTagProperty(ss); addTagProperty(sheetSet);
} else { } else {
ss.put(new NodeProperty<>(Bundle.VirtualDirectoryNode_createSheet_type_name(), sheetSet.put(new NodeProperty<>(Bundle.VirtualDirectoryNode_createSheet_type_name(),
Bundle.VirtualDirectoryNode_createSheet_type_displayName(), Bundle.VirtualDirectoryNode_createSheet_type_displayName(),
Bundle.VirtualDirectoryNode_createSheet_type_desc(), Bundle.VirtualDirectoryNode_createSheet_type_desc(),
Bundle.VirtualDirectoryNode_createSheet_type_text())); Bundle.VirtualDirectoryNode_createSheet_type_text()));
ss.put(new NodeProperty<>(Bundle.VirtualDirectoryNode_createSheet_size_name(), sheetSet.put(new NodeProperty<>(Bundle.VirtualDirectoryNode_createSheet_size_name(),
Bundle.VirtualDirectoryNode_createSheet_size_displayName(), Bundle.VirtualDirectoryNode_createSheet_size_displayName(),
Bundle.VirtualDirectoryNode_createSheet_size_desc(), Bundle.VirtualDirectoryNode_createSheet_size_desc(),
this.content.getSize())); this.content.getSize()));
try (SleuthkitCase.CaseDbQuery query = Case.getOpenCase().getSleuthkitCase().executeQuery("SELECT time_zone FROM data_source_info WHERE obj_id = " + this.content.getId())) { try (SleuthkitCase.CaseDbQuery query = Case.getOpenCase().getSleuthkitCase().executeQuery("SELECT time_zone FROM data_source_info WHERE obj_id = " + this.content.getId())) {
ResultSet timeZoneSet = query.getResultSet(); ResultSet timeZoneSet = query.getResultSet();
if (timeZoneSet.next()) { if (timeZoneSet.next()) {
ss.put(new NodeProperty<>(Bundle.VirtualDirectoryNode_createSheet_timezone_name(), sheetSet.put(new NodeProperty<>(Bundle.VirtualDirectoryNode_createSheet_timezone_name(),
Bundle.VirtualDirectoryNode_createSheet_timezone_displayName(), Bundle.VirtualDirectoryNode_createSheet_timezone_displayName(),
Bundle.VirtualDirectoryNode_createSheet_timezone_desc(), Bundle.VirtualDirectoryNode_createSheet_timezone_desc(),
timeZoneSet.getString("time_zone"))); timeZoneSet.getString("time_zone")));
@ -120,7 +120,7 @@ public class VirtualDirectoryNode extends SpecialDirectoryNode {
try (SleuthkitCase.CaseDbQuery query = Case.getOpenCase().getSleuthkitCase().executeQuery("SELECT device_id FROM data_source_info WHERE obj_id = " + this.content.getId());) { try (SleuthkitCase.CaseDbQuery query = Case.getOpenCase().getSleuthkitCase().executeQuery("SELECT device_id FROM data_source_info WHERE obj_id = " + this.content.getId());) {
ResultSet deviceIdSet = query.getResultSet(); ResultSet deviceIdSet = query.getResultSet();
if (deviceIdSet.next()) { if (deviceIdSet.next()) {
ss.put(new NodeProperty<>(Bundle.VirtualDirectoryNode_createSheet_deviceId_name(), sheetSet.put(new NodeProperty<>(Bundle.VirtualDirectoryNode_createSheet_deviceId_name(),
Bundle.VirtualDirectoryNode_createSheet_deviceId_displayName(), Bundle.VirtualDirectoryNode_createSheet_deviceId_displayName(),
Bundle.VirtualDirectoryNode_createSheet_deviceId_desc(), Bundle.VirtualDirectoryNode_createSheet_deviceId_desc(),
deviceIdSet.getString("device_id"))); deviceIdSet.getString("device_id")));
@ -131,7 +131,7 @@ public class VirtualDirectoryNode extends SpecialDirectoryNode {
} }
return s; return sheet;
} }
@Override @Override

24
Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java
View File

@ -150,39 +150,39 @@ public class VolumeNode extends AbstractContentNode<Volume> {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.name.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.name.name"),
NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.name.displayName"),
NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.name.desc"), NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.name.desc"),
this.getDisplayName())); this.getDisplayName()));
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.id.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.id.name"),
NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.id.displayName"), NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.id.displayName"),
NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.id.desc"), NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.id.desc"),
content.getAddr())); content.getAddr()));
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.startSector.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.startSector.name"),
NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.startSector.displayName"), NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.startSector.displayName"),
NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.startSector.desc"), NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.startSector.desc"),
content.getStart())); content.getStart()));
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.lenSectors.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.lenSectors.name"),
NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.lenSectors.displayName"), NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.lenSectors.displayName"),
NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.lenSectors.desc"), NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.lenSectors.desc"),
content.getLength())); content.getLength()));
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.description.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.description.name"),
NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.description.displayName"), NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.description.displayName"),
NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.description.desc"), NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.description.desc"),
content.getDescription())); content.getDescription()));
ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.flags.name"), sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.flags.name"),
NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.flags.displayName"), NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.flags.displayName"),
NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.flags.desc"), NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.flags.desc"),
content.getFlagsAsString())); content.getFlagsAsString()));
return s; return sheet;
} }
@Override @Override

12
Core/src/org/sleuthkit/autopsy/datamodel/accounts/Accounts.java
View File

@ -1403,13 +1403,13 @@ final public class Accounts implements AutopsyVisitableItem {
return getClass().getName(); return getClass().getName();
} }
private Sheet.Set getPropertySet(Sheet s) { private Sheet.Set getPropertySet(Sheet sheet) {
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
if (ss == null) { if (sheetSet == null) {
ss = Sheet.createPropertiesSet(); sheetSet = Sheet.createPropertiesSet();
s.put(ss); sheet.put(sheetSet);
} }
return ss; return sheetSet;
} }
@Override @Override

8
Core/src/org/sleuthkit/autopsy/timeline/explorernodes/EventNode.java
View File

@ -82,11 +82,11 @@ public class EventNode extends DisplayableItemNode {
"NodeProperty.displayName.known=Known", "NodeProperty.displayName.known=Known",
"NodeProperty.displayName.dateTime=Date/Time"}) "NodeProperty.displayName.dateTime=Date/Time"})
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet s = super.createSheet(); Sheet sheet = super.createSheet();
Sheet.Set properties = s.get(Sheet.PROPERTIES); Sheet.Set properties = sheet.get(Sheet.PROPERTIES);
if (properties == null) { if (properties == null) {
properties = Sheet.createPropertiesSet(); properties = Sheet.createPropertiesSet();
s.put(properties); sheet.put(properties);
} }
properties.put(new NodeProperty<>("icon", Bundle.NodeProperty_displayName_icon(), "icon", true)); // NON-NLS //gets overridden with icon properties.put(new NodeProperty<>("icon", Bundle.NodeProperty_displayName_icon(), "icon", true)); // NON-NLS //gets overridden with icon
@ -96,7 +96,7 @@ public class EventNode extends DisplayableItemNode {
properties.put(new NodeProperty<>("eventSubType", Bundle.NodeProperty_displayName_subType(), "sub type", event.getEventType().getDisplayName())); // NON-NLS properties.put(new NodeProperty<>("eventSubType", Bundle.NodeProperty_displayName_subType(), "sub type", event.getEventType().getDisplayName())); // NON-NLS
properties.put(new NodeProperty<>("Known", Bundle.NodeProperty_displayName_known(), "known", event.getKnown().toString())); // NON-NLS properties.put(new NodeProperty<>("Known", Bundle.NodeProperty_displayName_known(), "known", event.getKnown().toString())); // NON-NLS
return s; return sheet;
} }
/** /**