|
@@ -7,6 +7,8 @@ import { NamespaceTable } from './NameSpaceTable';
|
|
|
import { Model } from './Model';
|
|
|
import { XMLElem, type IToXML } from '@/util/XmlElem';
|
|
|
import { UAReferenceType } from './UAReferenceType';
|
|
|
+import { UAObjectType } from './UAObjectType';
|
|
|
+import { UAVariableType } from './UAVariableType';
|
|
|
|
|
|
export class UANodeSet implements IToXML{
|
|
|
|
|
@@ -68,10 +70,14 @@ export class UANodeSet implements IToXML{
|
|
|
case 'UANodeSet.Models.Model':
|
|
|
case 'UANodeSet.UAObject':
|
|
|
case 'UANodeSet.UAObject.References.Reference':
|
|
|
+ case 'UANodeSet.UAObjectType':
|
|
|
+ case 'UANodeSet.UAObjectType.References.Reference':
|
|
|
case 'UANodeSet.UAMethod':
|
|
|
case 'UANodeSet.UAMethod.References.Reference':
|
|
|
case 'UANodeSet.UAVariable':
|
|
|
case 'UANodeSet.UAVariable.References.Reference':
|
|
|
+ case 'UANodeSet.UAVariableType':
|
|
|
+ case 'UANodeSet.UAVariableType.References.Reference':
|
|
|
case 'UANodeSet.UAReferenceType':
|
|
|
case 'UANodeSet.UAReferenceType.References.Reference':
|
|
|
return true;
|
|
@@ -104,6 +110,14 @@ export class UANodeSet implements IToXML{
|
|
|
for(const xmlReferenceType of xmlReferenceTypes) {
|
|
|
nodes.push(UAReferenceType.fromXML(xmlReferenceType));
|
|
|
}
|
|
|
+ const xmlObjectTypes=xmlObj['UANodeSet']['UAObjectType']||[];
|
|
|
+ for(const xmlObjectType of xmlObjectTypes) {
|
|
|
+ nodes.push(UAObjectType.fromXML(xmlObjectType));
|
|
|
+ }
|
|
|
+ const xmlVariableTypes=xmlObj['UANodeSet']['UAVariableType']||[];
|
|
|
+ for(const xmlVariableType of xmlVariableTypes) {
|
|
|
+ nodes.push(UAVariableType.fromXML(xmlVariableType));
|
|
|
+ }
|
|
|
const uaNamespaceUris=xmlObj['UANodeSet']['NamespaceUris']||[];
|
|
|
const nst=new NamespaceTable();
|
|
|
for(const nsUri of uaNamespaceUris['Uri']||[]) {
|