From 11289f3ca11ec48b4fa992a178f062f5684afa4c Mon Sep 17 00:00:00 2001 From: Brian Sweeney Date: Tue, 10 Apr 2018 08:38:57 -0600 Subject: [PATCH] tabs have meaningful titles --- .../commonfilesearch/CommonFilesPanel.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java index 28fa3fda36..864fcaf993 100644 --- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java +++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java @@ -167,9 +167,10 @@ public final class CommonFilesPanel extends javax.swing.JPanel { } }.execute(); } - + @NbBundle.Messages({ - "CommonFilesPanel.search.results.title=Common Files", + "CommonFilesPanel.search.results.titleAll=Common Files (All Data Sources)", + "CommonFilesPanel.search.results.titleSingle=Common Files (Match Within Data Source: %s)", "CommonFilesPanel.search.results.pathText=Common Files Search Results", "CommonFilesPanel.search.done.tskCoreException=Unable to run query against DB.", "CommonFilesPanel.search.done.noCurrentCaseException=Unable to open case file.", @@ -178,11 +179,12 @@ public final class CommonFilesPanel extends javax.swing.JPanel { "CommonFilesPanel.search.done.sqlException=Unable to query db for files or data sources."}) private void search() { - String title = Bundle.CommonFilesPanel_search_results_title(); String pathText = Bundle.CommonFilesPanel_search_results_pathText(); new SwingWorker, Void>() { + private String tabTitle; + private Long determineDataSourceId() { Long selectedObjId = CommonFilesPanel.NO_DATA_SOURCE_SELECTED; if (CommonFilesPanel.this.singleDataSource) { @@ -205,8 +207,15 @@ public final class CommonFilesPanel extends javax.swing.JPanel { if (dataSourceId == CommonFilesPanel.NO_DATA_SOURCE_SELECTED) { builder = new AllDataSources(dataSourceMap); + + this.tabTitle = Bundle.CommonFilesPanel_search_results_titleAll(); } else { builder = new SingleDataSource(dataSourceId, dataSourceMap); + + final String CommonFilesPanel_search_results_titleSingle = Bundle.CommonFilesPanel_search_results_titleSingle(); + final Object[] dataSourceName = new Object[]{dataSourceMap.get(dataSourceId)}; + + this.tabTitle = String.format(CommonFilesPanel_search_results_titleSingle, dataSourceName); } return builder.collateFiles(); @@ -219,7 +228,7 @@ public final class CommonFilesPanel extends javax.swing.JPanel { List metadata = get(); - DataResultTopComponent component = DataResultTopComponent.createInstance(title); + DataResultTopComponent component = DataResultTopComponent.createInstance(this.tabTitle); CommonFilesSearchNode commonFilesNode = new CommonFilesSearchNode(metadata);