Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C53FDF5E3 for ; Fri, 12 Apr 2013 13:05:25 +0000 (UTC) Received: (qmail 5908 invoked by uid 500); 12 Apr 2013 13:05:25 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 5865 invoked by uid 500); 12 Apr 2013 13:05:25 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 5646 invoked by uid 99); 12 Apr 2013 13:05:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Apr 2013 13:05:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1A87B819769; Fri, 12 Apr 2013 13:05:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: erikdebruin@apache.org To: commits@flex.apache.org Date: Fri, 12 Apr 2013 13:05:28 -0000 Message-Id: <5fbf47094f094e5690b56d69510ec629@git.apache.org> In-Reply-To: <60b7f2ccb3fa4760a089e24a5c2e5de9@git.apache.org> References: <60b7f2ccb3fa4760a089e24a5c2e5de9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] git commit: [FalconJX] update to publisher [FalconJX] update to publisher Minor fix for 'marmotinni' runs. Signed-off-by: Erik de Bruin 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 Authored: Fri Apr 12 09:45:21 2013 +0200 Committer: Erik de Bruin 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