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 2016/09/07 04:26:06 UTC
git commit: [flex-falcon] [refs/heads/develop] - use ICSSImpl in the
output to determine whether to emit CSS or not
Repository: flex-falcon
Updated Branches:
refs/heads/develop 17f21f00e -> 9c58af2e2
use ICSSImpl in the output to determine whether to emit CSS or not
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9c58af2e
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9c58af2e
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9c58af2e
Branch: refs/heads/develop
Commit: 9c58af2e202c60d1113f2e0829e79969dddb0af4
Parents: 17f21f0
Author: Alex Harui <ah...@apache.org>
Authored: Tue Sep 6 21:25:57 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Sep 6 21:25:57 2016 -0700
----------------------------------------------------------------------
.../internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java | 3 ++-
.../org/apache/flex/compiler/internal/graph/GoogDepsWriter.java | 4 ++++
.../apache/flex/compiler/internal/projects/FlexJSProject.java | 2 --
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c58af2e/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
index 170a24b..d12a7e6 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
@@ -399,7 +399,8 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements IJSPublisher
e.printStackTrace();
return false;
}
-
+ project.needCSS = gdw.needCSS;
+
IOFileFilter pngSuffixFilter = FileFilterUtils.and(FileFileFilter.FILE,
FileFilterUtils.suffixFileFilter(".png"));
IOFileFilter gifSuffixFilter = FileFilterUtils.and(FileFileFilter.FILE,
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c58af2e/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
index e0173d2..7bf9e95 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
@@ -72,6 +72,8 @@ public class GoogDepsWriter {
private HashMap<String,GoogDep> depMap = new HashMap<String,GoogDep>();
private HashMap<String, String> requireMap = new HashMap<String, String>();
+ public boolean needCSS = false;
+
public ArrayList<String> getListOfFiles(ProblemQuery problems) throws InterruptedException
{
problemsFound = false;
@@ -405,6 +407,8 @@ public class GoogDepsWriter {
c2 = line.indexOf("}", c);
String impl = line.substring(c + 13, c2);
fi.impls.add(impl);
+ if (impl.equals("org.apache.flex.core.ICSSImpl"))
+ needCSS = true;
}
else
{
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c58af2e/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
index bbc3c0e..a601602 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
@@ -151,8 +151,6 @@ public class FlexJSProject extends FlexProject
if (!interfacesArr.containsKey(qname))
{
- if (qname.equals("org.apache.flex.core.IValuesImpl"))
- needCSS = true;
interfacesArr.put(qname, qname);
}
}