Updated Branches: refs/heads/develop 6fb5740d1 -> 6df7a1314
FLEX-26768 When debugging multi-module projects impossible to set breakpoint if there are Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/fde5f977 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/fde5f977 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/fde5f977 Branch: refs/heads/develop Commit: fde5f977eabed044b52fd7862ff661de0c2655f2 Parents: 6fb5740 Author: Frédéric Thomas <[email protected]> Authored: Thu Jan 16 12:21:44 2014 +0000 Committer: Frédéric Thomas <[email protected]> Committed: Thu Jan 16 12:21:44 2014 +0000 ---------------------------------------------------------------------- .../java/flex/tools/debugger/cli/DebugCLI.java | 59 ++++++++++---------- 1 file changed, 31 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fde5f977/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java ---------------------------------------------------------------------- diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java b/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java index 0c5bc94..cd53c05 100644 --- a/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java +++ b/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java @@ -3324,34 +3324,37 @@ public class DebugCLI implements Runnable, SourceLocator // If we have a swf filter enabled then we only want to // set a breakpoint in a specific swf not all of them - try - { - if (singleSwfBreakpoint) - { - Location l = findAndEnableBreak(swf, f, line); - col.add(l); - } - else - { - // walk all swfs looking to add this breakpoint - SwfInfo[] swfs = m_fileInfo.getSwfs(); - for(int i=0; i<swfs.length; i++) - { - swf = swfs[i]; - if (swf != null) - { - Location l = findAndEnableBreak(swf, f, line); - if (l != null) - col.add(l); - } - } - } - } - catch(InProgressException ipe) - { - if (Trace.error) - Trace.trace( ( (swf==null)?"SWF ":swf.getUrl() )+" still loading, breakpoint at "+f.getName()+":"+line+" not set"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - } + if (singleSwfBreakpoint) + { + Location l = null; + try { + l = findAndEnableBreak(swf, f, line); + } + catch(InProgressException ipe) + { + if (Trace.error) + Trace.trace( ( (swf==null)?"SWF ":swf.getUrl() )+" still loading, breakpoint at "+f.getName()+":"+line+" not set"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + } + col.add(l); + } + else + { + // walk all swfs looking to add this breakpoint + SwfInfo[] swfs = m_fileInfo.getSwfs(); + for (SwfInfo swf1 : swfs) { + swf = swf1; + if (swf != null) { + try { + Location l = findAndEnableBreak(swf, f, line); + if (l != null) + col.add(l); + } catch (InProgressException ipe) { + if (Trace.error) + Trace.trace((swf.getUrl()) + " still loading, breakpoint at " + f.getName() + ":" + line + " not set"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + } + } + } + } return col; }
