Repository: flex-falcon Updated Branches: refs/heads/develop 4c07f5e89 -> 096bc8558
use tokens so I don't keep mistyping Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/5354db83 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/5354db83 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/5354db83 Branch: refs/heads/develop Commit: 5354db83c484f0cde1cb4c6738e708400eb45a59 Parents: 4c07f5e Author: Alex Harui <aha...@apache.org> Authored: Wed Nov 12 20:46:13 2014 -0800 Committer: Alex Harui <aha...@apache.org> Committed: Wed Nov 12 20:46:13 2014 -0800 ---------------------------------------------------------------------- .../internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 4 ++-- .../internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java | 5 +++-- .../internal/driver/js/flexjs/JSCSSCompilationSession.java | 3 ++- .../org/apache/flex/compiler/internal/graph/GoogDepsWriter.java | 5 +++-- .../apache/flex/compiler/internal/graph/VF2JSDepsWriter.java | 3 ++- 5 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5354db83/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java index 64d1378..4eeea84 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java @@ -1557,7 +1557,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements String s = ((MXMLFlexJSBlockWalker)getMXMLWalker()).encodedCSS; if (!s.isEmpty()) { - int reqidx = s.indexOf("goog.require"); + int reqidx = s.indexOf(JSGoogEmitterTokens.GOOG_REQUIRE.getToken()); if (reqidx != -1) s = s.substring(0, reqidx - 1); @@ -1662,7 +1662,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements String s = ((MXMLFlexJSBlockWalker)getMXMLWalker()).encodedCSS; if (!s.isEmpty()) { - int reqidx = s.indexOf("goog.require"); + int reqidx = s.indexOf(JSGoogEmitterTokens.GOOG_REQUIRE.getToken()); if (reqidx != -1) { String reqs = s.substring(reqidx); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5354db83/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 dff5d23..f0bb0dd 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 @@ -42,6 +42,7 @@ import org.apache.flex.compiler.clients.problems.ProblemQuery; import org.apache.flex.compiler.codegen.js.IJSPublisher; import org.apache.flex.compiler.config.Configuration; import org.apache.flex.compiler.internal.codegen.js.JSSharedData; +import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogPublisher; import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration; import org.apache.flex.compiler.internal.graph.GoogDepsWriter; @@ -401,13 +402,13 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements appendString.append(projectName); appendString.append(".prototype.cssData = ["); String s = project.cssEncoding; - int reqidx = s.indexOf("goog.require"); + int reqidx = s.indexOf(JSGoogEmitterTokens.GOOG_REQUIRE.getToken()); if (reqidx != -1) { String reqs = s.substring(reqidx); s = s.substring(0, reqidx - 1); String fileData = readCode(new File(path)); - reqidx = fileData.indexOf("goog.require"); + reqidx = fileData.indexOf(JSGoogEmitterTokens.GOOG_REQUIRE.getToken()); String after = fileData.substring(reqidx); String before = fileData.substring(0, reqidx - 1); s = before + reqs + after + appendString.toString() + s; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5354db83/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java index 44cb3a0..7a518d2 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java @@ -29,6 +29,7 @@ import org.apache.flex.compiler.css.ICSSPropertyValue; import org.apache.flex.compiler.css.ICSSRule; import org.apache.flex.compiler.css.ICSSSelector; import org.apache.flex.compiler.css.ICSSSelectorCondition; +import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; import org.apache.flex.compiler.internal.css.CSSArrayPropertyValue; import org.apache.flex.compiler.internal.css.CSSColorPropertyValue; import org.apache.flex.compiler.internal.css.CSSFunctionCallPropertyValue; @@ -56,7 +57,7 @@ public class JSCSSCompilationSession extends CSSCompilationSession sb.append("];\n"); for (String r : requires) { - sb.append("goog.require('" + r + "');\n"); + sb.append(JSGoogEmitterTokens.GOOG_REQUIRE.getToken() + "('" + r + "');\n"); } return sb.toString(); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5354db83/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 cde5681..26df899 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 @@ -32,6 +32,7 @@ import java.util.Scanner; import org.apache.commons.io.FileUtils; import org.apache.flex.compiler.clients.problems.ProblemQuery; +import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration; import org.apache.flex.compiler.problems.FileNotFoundProblem; @@ -175,7 +176,7 @@ public class GoogDepsWriter { for (String line : fileLines) { - int c = line.indexOf("goog.require"); + int c = line.indexOf(JSGoogEmitterTokens.GOOG_REQUIRE.getToken()); if (c > -1) { int c2 = line.indexOf(")"); @@ -338,7 +339,7 @@ public class GoogDepsWriter { additionalHTML.add(s); continue; } - int c = s.indexOf("goog.require"); + int c = s.indexOf(JSGoogEmitterTokens.GOOG_REQUIRE.getToken()); if (c > -1) { int c2 = s.indexOf(")"); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5354db83/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java b/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java index 82251e7..b37f71a 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java @@ -32,6 +32,7 @@ import java.util.Scanner; import org.apache.commons.io.FileUtils; import org.apache.flex.compiler.clients.problems.ProblemQuery; +import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration; import org.apache.flex.compiler.problems.FileNotFoundProblem; @@ -338,7 +339,7 @@ public class VF2JSDepsWriter { additionalHTML.add(s); continue; } - int c = s.indexOf("goog.require"); + int c = s.indexOf(JSGoogEmitterTokens.GOOG_REQUIRE.getToken()); if (c > -1) { int c2 = s.indexOf(")");
