#1314 user interface

This commit is contained in:
honfika@gmail.com
2016-12-03 13:06:55 +01:00
parent 75066a0faf
commit 820ef1a5f1
8 changed files with 28 additions and 20 deletions

View File

@@ -1701,16 +1701,19 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
boolean ignoreCase = searchDialog.ignoreCaseCheckBox.isSelected();
boolean regexp = searchDialog.regexpCheckBox.isSelected();
if (searchDialog.searchInASRadioButton.isSelected()) {
boolean scriptSearch = searchDialog.searchInASRadioButton.isSelected()
|| searchDialog.searchInPCodeRadioButton.isSelected();
if (scriptSearch) {
boolean pCodeSearch = searchDialog.searchInPCodeRadioButton.isSelected();
new CancellableWorker<Void>() {
@Override
protected Void doInBackground() throws Exception {
List<ABCPanelSearchResult> abcResult = null;
List<ActionSearchResult> actionResult = null;
if (swf.isAS3()) {
abcResult = getABCPanel().search(swf, txt, ignoreCase, regexp, this);
abcResult = getABCPanel().search(swf, txt, ignoreCase, regexp, pCodeSearch, this);
} else {
actionResult = getActionPanel().search(swf, txt, ignoreCase, regexp, this);
actionResult = getActionPanel().search(swf, txt, ignoreCase, regexp, pCodeSearch, this);
}
List<ABCPanelSearchResult> fAbcResult = abcResult;