From ff30174764595ec556377412d411c94595dae1a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Mon, 23 Nov 2015 16:05:44 +0100 Subject: [PATCH 1/2] debugger wide lines fix --- .../decompiler/flash/gui/DebuggerHandler.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java b/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java index efbe2c6b0..4cc5a9531 100644 --- a/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java +++ b/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java @@ -361,7 +361,7 @@ public class DebuggerHandler implements DebugConnectionListener { } private static void enlog(Class cls) { - Level level = Level.INFO; + Level level = Level.FINEST; Logger mylog = Logger.getLogger(cls.getName()); mylog.setLevel(level); @@ -398,8 +398,8 @@ public class DebuggerHandler implements DebugConnectionListener { Main.getMainFrame().getPanel().updateMenu(); - //enlog(DebuggerConnection.class); - //enlog(DebuggerCommands.class); + enlog(DebuggerConnection.class); + enlog(DebuggerCommands.class); enlog(DebuggerHandler.class); try { con.getMessage(InVersion.class); @@ -433,7 +433,7 @@ public class DebuggerHandler implements DebugConnectionListener { modulePaths = new HashMap<>(); classToModule = new HashMap<>(); //Pattern patMainFrame = Pattern.compile("^Actions for Scene ([0-9]+): Frame ([0-9]+) of Layer Name .*$"); - //Pattern patSymbol = Pattern.compile("^Actions for Symbol ([0-9]+): Frame ([0-9]+) of Layer Name .*$"); + //Pattern patSymbol = Pattern.compile("^Actions for Symbol ([0-9]+): Frame ([0-9]+) of Layer Name .*$"); //Pattern patAS2 = Pattern.compile("^([^:]+): .*\\.as$"); Pattern patAS3 = Pattern.compile("^(.*);(.*);(.*)\\.as$"); for (int file : moduleNames.keySet()) { @@ -468,10 +468,12 @@ public class DebuggerHandler implements DebugConnectionListener { commands.setSwfLoadNotify(); commands.setGetterTimeout(1500); commands.setSetterTimeout(5000); - con.wideLines = commands.getOption("wide_line_player", "false").equals("true"); - if (con.wideLines) { - commands.setOption("wide_line_debugger", "on"); - } + /* + //TODO: + con.wideLines = commands.getOption("wide_line_player", "false").equals("true"); + if (con.wideLines) { + commands.setOption("wide_line_debugger", "on"); + }*/ commands.squelch(true); swfs = commands.getSwfInfo(1); @@ -531,8 +533,10 @@ public class DebuggerHandler implements DebugConnectionListener { String newBreakScriptName = "unknown"; if (modulePaths.containsKey(message.file)) { - //Logger.getLogger(DebuggerCommands.class.getName()).log(Level.SEVERE, "Invalid file: " + message.file); newBreakScriptName = modulePaths.get(message.file); + } else { + Logger.getLogger(DebuggerCommands.class.getName()).log(Level.SEVERE, "Invalid file: " + message.file); + return; } try { From 10209fa9bb1ac31524a7d06ecbb21ce85d44f28a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Mon, 23 Nov 2015 16:06:24 +0100 Subject: [PATCH 2/2] logging disabled for debugger --- src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java b/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java index 4cc5a9531..afea91060 100644 --- a/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java +++ b/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java @@ -398,9 +398,9 @@ public class DebuggerHandler implements DebugConnectionListener { Main.getMainFrame().getPanel().updateMenu(); - enlog(DebuggerConnection.class); - enlog(DebuggerCommands.class); - enlog(DebuggerHandler.class); + //enlog(DebuggerConnection.class); + //enlog(DebuggerCommands.class); + //enlog(DebuggerHandler.class); try { con.getMessage(InVersion.class); } catch (IOException ex) {