From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001 From: ludc <ludc@vci-tech.com> Date: 星期四, 16 一月 2025 18:20:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/Client/PLTClient/src/com/vci/client/oq/ui/ExpQTDDialog.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Source/Client/PLTClient/src/com/vci/client/oq/ui/ExpQTDDialog.java b/Source/Client/PLTClient/src/com/vci/client/oq/ui/ExpQTDDialog.java index 6fee629..6cde532 100644 --- a/Source/Client/PLTClient/src/com/vci/client/oq/ui/ExpQTDDialog.java +++ b/Source/Client/PLTClient/src/com/vci/client/oq/ui/ExpQTDDialog.java @@ -28,6 +28,7 @@ import com.vci.corba.omd.ltm.LinkType; import com.vci.corba.omd.qtm.QTD; import com.vci.client.LogonApplication; +import com.vci.client.common.providers.ServiceProvider; import com.vci.client.framework.rightConfig.modelConfig.ModuleTreeCellRenderer; import com.vci.client.omd.provider.BtmProvider; import com.vci.client.omd.provider.LinkTypeProvider; @@ -76,7 +77,7 @@ for(int i=0;i<allBtItems.length;i++){ VCIBaseTreeNode node = new VCIBaseTreeNode(allBtItems[i].name,allBtItems[i]); treeModel.insertNodeInto(node, btmRoot, btmRoot.getChildCount()); - QTD[] qtdsByBtmName = QTDClient.getService().getBizTypeQTDs(allBtItems[i].name); + QTD[] qtdsByBtmName = ServiceProvider.getOMDService().getQTDService().getBizTypeQTDs(allBtItems[i].name); for(QTD qtd: qtdsByBtmName){ VCIBaseTreeNode qtdNode = new VCIBaseTreeNode(qtd.name,qtd); treeModel.insertNodeInto(qtdNode, node, node.getChildCount()); @@ -87,7 +88,7 @@ for(int i=0; i<linkTypes.length; i++){ VCIBaseTreeNode node = new VCIBaseTreeNode(linkTypes[i].name, linkTypes[i]); treeModel.insertNodeInto(node, linkRoot, linkRoot.getChildCount()); - QTD[] qtdsByLinkTypeName = QTDClient.getService().getLinkTypeQTDs(linkTypes[i].name); + QTD[] qtdsByLinkTypeName = ServiceProvider.getOMDService().getQTDService().getLinkTypeQTDs(linkTypes[i].name); for(QTD qtd: qtdsByLinkTypeName){ VCIBaseTreeNode qtdNode = new VCIBaseTreeNode(qtd.name,qtd); treeModel.insertNodeInto(qtdNode, node, node.getChildCount()); @@ -130,24 +131,24 @@ if(obj instanceof String){//濡傛灉鏄痳oot鑺傜偣锛屽垯淇濆瓨鎵�鏈夋ā鍧� String nodeName = (String)obj; if("root".equals(nodeName)){ - QTD[] allQTDS = QTDClient.getService().getAllQTDs(); + QTD[] allQTDS = ServiceProvider.getOMDService().getQTDService().getAllQTDs(); Collections.addAll(selQTDS, allQTDS); }else if("btm".equals(nodeName)){ - QTD[] allBTMQTDS = QTDClient.getService().getAllBizTypeQTDs(); + QTD[] allBTMQTDS = ServiceProvider.getOMDService().getQTDService().getAllBizTypeQTDs(); Collections.addAll(selQTDS, allBTMQTDS); }else if("link".equals(nodeName)){ - QTD[] allLinkQTDS = QTDClient.getService().getAllLinkTypeQTDs(); + QTD[] allLinkQTDS = ServiceProvider.getOMDService().getQTDService().getAllLinkTypeQTDs(); Collections.addAll(selQTDS, allLinkQTDS); } }else if(obj instanceof QTD){ selQTDS.add((QTD)obj); }else if(obj instanceof BtmItem){ BtmItem btmItem = (BtmItem)obj; - QTD[] qtdsByBtmName = QTDClient.getService().getBizTypeQTDs(btmItem.name); + QTD[] qtdsByBtmName = ServiceProvider.getOMDService().getQTDService().getBizTypeQTDs(btmItem.name); Collections.addAll(selQTDS, qtdsByBtmName); }else if(obj instanceof LinkType){ LinkType linkType = (LinkType)obj; - QTD[] qtdsByLinkTypeName = QTDClient.getService().getLinkTypeQTDs(linkType.name); + QTD[] qtdsByLinkTypeName = ServiceProvider.getOMDService().getQTDService().getLinkTypeQTDs(linkType.name); Collections.addAll(selQTDS, qtdsByLinkTypeName); } } -- Gitblit v1.9.3