LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 05:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

set decompiled AS2 script without a worker when it is found in the cache

Browse Source
This commit is contained in:
[email protected]
2016-03-12 13:58:18 +01:00
parent 28d0e03b34
commit c48356fc08
2 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
+32 -13
View File
@@ -425,36 +425,55 @@ public class ActionPanel extends JPanel implements SearchListener<ActionSearchRe
setSourceWorker = null;
}
clearSource();
this.src = src;
final ASMSource asm = (ASMSource) src;
if (!useCache) {
SWF.uncache(asm);
}
boolean decompile = Configuration.decompile.get();
if (!decompile) {
lastDecompiled = Helper.getDecompilationSkippedComment();
setDecompiledText(asm.getScriptName(), lastDecompiled);
} else {
CachedScript sc = SWF.getFromCache(asm);
if (sc != null) {
decompile = false;
decompiledHilights = sc.hilights;
methodHighlights = sc.methodHilights;
classHighlights = sc.classHilights;
specialHighlights = sc.specialHilights;
lastDecompiled = sc.text;
lastASM = asm;
setDecompiledText(lastASM.getScriptName(), lastDecompiled);
}
}
if (!decompile) {
setDecompiledEditMode(false);
}
final boolean decompileNeeded = decompile;
CancellableWorker worker = new CancellableWorker() {
@Override
protected Void doInBackground() throws Exception {
setEditorText(asm.getScriptName(), "; " + AppStrings.translate("work.disassembling") + "...", "text/flasm");
if (Configuration.decompile.get()) {
if (decompileNeeded) {
setDecompiledText("-", "// " + AppStrings.translate("work.waitingfordissasembly") + "...");
} else {
lastDecompiled = Helper.getDecompilationSkippedComment();
setDecompiledText(asm.getScriptName(), lastDecompiled);
}
DisassemblyListener listener = getDisassemblyListener();
asm.addDisassemblyListener(listener);
ActionList actions = asm.getActions();
lastCode = actions;
asm.removeDisassemblyListener(listener);
srcWithHex = null;
srcNoHex = null;
srcHexOnly = null;
srcConstants = null;
setHex(getExportMode(), asm.getScriptName());
if (Configuration.decompile.get()) {
if (decompileNeeded) {
setDecompiledText("-", "// " + AppStrings.translate("work.decompiling") + "...");
if (!useCache) {
SWF.uncache(asm);
}
CachedScript sc = SWF.getCached(asm, actions);
decompiledHilights = sc.hilights;
@@ -464,9 +483,9 @@ public class ActionPanel extends JPanel implements SearchListener<ActionSearchRe
lastDecompiled = sc.text;
lastASM = asm;
setDecompiledText(lastASM.getScriptName(), lastDecompiled);
setDecompiledEditMode(false);
}
setEditMode(false);
setDecompiledEditMode(false);
return null;
}