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/omd/btm/ui/DeleteTypeDialog.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Client/PLTClient/src/com/vci/client/omd/btm/ui/DeleteTypeDialog.java b/Source/Client/PLTClient/src/com/vci/client/omd/btm/ui/DeleteTypeDialog.java index 0cdc0c6..0652f8c 100644 --- a/Source/Client/PLTClient/src/com/vci/client/omd/btm/ui/DeleteTypeDialog.java +++ b/Source/Client/PLTClient/src/com/vci/client/omd/btm/ui/DeleteTypeDialog.java @@ -26,7 +26,6 @@ import com.vci.corba.omd.stm.StatePool; import com.vci.client.common.providers.ServiceProvider; import com.vci.client.omd.attribpool.ui.APClient; -import com.vci.client.omd.enumManager.ui.EnumClient; import com.vci.client.omd.lifecycle.LifeCycleStart; import com.vci.client.omd.statepool.StatePoolStart; import com.vci.client.omd.versionrule.VRClientStart; @@ -163,7 +162,7 @@ updateTable(2, 1, "澶辫触"); } try { - EnumClient.getService().deleteEmItems(delEnumList.toArray(new EnumItem[0])); + ServiceProvider.getOMDService().getEnumService().deleteEmItems(delEnumList.toArray(new EnumItem[0])); updateTable(3, 1, "鎴愬姛"); } catch (VCIError e1) { e1.printStackTrace(); @@ -315,7 +314,7 @@ try { //渚濇嵁淇濈暀鐨勭被鍨嬫瀯閫犱繚鐣欑殑灞炴�� exceptEnums = new ArrayList<String>(); - EnumItem[] emItems = EnumClient.getService().getEmItems("", 0, 0); + EnumItem[] emItems = ServiceProvider.getOMDService().getEnumService().getEmItems("", 0, 0); AttribItem[] abs = APClient.getService().getAttribItemsByNames(exceptAbs.toArray(new String[0])); for(AttribItem ab : abs){ OtherInfo otherInfo = OtherInfo.getOtherInfoByText(ab.other); -- Gitblit v1.9.3