You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/06/02 19:05:33 UTC
[30/50] [abbrv] git commit: [flex-falcon] [refs/heads/develop] -
re-apply fde5f977eabed044b52fd7862ff661de0c2655f2 from Flex SDK
re-apply fde5f977eabed044b52fd7862ff661de0c2655f2 from Flex SDK
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/6f052d84
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6f052d84
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/6f052d84
Branch: refs/heads/develop
Commit: 6f052d84cd1af0aa7cc7d9dcac9657de618b7d65
Parents: 062435b
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jun 1 10:12:57 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jun 1 10:12:57 2015 -0700
----------------------------------------------------------------------
.../src/flex/tools/debugger/cli/DebugCLI.java | 59 ++++++++++----------
1 file changed, 31 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6f052d84/debugger/src/flex/tools/debugger/cli/DebugCLI.java
----------------------------------------------------------------------
diff --git a/debugger/src/flex/tools/debugger/cli/DebugCLI.java b/debugger/src/flex/tools/debugger/cli/DebugCLI.java
index 588a977..b4d5fe6 100644
--- a/debugger/src/flex/tools/debugger/cli/DebugCLI.java
+++ b/debugger/src/flex/tools/debugger/cli/DebugCLI.java
@@ -3671,34 +3671,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(isolateId);
- 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(isolateId);
+ 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;
}