flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ftho...@apache.org
Subject git commit: [flex-sdk] [refs/heads/FDBWorkers] - FLEX-34297: FDB set a breakpoint in the wrong file when asked to be set for a file existing in another Worker
Date Sat, 03 May 2014 18:10:46 GMT
Repository: flex-sdk
Updated Branches:
  refs/heads/FDBWorkers 85d2f5eac -> 9253807b5


FLEX-34297: FDB set a breakpoint in the wrong file when asked to be set for a file existing
in another Worker


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/9253807b
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/9253807b
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/9253807b

Branch: refs/heads/FDBWorkers
Commit: 9253807b5b313df43c370499fa3ecb178112d91c
Parents: 85d2f5e
Author: Fr�d�ric THMOAS <fthomas@apache.org>
Authored: Sat May 3 19:10:18 2014 +0100
Committer: Fr�d�ric THMOAS <fthomas@apache.org>
Committed: Sat May 3 19:10:18 2014 +0100

----------------------------------------------------------------------
 .../src/java/flex/tools/debugger/cli/DebugCLI.java        |  2 +-
 .../src/java/flex/tools/debugger/cli/FileInfoCache.java   | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9253807b/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 50eba1f..40ea85b 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
@@ -3858,7 +3858,7 @@ public class DebugCLI implements Runnable, SourceLocator {
     }
 
     private int parseFileName(String partialFileName) throws NoMatchException, AmbiguousException
{
-        SourceFile[] sourceFiles = m_fileInfo.getFiles(partialFileName);
+        SourceFile[] sourceFiles = m_fileInfo.getFiles(partialFileName, m_activeIsolate);
         int nSourceFiles = sourceFiles.length;
 
         if (nSourceFiles == 0) {

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9253807b/modules/debugger/src/java/flex/tools/debugger/cli/FileInfoCache.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/FileInfoCache.java b/modules/debugger/src/java/flex/tools/debugger/cli/FileInfoCache.java
index c1e1187..d66bc85 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/FileInfoCache.java
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/FileInfoCache.java
@@ -474,13 +474,19 @@ public class FileInfoCache implements Comparator<SourceFile>
 
         return yes;
     }
+
     /**
      * Return a array of SourceFiles whose names match
      * the specified string. The array is sorted by name.
-	 * The input can be mx.controls.xxx which will
+     * The input can be mx.controls.xxx which will
      */
     public SourceFile[] getFiles(String matchString)
     {
+        return getFiles(matchString, -1);
+    }
+
+    public SourceFile[] getFiles(String matchString, int isolateId)
+    {
         boolean doStartsWith = false;
         boolean doIndexOf = false;
         boolean doEndsWith = false;
@@ -513,7 +519,7 @@ public class FileInfoCache implements Comparator<SourceFile>
             doStartsWith = true;
         }
 
-		SourceFile[] files = getFileList();
+		SourceFile[] files = isolateId > -1 ? getFileList(isolateId) : getFileList();
         ArrayList<SourceFile> fileList = new ArrayList<SourceFile>();
         int n = files.length;
 		int exactHitAt = -1;


Mime
View raw message