diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ac063150..d6cab5e45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,7 +44,7 @@ All notable changes to this project will be documented in this file. - Exe export mode can be selected in in Save EXE dialog (select filetype) - wrapper or projectors - Optimized (faster) context menu for large SWF trees - Optimized (faster) deleting items for large SWF trees -- AS debugger - DontDelete variable flag (0x2) +- AS debugger - More varible flags ### Fixed - Debugger - getting children of top level variables diff --git a/lib/flashdebugger.jar b/lib/flashdebugger.jar index 20b39957b..6dc8fe220 100644 Binary files a/lib/flashdebugger.jar and b/lib/flashdebugger.jar differ diff --git a/src/com/jpexs/decompiler/flash/gui/DebugPanel.java b/src/com/jpexs/decompiler/flash/gui/DebugPanel.java index 03e6b07ca..525bddeac 100644 --- a/src/com/jpexs/decompiler/flash/gui/DebugPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/DebugPanel.java @@ -17,18 +17,12 @@ package com.jpexs.decompiler.flash.gui; import com.jpexs.debugger.flash.Variable; -import com.jpexs.debugger.flash.messages.in.InBreakAtExt; import com.jpexs.debugger.flash.messages.in.InConstantPool; import com.jpexs.debugger.flash.messages.in.InFrame; -import com.jpexs.debugger.flash.messages.in.InGetVariable; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.configuration.Configuration; import com.jpexs.decompiler.flash.gui.DebuggerHandler.BreakListener; import com.jpexs.decompiler.flash.gui.abc.ABCPanel; -import com.jpexs.decompiler.flash.gui.debugger.DebugAdapter; -import com.jpexs.decompiler.flash.gui.debugger.DebugListener; -import com.jpexs.decompiler.flash.gui.debugger.Debugger; -import com.jpexs.decompiler.flash.gui.debugger.DebuggerTools; import com.jpexs.helpers.Helper; import de.hameister.treetable.MyTreeTable; import de.hameister.treetable.MyTreeTableModel; @@ -40,7 +34,6 @@ import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java index 6e822f91b..773662e05 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java @@ -583,13 +583,8 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener 0) { + flagsStr.add("onlySWF6Up"); + } + + if ((flags & VariableFlags.IGNORE_SWF6) > 0) { + flagsStr.add("ignoreSWF6"); + } + + if ((flags & VariableFlags.ONLY_SWF7_UP) > 0) { + flagsStr.add("onlySWF7Up"); + } + + if ((flags & VariableFlags.ONLY_SWF8_UP) > 0) { + flagsStr.add("onlySWF8Up"); + } + + if ((flags & VariableFlags.ONLY_SWF9_UP) > 0) { + flagsStr.add("onlySWF9Up"); + } + for (Integer f : unknownFlags) { if ((flags & f) > 0) { flagsStr.add("unk" + f);