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 5C66A18778 for ; Wed, 27 Jan 2016 07:32:00 +0000 (UTC) Received: (qmail 5196 invoked by uid 500); 27 Jan 2016 07:32:00 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 5167 invoked by uid 500); 27 Jan 2016 07:32:00 -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 5158 invoked by uid 99); 27 Jan 2016 07:32:00 -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; Wed, 27 Jan 2016 07:32:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 037E9DFBC6; Wed, 27 Jan 2016 07:31:59 +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: <7d1cb924042e478293ab4e6148f6e7d7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [flex-asjs] [refs/heads/develop] - fix metadata handling in reflection Date: Wed, 27 Jan 2016 07:31:59 +0000 (UTC) Repository: flex-asjs Updated Branches: refs/heads/develop 94ab3ff85 -> b3e7785af fix metadata handling in reflection Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b3e7785a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b3e7785a Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b3e7785a Branch: refs/heads/develop Commit: b3e7785af967da1f6cebc1b32f7454d0c648fbe3 Parents: 94ab3ff Author: Alex Harui Authored: Tue Jan 26 23:31:48 2016 -0800 Committer: Alex Harui Committed: Tue Jan 26 23:31:48 2016 -0800 ---------------------------------------------------------------------- .../flex/reflection/DefinitionWithMetaData.as | 15 ++++-- .../flex/reflection/MetaDataDefinition.as | 9 ++-- manualtests/ReflectionTest/build.xml | 2 + .../ReflectionTest/src/MyInitialView.mxml | 54 ++++++++++++++++++-- 4 files changed, 67 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b3e7785a/frameworks/projects/Reflection/as/src/org/apache/flex/reflection/DefinitionWithMetaData.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Reflection/as/src/org/apache/flex/reflection/DefinitionWithMetaData.as b/frameworks/projects/Reflection/as/src/org/apache/flex/reflection/DefinitionWithMetaData.as index f6555eb..3ca31ba 100755 --- a/frameworks/projects/Reflection/as/src/org/apache/flex/reflection/DefinitionWithMetaData.as +++ b/frameworks/projects/Reflection/as/src/org/apache/flex/reflection/DefinitionWithMetaData.as @@ -34,7 +34,7 @@ package org.apache.flex.reflection super(name, rawData); } - public function getMetaData():Array + public function get metadata():Array { var results:Array = []; @@ -52,8 +52,17 @@ package org.apache.flex.reflection } COMPILE::JS { - var rdata:* = rawData; - if (rdata !== undefined) + var rdata:*; + var data:Object = rawData; + if (data.names !== undefined) + { + var name:String = data.names[0].qName; + var def:Object = getDefinitionByName(name); + rdata = def.prototype.FLEXJS_REFLECTION_INFO(); + } + else + rdata = data; + if (rdata !== undefined && rdata.metadata !== undefined) { var metadatas:Array = rdata.metadata(); if (metadatas) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b3e7785a/frameworks/projects/Reflection/as/src/org/apache/flex/reflection/MetaDataDefinition.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Reflection/as/src/org/apache/flex/reflection/MetaDataDefinition.as b/frameworks/projects/Reflection/as/src/org/apache/flex/reflection/MetaDataDefinition.as index 20d50cd..4b9a8c9 100755 --- a/frameworks/projects/Reflection/as/src/org/apache/flex/reflection/MetaDataDefinition.as +++ b/frameworks/projects/Reflection/as/src/org/apache/flex/reflection/MetaDataDefinition.as @@ -41,7 +41,7 @@ package org.apache.flex.reflection COMPILE::AS3 { var xml:XML = rawData as XML; - var data:XMLList = xml.args; + var data:XMLList = xml.arg; var n:int = data.length(); for (var i:int = 0; i < n; i++) { @@ -53,13 +53,10 @@ package org.apache.flex.reflection } COMPILE::JS { - var data:Object = rawData; - var name:String = data.names[0].qName; - var def:Object = getDefinitionByName(name); - var rdata:* = def.prototype.FLEXJS_REFLECTION_INFO(); + var rdata:* = rawData; if (rdata !== undefined) { - var args:Array = rdata.args(); + var args:Array = rdata.args; if (args) { var n:int = args.length; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b3e7785a/manualtests/ReflectionTest/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/ReflectionTest/build.xml b/manualtests/ReflectionTest/build.xml index c705edf..d65e7a8 100644 --- a/manualtests/ReflectionTest/build.xml +++ b/manualtests/ReflectionTest/build.xml @@ -26,6 +26,8 @@ + + - +