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 6F73F17FF7 for ; Fri, 23 Jan 2015 17:28:31 +0000 (UTC) Received: (qmail 38529 invoked by uid 500); 23 Jan 2015 17:28:31 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 38401 invoked by uid 500); 23 Jan 2015 17:28:31 -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 38385 invoked by uid 99); 23 Jan 2015 17:28:31 -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; Fri, 23 Jan 2015 17:28:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EA026E07FD; Fri, 23 Jan 2015 17:28:30 +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 Date: Fri, 23 Jan 2015 17:28:32 -0000 Message-Id: In-Reply-To: <9bd7cd155a5f45428a832a45ff8e1198@git.apache.org> References: <9bd7cd155a5f45428a832a45ff8e1198@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] git commit: [flex-falcon] [refs/heads/develop] - move @expose of consts and public vars to FlexJS-only move @expose of consts and public vars to FlexJS-only Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/dcfb44eb Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/dcfb44eb Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/dcfb44eb Branch: refs/heads/develop Commit: dcfb44eb42a9c093790807f8317e4bda5259fc7d Parents: cdac8ac Author: Alex Harui Authored: Fri Jan 23 09:25:39 2015 -0800 Committer: Alex Harui Committed: Fri Jan 23 09:25:39 2015 -0800 ---------------------------------------------------------------------- .../codegen/js/flexjs/JSFlexJSDocEmitter.java | 35 ++++++++++++++++++++ .../codegen/js/goog/JSGoogDocEmitter.java | 4 --- 2 files changed, 35 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/dcfb44eb/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java index b676956..63fafe5 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java @@ -29,6 +29,7 @@ import org.apache.flex.compiler.common.DependencyType; import org.apache.flex.compiler.constants.IASKeywordConstants; import org.apache.flex.compiler.constants.IASLanguageConstants; import org.apache.flex.compiler.definitions.IClassDefinition; +import org.apache.flex.compiler.definitions.IDefinition; import org.apache.flex.compiler.definitions.IFunctionDefinition; import org.apache.flex.compiler.definitions.ITypeDefinition; import org.apache.flex.compiler.definitions.references.IReference; @@ -41,6 +42,7 @@ import org.apache.flex.compiler.tree.as.IDefinitionNode; import org.apache.flex.compiler.tree.as.IExpressionNode; import org.apache.flex.compiler.tree.as.IFunctionNode; import org.apache.flex.compiler.tree.as.IParameterNode; +import org.apache.flex.compiler.tree.as.IVariableNode; public class JSFlexJSDocEmitter extends JSGoogDocEmitter { @@ -291,4 +293,37 @@ public class JSFlexJSDocEmitter extends JSGoogDocEmitter emitPublic(node); } } + + @Override + public void emitFieldDoc(IVariableNode node, IDefinition def) + { + begin(); + + String ns = node.getNamespace(); + if (ns == IASKeywordConstants.PRIVATE) + { + emitPrivate(node); + } + else if (ns == IASKeywordConstants.PROTECTED) + { + emitProtected(node); + } + else + { + emitPublic(node); + } + + if (node.isConst()) + emitConst(node); + + String packageName = ""; + if (def != null) + packageName = def.getPackageName(); + + emitType(node, packageName); + + end(); + } + + } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/dcfb44eb/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java index 7bc61ca..8986fa4 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java @@ -115,10 +115,6 @@ public class JSGoogDocEmitter extends JSDocEmitter implements IJSGoogDocEmitter { emitProtected(node); } - else - { - emitPublic(node); - } if (node.isConst()) emitConst(node);