|
@@ -4,7 +4,7 @@ import type { UABaseNode } from './UABaseNode';
|
|
import { UAVariable } from './UAVariable';
|
|
import { UAVariable } from './UAVariable';
|
|
import { UAMethod } from './UAMethod';
|
|
import { UAMethod } from './UAMethod';
|
|
import { NamespaceTable } from './NameSpaceTable';
|
|
import { NamespaceTable } from './NameSpaceTable';
|
|
-import { Model } from './Model';
|
|
|
|
|
|
+import { UAModel } from './UAModel';
|
|
import { XMLElem, type IToXML } from '@/util/XmlElem';
|
|
import { XMLElem, type IToXML } from '@/util/XmlElem';
|
|
import { UAReferenceType } from './UAReferenceType';
|
|
import { UAReferenceType } from './UAReferenceType';
|
|
import { UAObjectType } from './UAObjectType';
|
|
import { UAObjectType } from './UAObjectType';
|
|
@@ -16,14 +16,15 @@ import { UAAlias } from './UAAlias';
|
|
export class UANodeSet implements IToXML{
|
|
export class UANodeSet implements IToXML{
|
|
|
|
|
|
constructor(public fileName: string,
|
|
constructor(public fileName: string,
|
|
- public models: Model[],
|
|
|
|
|
|
+ public models: UAModel[],
|
|
public aliases: UAAlias[],
|
|
public aliases: UAAlias[],
|
|
public nodes: UABaseNode[],
|
|
public nodes: UABaseNode[],
|
|
public nameSpaceTable: NamespaceTable,
|
|
public nameSpaceTable: NamespaceTable,
|
|
|
|
+ public xmlns: string,
|
|
public xmlns_xsi: string,
|
|
public xmlns_xsi: string,
|
|
public xmlns_xsd: string,
|
|
public xmlns_xsd: string,
|
|
public lastModified: string,
|
|
public lastModified: string,
|
|
- public xmlns: string) {
|
|
|
|
|
|
+ ) {
|
|
}
|
|
}
|
|
|
|
|
|
reIndex(nst: NamespaceTable) {
|
|
reIndex(nst: NamespaceTable) {
|
|
@@ -132,10 +133,10 @@ export class UANodeSet implements IToXML{
|
|
for(const xmlAlias of xmlAliases.Alias) {
|
|
for(const xmlAlias of xmlAliases.Alias) {
|
|
aliases.push(UAAlias.fromXML(xmlAlias));
|
|
aliases.push(UAAlias.fromXML(xmlAlias));
|
|
}
|
|
}
|
|
- const models: Model[]=[];
|
|
|
|
|
|
+ const models: UAModel[]=[];
|
|
const xmlModels=xmlObj['UANodeSet']['Models']||[];
|
|
const xmlModels=xmlObj['UANodeSet']['Models']||[];
|
|
for(const xmlModel of xmlModels.Model) {
|
|
for(const xmlModel of xmlModels.Model) {
|
|
- models.push(Model.fromXML(xmlModel));
|
|
|
|
|
|
+ models.push(UAModel.fromXML(xmlModel));
|
|
}
|
|
}
|
|
const nodes:UABaseNode[]=[];
|
|
const nodes:UABaseNode[]=[];
|
|
const xmlObjects=xmlObj['UANodeSet']['UAObject']||[];
|
|
const xmlObjects=xmlObj['UANodeSet']['UAObject']||[];
|
|
@@ -168,6 +169,6 @@ export class UANodeSet implements IToXML{
|
|
nst.addUri(nsUri['#text'])
|
|
nst.addUri(nsUri['#text'])
|
|
}
|
|
}
|
|
|
|
|
|
- return new UANodeSet(fileName, models, aliases, nodes, nst, xmlObj['UANodeSet']['@_xmlns'], xmlObj['UANodeSet']['@_xmlns:xsd'], xmlObj['UANodeSet']['@_xmlns:xsi'], xmlObj['UANodeSet']['@_LastModified']);
|
|
|
|
|
|
+ return new UANodeSet(fileName, models, aliases, nodes, nst, xmlObj['UANodeSet']['@_xmlns'], xmlObj['UANodeSet']['@_xmlns:xsi'], xmlObj['UANodeSet']['@_xmlns:xsd'], xmlObj['UANodeSet']['@_LastModified']);
|
|
}
|
|
}
|
|
}
|
|
}
|