You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ft...@apache.org on 2015/06/04 17:10:27 UTC
git commit: [flex-falcon] [refs/heads/develop] - needs to work as
well if -js-output-type is not present
Repository: flex-falcon
Updated Branches:
refs/heads/develop 5a2f2db86 -> 94b22a971
needs to work as well if -js-output-type is not present
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/94b22a97
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/94b22a97
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/94b22a97
Branch: refs/heads/develop
Commit: 94b22a971d54386f120ac4e246cad203cf0c218e
Parents: 5a2f2db
Author: Frédéric THOMAS <we...@gmail.com>
Authored: Thu Jun 4 15:21:09 2015 +0100
Committer: Frédéric THOMAS <we...@gmail.com>
Committed: Thu Jun 4 15:21:09 2015 +0100
----------------------------------------------------------------------
flex-compiler-oem/src/flex2/tools/Tool.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/94b22a97/flex-compiler-oem/src/flex2/tools/Tool.java
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/src/flex2/tools/Tool.java b/flex-compiler-oem/src/flex2/tools/Tool.java
index 2232ae9..b8b6851 100644
--- a/flex-compiler-oem/src/flex2/tools/Tool.java
+++ b/flex-compiler-oem/src/flex2/tools/Tool.java
@@ -28,6 +28,7 @@ import flex2.compiler.util.ThreadLocalToolkit;
import flex2.tools.oem.Message;
import org.apache.flex.compiler.clients.COMPC;
import org.apache.flex.compiler.clients.MXMLC;
+import org.apache.flex.compiler.clients.MXMLJSC;
import org.apache.flex.compiler.clients.MXMLJSC.JSOutputType;
import org.apache.flex.compiler.clients.problems.ProblemQuery;
import org.apache.flex.compiler.clients.problems.ProblemQueryProvider;
@@ -60,7 +61,13 @@ public class Tool {
protected static int compile(String[] args) throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
int exitCode;
- final JSOutputType jsOutputType = JSOutputType.fromString(ArgumentUtil.getValue(args, "-js-output-type"));
+ final String value = ArgumentUtil.getValue(args, "-js-output-type");
+ JSOutputType jsOutputType = null;
+
+ if (value != null)
+ {
+ jsOutputType = JSOutputType.fromString(value);
+ }
if (jsOutputType != null) {
ArgumentBag bag = preparePhase1(new ArgumentBag(args));