This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit c78dce39e19962a3c6251d784af462f7ab3938f9 Author: Alex Harui <[email protected]> AuthorDate: Thu Feb 15 19:24:23 2018 -0800 update ASDoc to use generated VOs --- examples/royale/ASDoc/src/main/royale/ASDoc.mxml | 1 + .../ASDoc/src/main/royale/EventDetailRenderer.mxml | 11 ++-- .../src/main/royale/EventSummaryRenderer.mxml | 12 ++-- .../src/main/royale/MethodDetailRenderer.mxml | 18 +++--- .../src/main/royale/MethodSummaryRenderer.mxml | 18 +++--- .../src/main/royale/PropertyDetailRenderer.mxml | 14 ++--- .../ASDoc/src/main/royale/SummaryRenderer.mxml | 16 +++-- .../ASDoc/src/main/royale/models/ASDocModel.as | 70 +++++++++++----------- 8 files changed, 75 insertions(+), 85 deletions(-) diff --git a/examples/royale/ASDoc/src/main/royale/ASDoc.mxml b/examples/royale/ASDoc/src/main/royale/ASDoc.mxml index 44ff6a0..95226e1 100644 --- a/examples/royale/ASDoc/src/main/royale/ASDoc.mxml +++ b/examples/royale/ASDoc/src/main/royale/ASDoc.mxml @@ -49,6 +49,7 @@ limitations under the License. <js:beads> <js:HTTPService id="service"> </js:HTTPService> + <js:JSONReviver id="reviver" /> <js:ViewSourceContextMenuOption /> </js:beads> </js:Application> diff --git a/examples/royale/ASDoc/src/main/royale/EventDetailRenderer.mxml b/examples/royale/ASDoc/src/main/royale/EventDetailRenderer.mxml index 647e210..d471f11 100644 --- a/examples/royale/ASDoc/src/main/royale/EventDetailRenderer.mxml +++ b/examples/royale/ASDoc/src/main/royale/EventDetailRenderer.mxml @@ -24,7 +24,6 @@ limitations under the License. width="100%"> <fx:Script> <![CDATA[ - import valueObjects.ValueObject; override public function set data(value:Object):void { @@ -41,9 +40,9 @@ limitations under the License. } [Bindable("dataChange")] - public function get obj():ValueObject + public function get obj():ASDocClassEvents { - return data as ValueObject; + return data as ASDocClassEvents; } ]]> </fx:Script> @@ -65,10 +64,10 @@ limitations under the License. <js:HorizontalLayout /> </js:beads> <js:Label className="eventQName" text="Event Object Type:" /> - <js:Label id="label" className="eventType" text="{ValueObject(data).type}" /> - <html:A id="link" className="eventTypeLink" text="{ValueObject(data).type}" href="{ValueObject(data).typehref}" /> + <js:Label id="label" className="eventType" text="{ASDocClassEvents(data).type}" /> + <html:A id="link" className="eventTypeLink" text="{ASDocClassEvents(data).type}" href="{ASDocClassEvents(data).typehref}" /> </js:Group> - <js:DataContainer id="attributes" className="attributeList" dataProvider="{ValueObject(data).attributes}" + <js:DataContainer id="attributes" className="attributeList" dataProvider="{ASDocClassEvents(data).attributes}" itemRenderer="AttributeRenderer" width="100%"/> <js:MultilineLabel id="description" width="100%" text="{obj.description}"/> </js:MXMLItemRenderer> diff --git a/examples/royale/ASDoc/src/main/royale/EventSummaryRenderer.mxml b/examples/royale/ASDoc/src/main/royale/EventSummaryRenderer.mxml index 71b56a2..9b07571 100644 --- a/examples/royale/ASDoc/src/main/royale/EventSummaryRenderer.mxml +++ b/examples/royale/ASDoc/src/main/royale/EventSummaryRenderer.mxml @@ -24,8 +24,6 @@ limitations under the License. width="100%"> <fx:Script> <![CDATA[ - import valueObjects.ValueObject; - private var _color0:String = "#fff"; public function get backgroundColor0():String @@ -56,11 +54,11 @@ limitations under the License. [Bindable("dataChange")] /** - @royaleignorecoercion ValueObject + @royaleignorecoercion ASDocClassEvents */ - public function get obj():ValueObject + public function get obj():ASDocClassEvents { - return data as ValueObject; + return data as ASDocClassEvents; } private var oddIndex:Boolean; @@ -102,7 +100,7 @@ limitations under the License. <js:beads> <js:HorizontalLayout /> </js:beads> - <html:A id="qname" className="eventSummaryQName" text="{ValueObject(data).qname}" /> - <js:Label id="label" className="eventDescription" text="{ValueObject(data).shortDescription}" /> + <html:A id="qname" className="eventSummaryQName" text="{ASDocClassEvents(data).qname}" /> + <js:Label id="label" className="eventDescription" text="{ASDocClassEvents(data).shortDescription}" /> </js:Group> </js:MXMLItemRenderer> diff --git a/examples/royale/ASDoc/src/main/royale/MethodDetailRenderer.mxml b/examples/royale/ASDoc/src/main/royale/MethodDetailRenderer.mxml index ead25dd..c02abfb 100644 --- a/examples/royale/ASDoc/src/main/royale/MethodDetailRenderer.mxml +++ b/examples/royale/ASDoc/src/main/royale/MethodDetailRenderer.mxml @@ -23,9 +23,7 @@ limitations under the License. className="property" width="100%"> <fx:Script> - <![CDATA[ - import valueObjects.ValueObject; - + <![CDATA[ override public function set data(value:Object):void { super.data = value; @@ -41,9 +39,9 @@ limitations under the License. } [Bindable("dataChange")] - public function get obj():ValueObject + public function get obj():ASDocClassMembers { - return data as ValueObject; + return data as ASDocClassMembers; } ]]> </fx:Script> @@ -64,19 +62,19 @@ limitations under the License. <js:beads> <js:HorizontalLayout /> </js:beads> - <js:Label className="propertyQName" text="{ValueObject(data).qname}" /> + <js:Label className="propertyQName" text="{ASDocClassMembers(data).qname}" /> <js:Label text="(" /> - <js:DataContainer id="params" dataProvider="{ValueObject(data).params}" style="border-style:none" + <js:DataContainer id="params" dataProvider="{ASDocClassMembers(data).params}" style="border-style:none" itemRenderer="ParameterRenderer"> <js:beads> <js:HorizontalLayout /> </js:beads> </js:DataContainer> <js:Label text="):" /> - <js:Label id="label" className="propertyType" text="{ValueObject(data).return}" /> - <html:A id="link" className="propertyTypeLink" text="{ValueObject(data).return}" href="{ValueObject(data).returnhref}" /> + <js:Label id="label" className="propertyType" text="{ASDocClassMembers(data).return}" /> + <html:A id="link" className="propertyTypeLink" text="{ASDocClassMembers(data).return}" href="{ASDocClassMembers(data).returnhref}" /> </js:Group> - <js:DataContainer id="attributes" className="attributeList" dataProvider="{ValueObject(data).attributes}" + <js:DataContainer id="attributes" className="attributeList" dataProvider="{ASDocClassMembers(data).attributes}" itemRenderer="AttributeRenderer" width="100%"/> <js:MultilineLabel id="description" width="100%" text="{obj.description}"/> </js:MXMLItemRenderer> diff --git a/examples/royale/ASDoc/src/main/royale/MethodSummaryRenderer.mxml b/examples/royale/ASDoc/src/main/royale/MethodSummaryRenderer.mxml index cdad7b3..6f1790c 100644 --- a/examples/royale/ASDoc/src/main/royale/MethodSummaryRenderer.mxml +++ b/examples/royale/ASDoc/src/main/royale/MethodSummaryRenderer.mxml @@ -24,8 +24,6 @@ limitations under the License. width="100%"> <fx:Script> <![CDATA[ - import valueObjects.ValueObject; - private var _color0:String = "#fff"; public function get backgroundColor0():String @@ -62,11 +60,11 @@ limitations under the License. [Bindable("dataChange")] /** - @royaleignorecoercion ValueObject + @royaleignorecoercion ASDocClassMembers */ - public function get obj():ValueObject + public function get obj():ASDocClassMembers { - return data as ValueObject; + return data as ASDocClassMembers; } override public function addedToParent():void @@ -106,17 +104,17 @@ limitations under the License. <js:beads> <js:HorizontalLayout /> </js:beads> - <html:A id="qname" className="summaryQName" text="{ValueObject(data).qname}" /> + <html:A id="qname" className="summaryQName" text="{ASDocClassMembers(data).qname}" /> <js:Label text="(" /> - <js:DataContainer id="params" dataProvider="{ValueObject(data).params}" style="border-style:none" + <js:DataContainer id="params" dataProvider="{ASDocClassMembers(data).params}" style="border-style:none" itemRenderer="ParameterRenderer"> <js:beads> <js:HorizontalLayout /> </js:beads> </js:DataContainer> <js:Label text="):" /> - <js:Label id="label" className="summaryType" text="{ValueObject(data).return}" /> - <html:A id="link" className="summaryTypeLink" text="{ValueObject(data).return}" href="{ValueObject(data).returnhref}" /> + <js:Label id="label" className="summaryType" text="{ASDocClassMembers(data).return}" /> + <html:A id="link" className="summaryTypeLink" text="{ASDocClassMembers(data).return}" href="{ASDocClassMembers(data).returnhref}" /> </js:Group> - <js:MultilineLabel className="summaryDescription" id="short" width="100%" text="{ValueObject(data).shortDescription}"/> + <js:MultilineLabel className="summaryDescription" id="short" width="100%" text="{ASDocClassMembers(data).shortDescription}"/> </js:MXMLItemRenderer> diff --git a/examples/royale/ASDoc/src/main/royale/PropertyDetailRenderer.mxml b/examples/royale/ASDoc/src/main/royale/PropertyDetailRenderer.mxml index a6ed1d6..ce6dc68 100644 --- a/examples/royale/ASDoc/src/main/royale/PropertyDetailRenderer.mxml +++ b/examples/royale/ASDoc/src/main/royale/PropertyDetailRenderer.mxml @@ -24,8 +24,6 @@ limitations under the License. width="100%"> <fx:Script> <![CDATA[ - import valueObjects.ValueObject; - override public function set data(value:Object):void { super.data = value; @@ -41,9 +39,9 @@ limitations under the License. } [Bindable("dataChange")] - public function get obj():ValueObject + public function get obj():ASDocClassMembers { - return data as ValueObject; + return data as ASDocClassMembers; } ]]> </fx:Script> @@ -64,12 +62,12 @@ limitations under the License. <js:beads> <js:HorizontalLayout /> </js:beads> - <js:Label className="propertyQName" text="{ValueObject(data).qname}" /> + <js:Label className="propertyQName" text="{ASDocClassMembers(data).qname}" /> <js:Label text=":" /> - <js:Label id="label" className="propertyType" text="{ValueObject(data).return}" /> - <html:A id="link" className="propertyTypeLink" text="{ValueObject(data).return}" href="{ValueObject(data).returnhref}" /> + <js:Label id="label" className="propertyType" text="{ASDocClassMembers(data).return}" /> + <html:A id="link" className="propertyTypeLink" text="{ASDocClassMembers(data).return}" href="{ASDocClassMembers(data).returnhref}" /> </js:Group> - <js:DataContainer id="attributes" className="attributeList" dataProvider="{ValueObject(data).attributes}" + <js:DataContainer id="attributes" className="attributeList" dataProvider="{ASDocClassMembers(data).attributes}" itemRenderer="AttributeRenderer" width="100%"/> <js:MultilineLabel id="description" width="100%" text="{obj.description}"/> </js:MXMLItemRenderer> diff --git a/examples/royale/ASDoc/src/main/royale/SummaryRenderer.mxml b/examples/royale/ASDoc/src/main/royale/SummaryRenderer.mxml index 33bfd62..974e664 100644 --- a/examples/royale/ASDoc/src/main/royale/SummaryRenderer.mxml +++ b/examples/royale/ASDoc/src/main/royale/SummaryRenderer.mxml @@ -24,8 +24,6 @@ limitations under the License. width="100%"> <fx:Script> <![CDATA[ - import valueObjects.ValueObject; - private var _color0:String = "#fff"; public function get backgroundColor0():String @@ -62,11 +60,11 @@ limitations under the License. [Bindable("dataChange")] /** - @royaleignorecoercion ValueObject + @royaleignorecoercion ASDocClassMembers */ - public function get obj():ValueObject + public function get obj():ASDocClassMembers { - return data as ValueObject; + return data as ASDocClassMembers; } override public function addedToParent():void @@ -106,10 +104,10 @@ limitations under the License. <js:beads> <js:HorizontalLayout /> </js:beads> - <html:A id="qname" className="summaryQName" text="{ValueObject(data).qname}" /> + <html:A id="qname" className="summaryQName" text="{ASDocClassMembers(data).qname}" /> <js:Label text=":" /> - <js:Label id="label" className="summaryType" text="{ValueObject(data).return}" /> - <html:A id="link" className="summaryTypeLink" text="{ValueObject(data).return}" href="{ValueObject(data).returnhref}" /> + <js:Label id="label" className="summaryType" text="{ASDocClassMembers(data).return}" /> + <html:A id="link" className="summaryTypeLink" text="{ASDocClassMembers(data).return}" href="{ASDocClassMembers(data).returnhref}" /> </js:Group> - <js:MultilineLabel className="summaryDescription" id="short" width="100%" text="{ValueObject(data).shortDescription}"/> + <js:MultilineLabel className="summaryDescription" id="short" width="100%" text="{ASDocClassMembers(data).shortDescription}"/> </js:MXMLItemRenderer> diff --git a/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as b/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as index f544d03..bd7fcf6 100644 --- a/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as +++ b/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as @@ -22,7 +22,6 @@ package models import org.apache.royale.core.IStrand; import org.apache.royale.events.Event; import org.apache.royale.events.EventDispatcher; - import valueObjects.DataVO; public class ASDocModel extends EventDispatcher implements IBeadModel { @@ -203,7 +202,7 @@ package models private function completeClassHandler(event:Event):void { app.service.removeEventListener("complete", completeClassHandler); - var data:DataVO = new DataVO(JSON.parse(app.service.data)); + var data:ASDocClass = app.reviver.parse(app.service.data) as ASDocClass; if (_currentClassData == null) { _currentClassData = data; @@ -218,7 +217,7 @@ package models } else _baseClassList.push(data.qname); - for each (var m:Object in data.members) + for each (var m:ASDocClassMembers in data.members) { m.shortDescription = makeShortDescription(m.description); if (m.type == "method") @@ -247,27 +246,27 @@ package models } } - for each (m in data.events) + for each (var e:ASDocClassEvents in data.events) { - m.shortDescription = makeShortDescription(m.description); - addIfNeededAndMakeAttributes(_publicEvents, m); - if (masterData["classnames"].indexOf(m.type) != -1) + e.shortDescription = makeShortDescription(e.description); + addIfNeededAndMakeAttributes(_publicEvents, e); + if (masterData["classnames"].indexOf(e.type) != -1) { - href = m.type; + href = e.type; c = href.lastIndexOf("."); if (c != -1) { - m.type = href.substr(c + 1); + e.type = href.substr(c + 1); href = href.substr(0, c) + "/" + href.substr(c + 1); } - m.typehref = "#!" +href; + e.typehref = "#!" +href; } } - for each (m in data.tags) + for each (var t:ASDocClassTags in data.tags) { - if (!_attributesMap[m.tagName]) + if (!_attributesMap[t.tagName]) { - _attributesMap[m.tagName] = m.values; + _attributesMap[t.tagName] = t.values; } } @@ -296,12 +295,12 @@ package models } } - private function addIfNeededAndMakeAttributes(arr:Array, data:Object):void + private function addIfNeededAndMakeAttributes(arr:Array, data:ASDocClassEvents):void { var n:int = arr.length; for (var i:int = 0; i < n; i++) { - var obj:Object = arr[i]; + var obj:ASDocClassEvents = arr[i]; if (obj.qname == data.qname) { // if no description and the base definition has one @@ -321,13 +320,13 @@ package models addAttributes(data, data); if (data.type == "method") { - processParams(data); + processParams(data as ASDocClassMembers); } data.ownerhref = currentPackage + "/" + currentClass; arr.push(data); } - private function addAttributes(dest:Object, src:Object):void + private function addAttributes(dest:ASDocClassEvents, src:ASDocClassEvents):void { if (!src.tags) return; @@ -338,12 +337,13 @@ package models } arr = dest.attributes; var map:Object = {}; - var tag:Object; + var attr:ASDocClassAttribute; + var tag:ASDocClassTags; var n:int = arr.length; for (var i:int = 0; i < n; i++) { - tag = arr[i]; - map[tag.name] = tag.value; + attr = arr[i]; + map[attr.name] = attr.value; } n = src.tags.length; for (i = 0; i < n; i++) @@ -351,7 +351,7 @@ package models tag = src.tags[i]; if (map[tag.tagName]) continue; - var obj:Object = {}; + var obj:ASDocClassAttribute = new ASDocClassAttribute(); var k:String = tagNameMap[tag.tagName]; if (k != null) obj.name = k; @@ -379,7 +379,7 @@ package models } } - private function processParams(data:Object):void + private function processParams(data:ASDocClassMembers):void { var n:int = data.params.length; for (var i:int = 0; i < n; i++) @@ -418,7 +418,7 @@ package models private function completeInterfaceHandler(event:Event):void { app.service.removeEventListener("complete", completeInterfaceHandler); - var data:DataVO = new DataVO(JSON.parse(app.service.data)); + var data:ASDocClass = app.reviver.parse(app.service.data) as ASDocClass; if (_currentClassData == null) { _currentClassData = data; @@ -433,7 +433,7 @@ package models } else _baseClassList.push(data.qname); - for each (var m:Object in data.members) + for each (var m:ASDocClassMembers in data.members) { m.shortDescription = makeShortDescription(m.description); if (m.type == "method") @@ -451,27 +451,27 @@ package models } } - for each (m in data.events) + for each (var e:ASDocClassEvents in data.events) { - m.shortDescription = makeShortDescription(m.description); - addIfNeededAndMakeAttributes(_publicEvents, m); - if (masterData["classnames"].indexOf(m.type) != -1) + e.shortDescription = makeShortDescription(e.description); + addIfNeededAndMakeAttributes(_publicEvents, e); + if (masterData["classnames"].indexOf(e.type) != -1) { - var href:String = m.type; + var href:String = e.type; var c:int = href.lastIndexOf("."); if (c != -1) { - m.type = href.substr(c + 1); + e.type = href.substr(c + 1); href = href.substr(0, c) + "/" + href.substr(c + 1); } - m.typehref = "#!" +href; + e.typehref = "#!" +href; } } - for each (m in data.tags) + for each (var t:ASDocClassTags in data.tags) { - if (!_attributesMap[m.tagName]) + if (!_attributesMap[t.tagName]) { - _attributesMap[m.tagName] = m.values; + _attributesMap[t.tagName] = t.values; } } if (data.baseInterfaceNames) @@ -648,7 +648,7 @@ package models filterPackageList(); } - public function filterByTags(classData:Object):Boolean + public function filterByTags(classData:ASDocClass):Boolean { var tags:Array = classData.tags; if (!tags) return false; -- To stop receiving notification emails like this one, please contact [email protected].
