Repository: flex-falcon Updated Branches: refs/heads/dual 9ecd95aec -> af9ebe025
fix ASDoc Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/af9ebe02 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/af9ebe02 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/af9ebe02 Branch: refs/heads/dual Commit: af9ebe025a0b49920884ed11e31596deee7e39ab Parents: 9ecd95a Author: Alex Harui <[email protected]> Authored: Tue Feb 21 23:57:51 2017 -0800 Committer: Alex Harui <[email protected]> Committed: Tue Feb 21 23:57:51 2017 -0800 ---------------------------------------------------------------------- .../org/apache/flex/compiler/clients/ASDOCJSC.java | 17 +++++++++++++++++ .../apache/flex/compiler/clients/MXMLJSCFlex.java | 6 +++++- 2 files changed, 22 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/af9ebe02/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java index b4cef6a..f58a860 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java @@ -29,6 +29,7 @@ import java.util.Collection; import java.util.List; import java.util.Set; import org.apache.commons.io.FilenameUtils; +import org.apache.flex.compiler.clients.problems.ProblemQuery; import org.apache.flex.compiler.codegen.as.IASWriter; import org.apache.flex.compiler.codegen.js.flexjs.IJSFlexJSASDocEmitter; import org.apache.flex.compiler.driver.IBackend; @@ -42,11 +43,15 @@ import org.apache.flex.compiler.internal.driver.js.goog.ASDocConfiguration; import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend; import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSASDocBackend; import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSASDocDITABackend; +import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSBackend; import org.apache.flex.compiler.internal.driver.mxml.jsc.MXMLJSCJSSWCBackend; +import org.apache.flex.compiler.internal.parsing.as.FlexJSASDocDelegate; import org.apache.flex.compiler.internal.projects.CompilerProject; import org.apache.flex.compiler.internal.projects.FlexJSASDocProject; +import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.internal.targets.FlexJSSWCTarget; import org.apache.flex.compiler.internal.targets.JSTarget; +import org.apache.flex.compiler.internal.workspaces.Workspace; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.problems.InternalCompilerProblem; import org.apache.flex.compiler.problems.UnableToBuildSWFProblem; @@ -160,8 +165,20 @@ public class ASDOCJSC extends MXMLJSCFlex public ASDOCJSC(IBackend backend) { + super(backend); project = new FlexJSASDocProject(workspace, backend); } + + protected void init() + { + IBackend backend = new MXMLFlexJSBackend(); + workspace = new Workspace(); + workspace.setASDocDelegate(new FlexJSASDocDelegate()); + project = new FlexJSProject(workspace, backend); + problems = new ProblemQuery(); // this gets replaced in configure(). Do we need it here? + asFileHandler = backend.getSourceFileHandlerInstance(); + } + /** * Main body of this program. This method is called from the public static http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/af9ebe02/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCFlex.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCFlex.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCFlex.java index ec4b173..dff367d 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCFlex.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCFlex.java @@ -178,7 +178,11 @@ public class MXMLJSCFlex implements JSCompilerEntryPoint, ProblemQueryProvider, public MXMLJSCFlex() { - IBackend backend = new MXMLFlexJSBackend(); + this(new MXMLFlexJSBackend()); + } + + public MXMLJSCFlex(IBackend backend) + { workspace = new Workspace(); workspace.setASDocDelegate(new FlexJSASDocDelegate()); project = new FlexJSProject(workspace, backend);
