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 D23FF10277 for ; Wed, 13 Nov 2013 10:47:25 +0000 (UTC) Received: (qmail 76648 invoked by uid 500); 13 Nov 2013 10:46:08 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 76627 invoked by uid 500); 13 Nov 2013 10:46:04 -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 76562 invoked by uid 99); 13 Nov 2013 10:46:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Nov 2013 10:46:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D68BB8A69E1; Wed, 13 Nov 2013 10:46:01 +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: Wed, 13 Nov 2013 10:46:04 -0000 Message-Id: <1cc05a71db294e79acb036bfdc98b16b@git.apache.org> In-Reply-To: <65db758f4f3f46b5b5a53160d7d1fa4e@git.apache.org> References: <65db758f4f3f46b5b5a53160d7d1fa4e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] git commit: [flex-falcon] [refs/heads/develop_strictest] - Removed '@this' JSDoc annotations from the tests. Removed '@this' JSDoc annotations from the tests. 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/f4644e3b Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f4644e3b Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f4644e3b Branch: refs/heads/develop_strictest Commit: f4644e3bd071d95c191ea61252cf627c886995ad Parents: 26be727 Author: Erik de Bruin Authored: Wed Nov 13 10:49:51 2013 +0100 Committer: Erik de Bruin Committed: Wed Nov 13 10:49:51 2013 +0100 ---------------------------------------------------------------------- .../codegen/js/flexjs/TestFlexJSAccessors.java | 4 ++-- .../js/flexjs/TestFlexJSMethodMembers.java | 4 ++-- .../flexjs/files/FlexJSTest_again_result.js | 6 ------ .../flexjs/files/MyInitialView_result.js | 22 -------------------- 4 files changed, 4 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f4644e3b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSAccessors.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSAccessors.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSAccessors.java index fc656ef..d6e6a28 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSAccessors.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSAccessors.java @@ -49,7 +49,7 @@ public class TestFlexJSAccessors extends ASTestBase "public class B { public function B() {}; public function doStuff():void {this.label = label + 'bye'; var theLabel:String = label;}; private var _label:String; public function get label():String {return _label}; public function set label(value:String):void {_label = value};}", IClassNode.class, WRAP_LEVEL_PACKAGE); asBlockWalker.visitClass(node); - String expected = "/**\n * @constructor\n */\nB = function() {\n};\n\n\n/**\n * @expose\n * @this {B}\n */\nB.prototype.doStuff = function() {\n this.set_label(this.get_label() + 'bye');\n var /** @type {string} */ theLabel = this.get_label();\n};\n\n\n/**\n * @private\n * @type {string}\n */\nB.prototype._label;\n\n\n/**\n * @expose\n * @return {string}\n */\nB.prototype.get_label = function() {\n return this._label;\n};\n\n\n/**\n * @expose\n * @param {string} value\n */\nB.prototype.set_label = function(value) {\n this._label = value;\n};"; + String expected = "/**\n * @constructor\n */\nB = function() {\n};\n\n\n/**\n * @expose\n */\nB.prototype.doStuff = function() {\n this.set_label(this.get_label() + 'bye');\n var /** @type {string} */ theLabel = this.get_label();\n};\n\n\n/**\n * @private\n * @type {string}\n */\nB.prototype._label;\n\n\n/**\n * @expose\n * @return {string}\n */\nB.prototype.get_label = function() {\n return this._label;\n};\n\n\n/**\n * @expose\n * @param {string} value\n */\nB.prototype.set_label = function(value) {\n this._label = value;\n};"; assertOut(expected); } @@ -71,7 +71,7 @@ public class TestFlexJSAccessors extends ASTestBase "public class B { public function B() {}; public function doStuff():void {label = this.label; var theLabel:String = label;}; private var _label:String; public function get label():String {return _label}; public function set label(value:String):void {_label = value};}", IClassNode.class, WRAP_LEVEL_PACKAGE); asBlockWalker.visitClass(node); - String expected = "/**\n * @constructor\n */\nB = function() {\n};\n\n\n/**\n * @expose\n * @this {B}\n */\nB.prototype.doStuff = function() {\n this.set_label(this.get_label());\n var /** @type {string} */ theLabel = this.get_label();\n};\n\n\n/**\n * @private\n * @type {string}\n */\nB.prototype._label;\n\n\n/**\n * @expose\n * @return {string}\n */\nB.prototype.get_label = function() {\n return this._label;\n};\n\n\n/**\n * @expose\n * @param {string} value\n */\nB.prototype.set_label = function(value) {\n this._label = value;\n};"; + String expected = "/**\n * @constructor\n */\nB = function() {\n};\n\n\n/**\n * @expose\n */\nB.prototype.doStuff = function() {\n this.set_label(this.get_label());\n var /** @type {string} */ theLabel = this.get_label();\n};\n\n\n/**\n * @private\n * @type {string}\n */\nB.prototype._label;\n\n\n/**\n * @expose\n * @return {string}\n */\nB.prototype.get_label = function() {\n return this._label;\n};\n\n\n/**\n * @expose\n * @param {string} value\n */\nB.prototype.set_label = function(value) {\n this._label = value;\n};"; assertOut(expected); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f4644e3b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java index d362bdb..a11ea8d 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java @@ -122,7 +122,7 @@ public class TestFlexJSMethodMembers extends TestGoogMethodMembers { IClassNode node = (IClassNode) getNode("public function FalconTest_A(){}; private var baz:String; private function foo():String{return this.baz;};", IClassNode.class, WRAP_LEVEL_CLASS); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * @private\n * @type {string}\n */\nFalconTest_A.prototype.baz;\n\n\n/**\n * @private\n * @this {FalconTest_A}\n * @return {string}\n */\nFalconTest_A.prototype.foo = function() {\n return this.baz;\n};"); + assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * @private\n * @type {string}\n */\nFalconTest_A.prototype.baz;\n\n\n/**\n * @private\n * @return {string}\n */\nFalconTest_A.prototype.foo = function() {\n return this.baz;\n};"); } @Test @@ -139,7 +139,7 @@ public class TestFlexJSMethodMembers extends TestGoogMethodMembers { IClassNode node = (IClassNode) getNode("public function FalconTest_A(){}; private function foo(value:int):String{return value;}; private function bar():String{if(true){while(i){return this.foo(42);}}};", IClassNode.class, WRAP_LEVEL_CLASS); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * @private\n * @param {number} value\n * @return {string}\n */\nFalconTest_A.prototype.foo = function(value) {\n return value;\n};\n\n\n/**\n * @private\n * @this {FalconTest_A}\n * @return {string}\n */\nFalconTest_A.prototype.bar = function() {\n if (true) {\n while (i) {\n return this.foo(42);\n }\n }\n};"); + assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * @private\n * @param {number} value\n * @return {string}\n */\nFalconTest_A.prototype.foo = function(value) {\n return value;\n};\n\n\n/**\n * @private\n * @return {string}\n */\nFalconTest_A.prototype.bar = function() {\n if (true) {\n while (i) {\n return this.foo(42);\n }\n }\n};"); } @Test http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f4644e3b/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js b/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js index c5f3109..098cbbe 100644 --- a/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js +++ b/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js @@ -84,7 +84,6 @@ goog.inherits(FlexJSTest_again, org.apache.flex.core.Application); /** - * @this {FlexJSTest_again} * @expose * @param {org.apache.flex.events.Event} event */ @@ -96,7 +95,6 @@ FlexJSTest_again.prototype.$EH0 = function(event) /** * @expose - * @this {FlexJSTest_again} * @return {org.apache.flex.net.HTTPService} */ FlexJSTest_again.prototype.get_service = function() @@ -107,7 +105,6 @@ FlexJSTest_again.prototype.get_service = function() /** * @expose - * @this {FlexJSTest_again} * @param {org.apache.flex.net.HTTPService} value */ FlexJSTest_again.prototype.set_service = function(value) @@ -119,7 +116,6 @@ FlexJSTest_again.prototype.set_service = function(value) /** * @expose - * @this {FlexJSTest_again} * @return {org.apache.flex.net.dataConverters.LazyCollection} */ FlexJSTest_again.prototype.get_collection = function() @@ -130,7 +126,6 @@ FlexJSTest_again.prototype.get_collection = function() /** * @expose - * @this {FlexJSTest_again} * @param {org.apache.flex.net.dataConverters.LazyCollection} value */ FlexJSTest_again.prototype.set_collection = function(value) @@ -142,7 +137,6 @@ FlexJSTest_again.prototype.set_collection = function(value) /** * @override - * @this {FlexJSTest_again} * @return {Array} the Array of UI element descriptors. */ FlexJSTest_again.prototype.get_MXMLProperties = function() http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f4644e3b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js index 0037b48..c9f0920 100644 --- a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js +++ b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js @@ -242,7 +242,6 @@ MyInitialView.prototype.timerHandler = function(event) { /** - * @this {MyInitialView} * @expose * @param {org.apache.flex.events.Event} event */ @@ -253,7 +252,6 @@ MyInitialView.prototype.$EH0 = function(event) /** - * @this {MyInitialView} * @expose * @param {org.apache.flex.events.Event} event */ @@ -265,7 +263,6 @@ MyInitialView.prototype.$EH1 = function(event) /** - * @this {MyInitialView} * @expose * @param {org.apache.flex.events.Event} event */ @@ -276,7 +273,6 @@ MyInitialView.prototype.$EH2 = function(event) /** - * @this {MyInitialView} * @expose * @param {org.apache.flex.events.Event} event */ @@ -287,7 +283,6 @@ MyInitialView.prototype.$EH3 = function(event) /** - * @this {MyInitialView} * @expose * @param {org.apache.flex.events.Event} event */ @@ -298,7 +293,6 @@ MyInitialView.prototype.$EH4 = function(event) /** - * @this {MyInitialView} * @expose * @param {org.apache.flex.events.Event} event */ @@ -309,7 +303,6 @@ MyInitialView.prototype.$EH5 = function(event) /** - * @this {MyInitialView} * @expose * @param {org.apache.flex.events.Event} event */ @@ -321,7 +314,6 @@ MyInitialView.prototype.$EH6 = function(event) /** * @expose - * @this {MyInitialView} * @return {org.apache.flex.html.staticControls.Label} */ MyInitialView.prototype.get_lbl = function() @@ -332,7 +324,6 @@ MyInitialView.prototype.get_lbl = function() /** * @expose - * @this {MyInitialView} * @param {org.apache.flex.html.staticControls.Label} value */ MyInitialView.prototype.set_lbl = function(value) @@ -344,7 +335,6 @@ MyInitialView.prototype.set_lbl = function(value) /** * @expose - * @this {MyInitialView} * @return {org.apache.flex.html.staticControls.Label} */ MyInitialView.prototype.get_timerLabel = function() @@ -355,7 +345,6 @@ MyInitialView.prototype.get_timerLabel = function() /** * @expose - * @this {MyInitialView} * @param {org.apache.flex.html.staticControls.Label} value */ MyInitialView.prototype.set_timerLabel = function(value) @@ -367,7 +356,6 @@ MyInitialView.prototype.set_timerLabel = function(value) /** * @expose - * @this {MyInitialView} * @return {org.apache.flex.html.staticControls.List} */ MyInitialView.prototype.get_cityList = function() @@ -378,7 +366,6 @@ MyInitialView.prototype.get_cityList = function() /** * @expose - * @this {MyInitialView} * @param {org.apache.flex.html.staticControls.List} value */ MyInitialView.prototype.set_cityList = function(value) @@ -390,7 +377,6 @@ MyInitialView.prototype.set_cityList = function(value) /** * @expose - * @this {MyInitialView} * @return {org.apache.flex.html.staticControls.TextInput} */ MyInitialView.prototype.get_input = function() @@ -401,7 +387,6 @@ MyInitialView.prototype.get_input = function() /** * @expose - * @this {MyInitialView} * @param {org.apache.flex.html.staticControls.TextInput} value */ MyInitialView.prototype.set_input = function(value) @@ -413,7 +398,6 @@ MyInitialView.prototype.set_input = function(value) /** * @expose - * @this {MyInitialView} * @return {org.apache.flex.html.staticControls.CheckBox} */ MyInitialView.prototype.get_checkbox = function() @@ -424,7 +408,6 @@ MyInitialView.prototype.get_checkbox = function() /** * @expose - * @this {MyInitialView} * @param {org.apache.flex.html.staticControls.CheckBox} value */ MyInitialView.prototype.set_checkbox = function(value) @@ -436,7 +419,6 @@ MyInitialView.prototype.set_checkbox = function(value) /** * @expose - * @this {MyInitialView} * @return {org.apache.flex.html.staticControls.DropDownList} */ MyInitialView.prototype.get_list = function() @@ -447,7 +429,6 @@ MyInitialView.prototype.get_list = function() /** * @expose - * @this {MyInitialView} * @param {org.apache.flex.html.staticControls.DropDownList} value */ MyInitialView.prototype.set_list = function(value) @@ -459,7 +440,6 @@ MyInitialView.prototype.set_list = function(value) /** * @expose - * @this {MyInitialView} * @return {org.apache.flex.html.staticControls.ComboBox} */ MyInitialView.prototype.get_comboBox = function() @@ -470,7 +450,6 @@ MyInitialView.prototype.get_comboBox = function() /** * @expose - * @this {MyInitialView} * @param {org.apache.flex.html.staticControls.ComboBox} value */ MyInitialView.prototype.set_comboBox = function(value) @@ -482,7 +461,6 @@ MyInitialView.prototype.set_comboBox = function(value) /** * @override - * @this {MyInitialView} * @return {Array} the Array of UI element descriptors. */ MyInitialView.prototype.get_MXMLDescriptor = function()