Merge branch 'develop' of github.com:sleuthkit/autopsy into eam

This commit is contained in:
Nick Davis 2017-06-12 11:00:25 -04:00
commit 2b1c2e79e8
2 changed files with 3 additions and 2 deletions

View File

@ -17,4 +17,3 @@ Metadata.toolTip=Displays metadata about the file.
Metadata.nodeText.nonFilePassedIn=Non-file passed in Metadata.nodeText.nonFilePassedIn=Non-file passed in
Metadata.nodeText.text=From The Sleuth Kit istat Tool\: Metadata.nodeText.text=From The Sleuth Kit istat Tool\:
Metadata.nodeText.exceptionNotice.text=Error getting file metadata\: Metadata.nodeText.exceptionNotice.text=Error getting file metadata\:
Metadata.nodeText.truncated=(results truncated)

View File

@ -119,7 +119,9 @@ public class Metadata extends javax.swing.JPanel implements DataContentViewer {
sb.append("</td></tr>"); //NON-NLS sb.append("</td></tr>"); //NON-NLS
} }
@Messages({"Metadata.tableRowTitle.mimeType=MIME Type"}) @Messages({
"Metadata.tableRowTitle.mimeType=MIME Type",
"Metadata.nodeText.truncated=(results truncated)"})
@Override @Override
public void setNode(Node node) { public void setNode(Node node) {
AbstractFile file = node.getLookup().lookup(AbstractFile.class); AbstractFile file = node.getLookup().lookup(AbstractFile.class);