flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [40/50] [abbrv] git commit: [flex-falcon] [refs/heads/develop] - re-apply 20011b7a70a17e80a8e2652fb88eeb2f12b6b5b1 from Flex SDK
Date Tue, 02 Jun 2015 17:05:43 GMT
re-apply 20011b7a70a17e80a8e2652fb88eeb2f12b6b5b1 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/a405e8a8
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a405e8a8
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a405e8a8

Branch: refs/heads/develop
Commit: a405e8a86ba50cc070d5d6554964079b51ef0e59
Parents: 53e6e13
Author: Alex Harui <aharui@apache.org>
Authored: Mon Jun 1 17:02:02 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Jun 1 17:02:02 2015 -0700

----------------------------------------------------------------------
 .../src/flex/tools/debugger/cli/FileInfoCache.java     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a405e8a8/debugger/src/flex/tools/debugger/cli/FileInfoCache.java
----------------------------------------------------------------------
diff --git a/debugger/src/flex/tools/debugger/cli/FileInfoCache.java b/debugger/src/flex/tools/debugger/cli/FileInfoCache.java
index ca13c90..9e34eea 100644
--- a/debugger/src/flex/tools/debugger/cli/FileInfoCache.java
+++ b/debugger/src/flex/tools/debugger/cli/FileInfoCache.java
@@ -89,8 +89,10 @@ public class FileInfoCache implements Comparator<SourceFile>
 	
 	public SourceFile[] getFileList(int isolateId) {
 		populate();
-		if (isolateId == Isolate.DEFAULT_ID)
-			return m_files;
+		if (isolateId == Isolate.DEFAULT_ID) {
+			final Object[] valuesToArray = m_byInt.valuesToArray(new Object[m_byInt.size()]);
+	        return Arrays.copyOf(valuesToArray, valuesToArray.length, SourceFile[].class);
+		} 
 		else if (isolateId != lastActiveIsolate) {
 			buildIsolateFiles(isolateId);
 		}
@@ -479,6 +481,11 @@ public class FileInfoCache implements Comparator<SourceFile>
      */
     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;
@@ -511,7 +518,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