Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 14DBC200C2F for ; Mon, 6 Mar 2017 20:31:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 1355E160B76; Mon, 6 Mar 2017 19:31:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 54B89160B66 for ; Mon, 6 Mar 2017 20:31:18 +0100 (CET) Received: (qmail 80288 invoked by uid 500); 6 Mar 2017 19:31:17 -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 80280 invoked by uid 99); 6 Mar 2017 19:31:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Mar 2017 19:31:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 592CADFBD9; Mon, 6 Mar 2017 19:31:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aharui@apache.org To: commits@flex.apache.org Message-Id: <1a6b4646908e496d9994339bcaf67fea@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [flex-falcon] [refs/heads/develop] - try to allow alternative embed class names Date: Mon, 6 Mar 2017 19:31:17 +0000 (UTC) archived-at: Mon, 06 Mar 2017 19:31:19 -0000 Repository: flex-falcon Updated Branches: refs/heads/develop c1417e134 -> 445854b7e try to allow alternative embed class names Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/445854b7 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/445854b7 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/445854b7 Branch: refs/heads/develop Commit: 445854b7e240d30761fe821549055130818f325f Parents: c1417e1 Author: Alex Harui Authored: Mon Mar 6 11:26:07 2017 -0800 Committer: Alex Harui Committed: Mon Mar 6 11:26:07 2017 -0800 ---------------------------------------------------------------------- .../flex/compiler/config/Configuration.java | 20 ++++++++++++++++++++ .../embedding/transcoders/DataTranscoder.java | 4 +++- .../projects/FlexProjectConfigurator.java | 4 +++- 3 files changed, 26 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/445854b7/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java b/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java index 3fbf713..fa8d612 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java +++ b/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java @@ -1620,6 +1620,26 @@ public class Configuration } // + // 'compiler.byte-array-embed-class' option + // + + private String byteArrayEmbedClass = "mx.core.ByteArrayAsset"; + + public String getByteArrayEmbedClass() + { + return byteArrayEmbedClass; + } + + /** + * The class for embedded byte arrays + */ + @Config(advanced = true) + public void setCompilerByteArrayEmbedClass(ConfigurationValue cv, String b) + { + byteArrayEmbedClass = b; + } + + // // 'compiler.states-class' option // http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/445854b7/compiler/src/main/java/org/apache/flex/compiler/internal/embedding/transcoders/DataTranscoder.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/embedding/transcoders/DataTranscoder.java b/compiler/src/main/java/org/apache/flex/compiler/internal/embedding/transcoders/DataTranscoder.java index ff5c32e..5f76509 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/embedding/transcoders/DataTranscoder.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/embedding/transcoders/DataTranscoder.java @@ -47,11 +47,13 @@ public class DataTranscoder extends TranscoderBase super(data, workspace); } + public static String embedClassName = CORE_PACKAGE + ".ByteArrayAsset"; + @Override public boolean analyze(ISourceLocation location, Collection problems) { boolean result = super.analyze(location, problems); - baseClassQName = CORE_PACKAGE + ".ByteArrayAsset"; + baseClassQName = embedClassName; return result; } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/445854b7/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProjectConfigurator.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProjectConfigurator.java b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProjectConfigurator.java index 3001630..d66b340 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProjectConfigurator.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProjectConfigurator.java @@ -31,6 +31,7 @@ import org.apache.flex.abc.semantics.Nsset; import org.apache.flex.compiler.config.Configuration; import org.apache.flex.compiler.internal.as.codegen.BindableHelper; import org.apache.flex.compiler.internal.definitions.ClassDefinition; +import org.apache.flex.compiler.internal.embedding.transcoders.DataTranscoder; import org.apache.flex.compiler.mxml.IMXMLTypeConstants; /** @@ -245,7 +246,8 @@ public class FlexProjectConfigurator project.setProxyBaseClass(configValue); project.setStrictXML(configuration.isStrictXML()); - + + DataTranscoder.embedClassName = configuration.getByteArrayEmbedClass(); } } }