@@ -83,11 +83,11 @@ Returns structured class tree with all classes available in current namespace</D
83
83
<Description >
84
84
Return structured data about class.</Description >
85
85
<ClassMethod >1</ClassMethod >
86
- <FormalSpec >oData:%ZEN.proxyObject,className:%String,level:%Integer ,currLevel:%Integer</FormalSpec >
86
+ <FormalSpec >oData:%ZEN.proxyObject,className:%String,level:%String="" ,currLevel:%Integer=0 </FormalSpec >
87
87
<Private >1</Private >
88
88
<ReturnType >%ZEN.proxyObject</ReturnType >
89
89
<Implementation ><![CDATA[
90
- if (($GET( level) '="")&&(+$GET( currLevel)>+$GET( level) )) quit ""
90
+ if ((level'="")&&(+currLevel>+ level)) quit ""
91
91
set currLevel=$increment(currLevel)
92
92
set classDefinition = ##class(%Dictionary.ClassDefinition).%OpenId(className)
93
93
set compiledClassDefinition = ##class(%Dictionary.CompiledClass).%OpenId(className)
@@ -122,13 +122,12 @@ Return structured data about class.</Description>
122
122
123
123
set oClass.Super = "" // do not quit with super at this moment
124
124
if (oData.restrictPackage) && ('..inPackage(oData.basePackageName, package)) quit oClass
125
- if (+$GET(level)=0) set oClass.Super = ..correctInheritance(oData, classDefinition, package) // now expand super names
125
+ set oClass.Super = ..correctInheritance(oData, classDefinition, package) // now expand super names
126
126
127
127
set oClass.properties = oProperties
128
128
set count = classDefinition.Properties.Count()
129
129
set props = ##class(%Dictionary.ClassDefinition).%OpenId("%Dictionary.PropertyDefinition")
130
130
for i=1:1:count {
131
- set ignore=""
132
131
set oProp = ##class(%ZEN.proxyObject).%New()
133
132
set p = classDefinition.Properties.GetAt(i)
134
133
do oProperties.%DispatchSetProperty(p.Name, oProp)
@@ -138,15 +137,13 @@ Return structured data about class.</Description>
138
137
}
139
138
if (..classExists(package _ "." _ p.Type)) {
140
139
set oProp.Type = package _ "." _ p.Type
141
- do ..fillClassData(oData, package _ "." _ p.Type, $GET(level), currLevel)
142
- set ignore=1
140
+ do ..fillClassData(oData, package _ "." _ p.Type, level, currLevel)
143
141
} elseif (..classExists(..extendClassFromType(p.Type))) {
144
142
set oProp.Type = ..extendClassFromType(p.Type)
145
- do ..fillClassData(oData, ..extendClassFromType(p.Type), $GET( level) , currLevel)
143
+ do ..fillClassData(oData, ..extendClassFromType(p.Type), level, currLevel)
146
144
} else {
147
145
set oProp.Type = ..extendClassFromType(p.Type)
148
146
}
149
- if (($GET(ignore)="")&&($GET(level)'="")&&(+$GET(currLevel)>1)) set oProp.Type = oProp.Type_$Char(32)
150
147
}
151
148
152
149
set oMethods = ##class(%ZEN.proxyObject).%New()
0 commit comments