You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2013/11/13 11:46:01 UTC
[1/5] git commit: [flex-falcon] [refs/heads/develop_strictest] -
Changed the test file to correct a mistake in the @param type emission.
Updated Branches:
refs/heads/develop_strictest d98ce9dc2 -> 39e91cb75
Changed the test file to correct a mistake in the @param type emission.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/44fbfcd0
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/44fbfcd0
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/44fbfcd0
Branch: refs/heads/develop_strictest
Commit: 44fbfcd01f18230937bdfd93f66370b50605a650
Parents: d98ce9d
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Nov 13 10:00:03 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Nov 13 10:00:03 2013 +0100
----------------------------------------------------------------------
.../test-files/flexjs/files/MyInitialView_result.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/44fbfcd0/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 0f29b72..0037b48 100644
--- a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
@@ -223,7 +223,7 @@ MyInitialView.prototype.get_comboBoxValue = function() {
/**
* @expose
- * @param {org.apache.flex.events.org.apache.flex.events.Event} event
+ * @param {org.apache.flex.events.Event} event
*/
MyInitialView.prototype.startTimer = function(event) {
this.timer = new org.apache.flex.utils.Timer(1000);
@@ -234,7 +234,7 @@ MyInitialView.prototype.startTimer = function(event) {
/**
* @expose
- * @param {org.apache.flex.events.org.apache.flex.events.Event} event
+ * @param {org.apache.flex.events.Event} event
*/
MyInitialView.prototype.timerHandler = function(event) {
this.get_timerLabel().set_text(this.timer.get_currentCount().toString());
[5/5] git commit: [flex-falcon] [refs/heads/develop_strictest] -
Added '-strict-publish' argument. Made the use of strict compiler flags when
publishing optional.
Posted by er...@apache.org.
Added '-strict-publish' argument. Made the use of strict compiler flags when publishing optional.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/39e91cb7
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/39e91cb7
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/39e91cb7
Branch: refs/heads/develop_strictest
Commit: 39e91cb751b522be38fbb7167aa27caf9dde1e1b
Parents: f4644e3
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Nov 13 11:39:05 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Nov 13 11:39:05 2013 +0100
----------------------------------------------------------------------
.../mxml/flexjs/MXMLFlexJSPublisher.java | 30 ++++++++++++--------
.../driver/js/goog/JSGoogConfiguration.java | 19 +++++++++++++
2 files changed, 37 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/39e91cb7/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 beb9764..34438a2 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
@@ -45,12 +45,17 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
this.isMarmotinniRun = ((JSGoogConfiguration) configuration)
.getMarmotinni() != null;
+
+ this.useStrictPublishing = ((JSGoogConfiguration) configuration)
+ .getStrictPublish();
+
this.project = project;
}
private FlexJSProject project;
private boolean isMarmotinniRun;
+ private boolean useStrictPublishing;
@Override
public File getOutputFolder()
@@ -223,18 +228,19 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements
optionList.add("--js=" + file.getCanonicalPath());
}
- // (erikdebruin) set compiler flags to 'strictest' to allow maximum
- // code optimization
- // start 'really strict'
- optionList.add("--define='goog.DEBUG=false'");
- optionList.add("--language_in=ECMASCRIPT5_STRICT");
- optionList.add("--warning_level=VERBOSE");
- optionList.add("--jscomp_warning=accessControls");
- optionList.add("--jscomp_warning=const");
- optionList.add("--jscomp_warning=constantProperty");
- optionList.add("--jscomp_warning=strictModuleDepCheck");
- optionList.add("--jscomp_warning=visibility");
- // end 'really strict'
+ if (useStrictPublishing)
+ {
+ // (erikdebruin) set compiler flags to 'strictest' to allow maximum
+ // code optimization
+ optionList.add("--define='goog.DEBUG=false'");
+ optionList.add("--language_in=ECMASCRIPT5_STRICT");
+ optionList.add("--warning_level=VERBOSE");
+ optionList.add("--jscomp_warning=accessControls");
+ optionList.add("--jscomp_warning=const");
+ optionList.add("--jscomp_warning=constantProperty");
+ optionList.add("--jscomp_warning=strictModuleDepCheck");
+ optionList.add("--jscomp_warning=visibility");
+ }
optionList.add("--closure_entry_point=" + projectName);
optionList.add("--only_closure_dependencies");
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/39e91cb7/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
index 30ccd5b..4e04254 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/goog/JSGoogConfiguration.java
@@ -105,4 +105,23 @@ public class JSGoogConfiguration extends JSConfiguration
sdkJSLib.addAll(value);
}
+ //
+ // 'strict-publish'
+ //
+
+ private boolean strictPublish;
+
+ public boolean getStrictPublish()
+ {
+ return strictPublish;
+ }
+
+ @Config
+ @Mapping("strict-publish")
+ public void setStrictPublish(ConfigurationValue cv, boolean value)
+ throws ConfigurationException
+ {
+ strictPublish = value;
+ }
+
}
[4/5] git commit: [flex-falcon] [refs/heads/develop_strictest] -
Removed '@this' JSDoc annotations from the tests.
Posted by er...@apache.org.
Removed '@this' JSDoc annotations from the tests.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
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 <er...@ixsoftware.nl>
Authored: Wed Nov 13 10:49:51 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
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()
[2/5] git commit: [flex-falcon] [refs/heads/develop_strictest] -
Fixed the JSDoc emission to allow for fully qualified type names as a
parameter.
Posted by er...@apache.org.
Fixed the JSDoc emission to allow for fully qualified type names as a parameter.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/183b4c8a
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/183b4c8a
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/183b4c8a
Branch: refs/heads/develop_strictest
Commit: 183b4c8a8ffed4a14a101c651bac36f966ed0831
Parents: 44fbfcd
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Nov 13 10:00:43 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Nov 13 10:00:43 2013 +0100
----------------------------------------------------------------------
.../internal/codegen/js/goog/JSGoogDocEmitter.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/183b4c8a/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 44f8f16..96571de 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
@@ -280,9 +280,22 @@ public class JSGoogDocEmitter extends JSDocEmitter implements IJSGoogDocEmitter
String paramType = "";
if (node.isRest())
+ {
paramType = ASEmitterTokens.ELLIPSIS.getToken();
+ }
else
- paramType = convertASTypeToJS(node.getVariableType(), packageName);
+ {
+ String typeName = node.getVariableType();
+ if (typeName.indexOf(packageName) > -1)
+ {
+ String[] parts = typeName.split("\\.");
+ if (parts.length > 0)
+ {
+ typeName = parts[parts.length - 1];
+ }
+ }
+ paramType = convertASTypeToJS(typeName, packageName);
+ }
emitJSDocLine(JSGoogDocEmitterTokens.PARAM, paramType + postfix,
node.getName());
[3/5] git commit: [flex-falcon] [refs/heads/develop_strictest] -
'@this' JSDoc annotation not needed for methods on the class prototype.
Posted by er...@apache.org.
'@this' JSDoc annotation not needed for methods on the class prototype.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/26be7272
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/26be7272
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/26be7272
Branch: refs/heads/develop_strictest
Commit: 26be7272d866a6929502f0f1986851bbc4e8c594
Parents: 183b4c8
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Nov 13 10:48:56 2013 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Nov 13 10:48:56 2013 +0100
----------------------------------------------------------------------
.../internal/codegen/js/flexjs/JSFlexJSDocEmitter.java | 13 -------------
.../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 8 --------
2 files changed, 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/26be7272/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 66dab8b..b5e78f7 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
@@ -89,19 +89,6 @@ public class JSFlexJSDocEmitter extends JSGoogDocEmitter
emitMethodAccess(node);
hasDoc = true;
}
-
- // @this
- if (containsThisReference(node))
- {
- if (!hasDoc)
- {
- begin();
- emitMethodAccess(node);
- hasDoc = true;
- }
-
- emitThis(classDefinition, classDefinition.getPackageName());
- }
}
// @param
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/26be7272/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index 732fc4b..4dfbf36 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -20,7 +20,6 @@
package org.apache.flex.compiler.internal.codegen.mxml.flexjs;
-import java.io.File;
import java.io.FilterWriter;
import java.util.ArrayList;
import java.util.List;
@@ -266,7 +265,6 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
writeNewline("/**");
writeNewline(" * @expose");
- writeNewline(" * @this {" + cname + "}");
writeNewline(" */");
writeNewline(cname
+ ".prototype._bindings = [");
@@ -560,7 +558,6 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
for (MXMLEventSpecifier event : events)
{
writeNewline("/**");
- writeNewline(" * @this {" + cname + "}");
writeNewline(" * @expose");
writeNewline(" * @param {" + event.type + "} event");
writeNewline(" */");
@@ -589,7 +586,6 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
{
writeNewline("/**");
writeNewline(" * @expose");
- writeNewline(" * @this {" + cname + "}");
writeNewline(" * @return {" + instance.name + "}");
writeNewline(" */");
writeNewline(cname
@@ -603,7 +599,6 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
writeNewline();
writeNewline("/**");
writeNewline(" * @expose");
- writeNewline(" * @this {" + cname + "}");
writeNewline(" * @param {" + instance.name + "} value");
writeNewline(" */");
writeNewline(cname
@@ -635,7 +630,6 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
writeNewline("/**");
writeNewline(" * @override");
- writeNewline(" * @this {" + cname + "}");
writeNewline(" * @return {Array} the Array of UI element descriptors.");
writeNewline(" */");
writeNewline(cname + ".prototype.get_MXMLDescriptor = function()");
@@ -678,7 +672,6 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
{
writeNewline("/**");
writeNewline(" * @override");
- writeNewline(" * @this {" + cname + "}");
writeNewline(" * @return {Array} the Array of UI element descriptors.");
writeNewline(" */");
writeNewline(cname + ".prototype.get_MXMLProperties = function()");
@@ -1343,7 +1336,6 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
writeNewline();
writeNewline("/**");
writeNewline(" * @expose");
- writeNewline(" * @this {" + cname + "}");
writeNewline(" */");
StringBuilder sb = new StringBuilder();
sb.append(cname);