This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 16a72bd First step of getting this to work in release
16a72bd is described below
commit 16a72bd66536807e74c74dbe68fe9d0b45806134
Author: Harbs <[email protected]>
AuthorDate: Tue Feb 6 19:04:58 2018 +0200
First step of getting this to work in release
---
.../ASDoc/src/main/royale/models/ASDocModel.as | 23 +++++-----
.../ASDoc/src/main/royale/valueObjects/DataVO.as | 50 ++++++++++++++++++++++
2 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as
b/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as
index 1515e28..ecf68d5 100644
--- a/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as
+++ b/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as
@@ -22,6 +22,7 @@ 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
{
@@ -59,7 +60,7 @@ package models
{
app.service.removeEventListener("complete", configCompleteHandler);
var config:Object = JSON.parse(app.service.data);
- tagNameMap = config.tagNames;
+ tagNameMap = config["tagNames"];
app.service.addEventListener("complete", tagsCompleteHandler);
app.service.url = "tags.json";
@@ -70,7 +71,7 @@ package models
{
app.service.removeEventListener("complete", tagsCompleteHandler);
var config:Object = JSON.parse(app.service.data);
- _knownTags = config.tags;
+ _knownTags = config["tags"];
app.service.addEventListener("complete", completeHandler);
app.service.url = "classlist.json";
@@ -81,7 +82,7 @@ package models
public function get allClasses():Array
{
- return masterData.classnames;
+ return masterData["classnames"];
}
private function completeHandler(event:Event):void
@@ -94,7 +95,7 @@ package models
private function filterPackageList():void
{
var packages:Object = {};
- for each (var qname:String in masterData.classnames)
+ for each (var qname:String in masterData["classnames"])
{
var packageName:String;
var c:int = qname.lastIndexOf(".")
@@ -202,7 +203,7 @@ package models
private function completeClassHandler(event:Event):void
{
app.service.removeEventListener("complete", completeClassHandler);
- var data:Object = JSON.parse(app.service.data);
+ var data:DataVO = new DataVO(JSON.parse(app.service.data));
if (_currentClassData == null)
{
_currentClassData = data;
@@ -233,7 +234,7 @@ package models
{
addIfNeededAndMakeAttributes(_publicProperties, m);
}
- if (masterData.classnames.indexOf(m.return) != -1)
+ if (masterData["classnames"].indexOf(m.return) != -1)
{
var href:String = m.return;
var c:int = href.lastIndexOf(".");
@@ -250,7 +251,7 @@ package models
{
m.shortDescription = makeShortDescription(m.description);
addIfNeededAndMakeAttributes(_publicEvents, m);
- if (masterData.classnames.indexOf(m.type) != -1)
+ if (masterData["classnames"].indexOf(m.type) != -1)
{
href = m.type;
c = href.lastIndexOf(".");
@@ -382,7 +383,7 @@ package models
for (var i:int = 0; i < n; i++)
{
var param:Object = data.params[i];
- if (masterData.classnames.indexOf(param.type)
!= -1)
+ if
(masterData["classnames"].indexOf(param.type) != -1)
{
var href:String = param.type;
var c:int = href.lastIndexOf(".");
@@ -415,7 +416,7 @@ package models
private function completeInterfaceHandler(event:Event):void
{
app.service.removeEventListener("complete",
completeInterfaceHandler);
- var data:Object = JSON.parse(app.service.data);
+ var data:DataVO = new DataVO(JSON.parse(app.service.data));
if (_currentClassData == null)
{
_currentClassData = data;
@@ -452,7 +453,7 @@ package models
{
m.shortDescription = makeShortDescription(m.description);
addIfNeededAndMakeAttributes(_publicEvents, m);
- if (masterData.classnames.indexOf(m.type) != -1)
+ if (masterData["classnames"].indexOf(m.type) != -1)
{
var href:String = m.type;
var c:int = href.lastIndexOf(".");
@@ -550,7 +551,7 @@ package models
if (c != -1)
end = end.substr(c + 1);
var data:Object = {label: end };
- if (masterData.classnames.indexOf(p) != -1)
+ if (masterData["classnames"].indexOf(p) != -1)
{
c = p.lastIndexOf(".");
if (c != -1)
diff --git a/examples/royale/ASDoc/src/main/royale/valueObjects/DataVO.as
b/examples/royale/ASDoc/src/main/royale/valueObjects/DataVO.as
new file mode 100644
index 0000000..cc4d5d8
--- /dev/null
+++ b/examples/royale/ASDoc/src/main/royale/valueObjects/DataVO.as
@@ -0,0 +1,50 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "Licens"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package valueObjects
+{
+ public class DataVO
+ {
+ public function DataVO(params:Object)
+ {
+ baseClassname = params["baseClassname"] || "";
+ if(params["baseInterfaceNames"])
+ baseInterfaceNames = params["baseInterfaceNames"];
+
+ if(params["events"])
+ events = params["events"];
+
+ if(params["members"])
+ members = params["members"];
+
+ qname = params["qname"] || "";
+
+ if(params["tags"])
+ tags = params["tags"];
+
+ type = params["type"] || "";
+ }
+ public var baseClassname:String;
+ public var baseInterfaceNames:Array;
+ public var events:Array;
+ public var members:Array;
+ public var qname:String;
+ public var tags:Array;
+ public var type:String;
+ }
+}
--
To stop receiving notification emails like this one, please contact
[email protected].
