From 3f09687b46bdbdfa2fa7664bad435d3fec6dbdc4 Mon Sep 17 00:00:00 2001 From: adam-m Date: Tue, 22 Jan 2013 21:13:24 -0500 Subject: [PATCH] make result window titles unique --- .../org/sleuthkit/autopsy/filesearch/FileSearchPanel.java | 5 +++-- .../autopsy/keywordsearch/KeywordSearchQueryManager.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java index d68eb7bab4..1d0035acfb 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java +++ b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java @@ -65,6 +65,7 @@ public class FileSearchPanel extends javax.swing.JPanel { private JButton searchButton; private PropertyChangeListener listener; private static ArrayList searchResults = new ArrayList(); + private static int resultWindowCount = 0; //keep track of result windows so they get unique names /** Creates new form FileSearchPanel */ public FileSearchPanel() { @@ -158,7 +159,7 @@ public class FileSearchPanel extends javax.swing.JPanel { this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); try { if (this.anyFiltersEnabled()) { - String title = "File Search Results"; + String title = "File Search Results " + (++resultWindowCount); String pathText = "Filename Search Results:"; // try to get the number of matches first @@ -182,7 +183,7 @@ public class FileSearchPanel extends javax.swing.JPanel { logger.log(Level.WARNING, "Error while trying to get the number of matches.", ex); } - TopComponent searchResultWin = DataResultTopComponent.createInstance(title, pathText, new TableFilterNode(new SearchNode(fsContentList), true), totalMatches); + final TopComponent searchResultWin = DataResultTopComponent.createInstance(title, pathText, new TableFilterNode(new SearchNode(fsContentList), true), totalMatches); searchResultWin.requestActive(); // make it the active top component diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java index 6a9f94cd4b..3238528b7f 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java @@ -47,6 +47,7 @@ public class KeywordSearchQueryManager { private Presentation presentation; private List queryDelegates; private QueryType queryType; + private static int resultWindowCount = 0; //keep track of unique window ids to display private static Logger logger = Logger.getLogger(KeywordSearchQueryManager.class.getName()); public KeywordSearchQueryManager(List queries, Presentation presentation) { @@ -129,7 +130,7 @@ public class KeywordSearchQueryManager { } final String pathText = "Keyword search"; - TopComponent searchResultWin = DataResultTopComponent.createInstance("Keyword search", pathText, rootNode, things.size()); + TopComponent searchResultWin = DataResultTopComponent.createInstance("Keyword search " + (++resultWindowCount), pathText, rootNode, things.size()); searchResultWin.requestActive(); // } }