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

do not create bb attributes with empty comments if comment not set

Browse Source
This commit is contained in:
adam-m 2013-01-17 19:01:07 -05:00
parent f442847c84
commit bd6d89c786
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,8 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
} else {
switch (attribute.getValueType()) {
case STRING:
map.put(attribute.getAttributeTypeDisplayName(), attribute.getValueString());
String valString = attribute.getValueString();
map.put(attribute.getAttributeTypeDisplayName(), valString == null ? "":valString);
break;
case INTEGER:
map.put(attribute.getAttributeTypeDisplayName(), attribute.getValueInt());

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

@ -63,6 +63,8 @@ public class Tags implements AutopsyVisitableItem {
public static final String NAME = "Tags";
private static final String TAG_ICON_PATH = "org/sleuthkit/autopsy/images/tag-folder-blue-icon-16.png";
private Map<BlackboardArtifact.ARTIFACT_TYPE, Map<String, List<BlackboardArtifact>>> tags;
private static final String EMPTY_COMMENT = "No Comment";
Tags(SleuthkitCase skCase) {
this.skCase = skCase;
@ -383,7 +385,7 @@ public class Tags implements AutopsyVisitableItem {
*
* @param file to create tag for
* @param tagName TSK_TAG_NAME
* @param comment the tag comment
* @param comment the tag comment, or null if not present
*/
public static void createTag(AbstractFile file, String tagName, String comment) {
try {
@ -393,10 +395,13 @@ public class Tags implements AutopsyVisitableItem {
BlackboardAttribute attr1 = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_TAG_NAME.getTypeID(),
"", tagName);
BlackboardAttribute attr2 = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT.getTypeID(),
"", comment);
attrs.add(attr1);
attrs.add(attr2);
if (comment != null && ! comment.isEmpty()) {
BlackboardAttribute attr2 = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT.getTypeID(),
"", comment);
attrs.add(attr2);
}
bookArt.addAttributes(attrs);
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Failed to create tag for " + file.getName());
@ -408,7 +413,7 @@ public class Tags implements AutopsyVisitableItem {
*
* @param artifact to create tag for
* @param tagName TSK_TAG_NAME
* @param comment the tag comment
* @param comment the tag comment or null if not present
*/
public static void createTag(BlackboardArtifact artifact, String tagName, String comment) {
try {
@ -422,12 +427,17 @@ public class Tags implements AutopsyVisitableItem {
BlackboardAttribute attr1 = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_TAG_NAME.getTypeID(),
"", tagName);
BlackboardAttribute attr2 = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT.getTypeID(),
if (comment != null && ! comment.isEmpty()) {
BlackboardAttribute attr2 = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT.getTypeID(),
"", comment);
attrs.add(attr2);
}
BlackboardAttribute attr3 = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_TAGGED_ARTIFACT.getTypeID(),
"", artifact.getArtifactID());
attrs.add(attr1);
attrs.add(attr2);
attrs.add(attr3);
bookArt.addAttributes(attrs);
} catch (TskCoreException ex) {
@ -550,7 +560,7 @@ public class Tags implements AutopsyVisitableItem {
logger.log(Level.SEVERE, "Failed to get artifact " + tagArtifactId + " from case.");
}
return null;
return EMPTY_COMMENT;
}
/**

1
Core/src/org/sleuthkit/autopsy/directorytree/TagDialog.form
View File

@ -3,6 +3,7 @@
<Form version="1.5" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
<SyntheticProperty name="generateCenter" type="boolean" value="false"/>
</SyntheticProperties>
<Events>
<EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="closeDialog"/>

6
Core/src/org/sleuthkit/autopsy/directorytree/TagDialog.java
View File

@ -236,11 +236,7 @@ public class TagDialog extends javax.swing.JDialog {
}
String getComment() {
String comment = commentText.getText();
if (comment == null || comment.isEmpty()) {
return "No Comment";
}
return comment;
return commentText.getText();
}
TagDialogResult getResult() {