flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erikdebr...@apache.org
Subject [4/4] git commit: [FalconJX] update to publisher
Date Fri, 12 Apr 2013 13:05:28 GMT
[FalconJX] update to publisher

Minor fix for 'marmotinni' runs.

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>


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

Branch: refs/heads/develop
Commit: 31da8f27b39cb03734a9d551f6aa3f2e9bb26ec2
Parents: 50b3ffe
Author: Erik de Bruin <erik@ixsoftware.nl>
Authored: Fri Apr 12 09:45:21 2013 +0200
Committer: Erik de Bruin <erik@ixsoftware.nl>
Committed: Fri Apr 12 09:45:21 2013 +0200

----------------------------------------------------------------------
 .../codegen/mxml/flexjs/MXMLFlexJSPublisher.java   |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/31da8f27/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 8031e03..c22ff1f 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
@@ -36,17 +36,22 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
     public MXMLFlexJSPublisher(Configuration config)
     {
         super(config);
+
+        this.isMarmotinniRun = ((JSGoogConfiguration) configuration)
+                .getMarmotinni() != null;
     }
 
+    private boolean isMarmotinniRun;
+
     @Override
     public File getOutputFolder()
     {
         // (erikdebruin) If there is a -marmotinni switch, we want
         //               the output redirected to the directory it specifies.
-        JSGoogConfiguration jsGoogConfig = (JSGoogConfiguration) configuration;
-        if (jsGoogConfig.getMarmotinni() != null)
+        if (isMarmotinniRun)
         {
-            outputParentFolder = new File(jsGoogConfig.getMarmotinni());
+            outputParentFolder = new File(
+                    ((JSGoogConfiguration) configuration).getMarmotinni());
         }
         else
         {
@@ -62,7 +67,7 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
 
         // (erikdebruin) Marmotinni handles file management, so we 
         //               bypass the setup.
-        if (jsGoogConfig.getMarmotinni() == null)
+        if (!isMarmotinniRun)
             setupOutputFolder();
 
         return outputFolder;
@@ -71,8 +76,6 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
     @Override
     public void publish() throws IOException
     {
-        final boolean isMarmotinniRun = ((JSGoogConfiguration) configuration)
-                .getMarmotinni() != null;
         final String intermediateDirPath = outputFolder.getPath();
 
         final String projectName = FilenameUtils.getBaseName(configuration


Mime
View raw message