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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Richard Cordovano 2013-12-04 15:37:27 -05:00
commit dd9cae8c5b
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java
View File

@ -157,7 +157,7 @@ public class Metadata extends javax.swing.JPanel implements DataContentViewer
@Override @Override
public String getToolTip() { public String getToolTip() {
return ""; return "Displays metadata about the file.";
} }
@Override @Override

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

@ -33,6 +33,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
import org.sleuthkit.datamodel.BlackboardAttribute; import org.sleuthkit.datamodel.BlackboardAttribute;
import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE; import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE;
import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.Image;
import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.datamodel.TskException; import org.sleuthkit.datamodel.TskException;
@ -140,7 +141,12 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
} else { } else {
String dataSource = ""; String dataSource = "";
try { try {
dataSource = associated.getImage().getName(); Image image = associated.getImage();
if (image != null) {
dataSource = image.getName();
} else {
dataSource = getRootParentName();
}
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
logger.log(Level.WARNING, "Failed to get image name from " + associated.getName()); logger.log(Level.WARNING, "Failed to get image name from " + associated.getName());
} }
@ -153,6 +159,20 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
return s; return s;
} }
private String getRootParentName() {
String parentName = associated.getName();
Content parent = associated;
try {
while ((parent = parent.getParent()) != null) {
parentName = parent.getName();
}
} catch (TskCoreException ex) {
logger.log(Level.WARNING, "Failed to get parent name from " + associated.getName());
return "";
}
return parentName;
}
/** /**
* Add an additional custom node property to that node before it is * Add an additional custom node property to that node before it is

2
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java
View File

@ -432,7 +432,7 @@ public class ExtractedContentViewer implements DataContentViewer {
} }
} }
if (msg == null) { if (msg == null) {
msg = "<p style='font-style:italic'>" + name + "does not have text in the index.<br/>It may have no text, not been analyzed yet, or keyword search was not enabled during ingest.</p>"; msg = "<p style='font-style:italic'>" + name + " does not have text in the index.<br/>It may have no text, not been analyzed yet, or keyword search was not enabled during ingest.</p>";
} }
String htmlMsg = "<span style='font-style:italic'>" + msg + "</span>"; String htmlMsg = "<span style='font-style:italic'>" + msg + "</span>";
return htmlMsg; return htmlMsg;