flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [35/42] git commit: [flex-falcon] [refs/heads/develop] - Add ProblemQuery to getListOfFiles
Date Thu, 04 Jun 2015 06:06:41 GMT
Add ProblemQuery to getListOfFiles


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7127eee5
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7127eee5
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7127eee5

Branch: refs/heads/develop
Commit: 7127eee5e3e04861ea02bf35ff314fcddcd59da7
Parents: f2b74b6
Author: Frédéric THOMAS <webdoublefx@gmail.com>
Authored: Mon Jun 1 19:18:52 2015 +0100
Committer: Frédéric THOMAS <webdoublefx@gmail.com>
Committed: Tue Jun 2 13:41:35 2015 +0100

----------------------------------------------------------------------
 .../internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java   | 2 +-
 .../apache/flex/compiler/internal/graph/GoogDepsWriter.java | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7127eee5/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
index 5b1e436..53a6181 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
@@ -271,7 +271,7 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
         StringBuilder depsFileData = new StringBuilder();
         try
         {
-        	ArrayList<String> fileList = gdw.getListOfFiles();
+        	ArrayList<String> fileList = gdw.getListOfFiles(problems);
         	for (String file : fileList)
         	{
                 compilerWrapper.addJSSourceFile(file);	

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7127eee5/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java b/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
index 7dd7065..f3d77fe 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
@@ -46,7 +46,7 @@ import com.google.common.io.Files;
 
 public class GoogDepsWriter {
 
-	public GoogDepsWriter(File outputFolder, String mainClassName, JSGoogConfiguration config,
List<ISWC> swcs)
+    public GoogDepsWriter(File outputFolder, String mainClassName, JSGoogConfiguration config,
List<ISWC> swcs)
 	{
 		this.outputFolderPath = outputFolder.getAbsolutePath();
 		this.mainName = mainClassName;
@@ -69,8 +69,11 @@ public class GoogDepsWriter {
 	
 	private HashMap<String,GoogDep> depMap = new HashMap<String,GoogDep>();
 	
-	public ArrayList<String> getListOfFiles() throws InterruptedException
+	public ArrayList<String> getListOfFiles(ProblemQuery problems) throws InterruptedException
 	{
+		problemsFound = false;
+		this.problems = problems;
+
 		if (dps == null)
 		{
 			buildDB();
@@ -436,7 +439,7 @@ public class GoogDepsWriter {
     			return fn;
     		}
         }
-        
+
 		String fwdClassPath = className.replace("_", "/");
 		String bckClassPath = className.replace("_", "\\");
         for (ISWC swc : swcs)


Mime
View raw message