tabs have meaningful titles

This commit is contained in:
Brian Sweeney 2018-04-10 08:38:57 -06:00
parent a01585d7c4
commit 11289f3ca1

View File

@ -167,9 +167,10 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
} }
}.execute(); }.execute();
} }
@NbBundle.Messages({ @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.results.pathText=Common Files Search Results",
"CommonFilesPanel.search.done.tskCoreException=Unable to run query against DB.", "CommonFilesPanel.search.done.tskCoreException=Unable to run query against DB.",
"CommonFilesPanel.search.done.noCurrentCaseException=Unable to open case file.", "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."}) "CommonFilesPanel.search.done.sqlException=Unable to query db for files or data sources."})
private void search() { private void search() {
String title = Bundle.CommonFilesPanel_search_results_title();
String pathText = Bundle.CommonFilesPanel_search_results_pathText(); String pathText = Bundle.CommonFilesPanel_search_results_pathText();
new SwingWorker<List<CommonFilesMetaData>, Void>() { new SwingWorker<List<CommonFilesMetaData>, Void>() {
private String tabTitle;
private Long determineDataSourceId() { private Long determineDataSourceId() {
Long selectedObjId = CommonFilesPanel.NO_DATA_SOURCE_SELECTED; Long selectedObjId = CommonFilesPanel.NO_DATA_SOURCE_SELECTED;
if (CommonFilesPanel.this.singleDataSource) { if (CommonFilesPanel.this.singleDataSource) {
@ -205,8 +207,15 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
if (dataSourceId == CommonFilesPanel.NO_DATA_SOURCE_SELECTED) { if (dataSourceId == CommonFilesPanel.NO_DATA_SOURCE_SELECTED) {
builder = new AllDataSources(dataSourceMap); builder = new AllDataSources(dataSourceMap);
this.tabTitle = Bundle.CommonFilesPanel_search_results_titleAll();
} else { } else {
builder = new SingleDataSource(dataSourceId, dataSourceMap); 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(); return builder.collateFiles();
@ -219,7 +228,7 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
List<CommonFilesMetaData> metadata = get(); List<CommonFilesMetaData> metadata = get();
DataResultTopComponent component = DataResultTopComponent.createInstance(title); DataResultTopComponent component = DataResultTopComponent.createInstance(this.tabTitle);
CommonFilesSearchNode commonFilesNode = new CommonFilesSearchNode(metadata); CommonFilesSearchNode commonFilesNode = new CommonFilesSearchNode(metadata);