LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-30 16:27:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proper removing search results on SWF close

Browse Source
This commit is contained in:
Jindra Petřík
2021-02-23 22:50:48 +01:00
parent 43baf9d178
commit d6cf6a2c8b
9 changed files with 70 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/jpexs/decompiler/flash/gui/MainPanel.java
View File

@@ -333,7 +333,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
public TreeItem oldItem;
public Map<SWF, List<SearchResultsDialog>> searchResultsDialogs = new HashMap<>();
public List<SearchResultsDialog> searchResultsDialogs = new ArrayList<>();
private static final Logger logger = Logger.getLogger(MainPanel.class.getName());
@@ -937,10 +937,8 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
List<SWFList> swfsLists = new ArrayList<>(swfs);
for (SWF swf : searchResultsDialogs.keySet()) {
for (SearchResultsDialog sr : searchResultsDialogs.get(swf)) {
sr.setVisible(false);
}
for (SearchResultsDialog sr : searchResultsDialogs) {
sr.setVisible(false);
}
searchResultsDialogs.clear();
@@ -976,12 +974,21 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
}
}
List<SWF> swfsToClose = new ArrayList<>();
swfsToClose.addAll(swfList);
for (SWF swf : swfList) {
if (searchResultsDialogs.containsKey(swf)) {
for (SearchResultsDialog sr : searchResultsDialogs.get(swf)) {
sr.setVisible(false);
}
searchResultsDialogs.remove(swf);
populateSwfs(swf, swfsToClose);
}
for (int i = 0; i < searchResultsDialogs.size(); i++) {
SearchResultsDialog sr = searchResultsDialogs.get(i);
for (SWF swf : swfsToClose) {
sr.removeSwf(swf);
}
if (sr.isEmpty()) {
sr.setVisible(false);
searchResultsDialogs.remove(i);
i--;
}
}
@@ -1935,13 +1942,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
SearchResultsDialog<ScriptSearchResult> sr = new SearchResultsDialog<>(getMainFrame().getWindow(), txt, ignoreCase, regexp, listeners);
sr.setResults(fResult);
sr.setVisible(true);
if (swfsUsed.size() == 1) {
SWF usedSwf = swfsUsed.iterator().next();
if (!searchResultsDialogs.containsKey(usedSwf)) {
searchResultsDialogs.put(usedSwf, new ArrayList<>());
}
searchResultsDialogs.get(usedSwf).add(sr);
}
searchResultsDialogs.add(sr);
if (!found) {
View.showMessageDialog(null, translate("message.search.notfound").replace("%searchtext%", txt), translate("message.search.notfound.title"), JOptionPane.INFORMATION_MESSAGE);
}