diff --git a/designer_base/src/com/fr/design/extra/PluginOperateUtils.java b/designer_base/src/com/fr/design/extra/PluginOperateUtils.java index 9b661543b..fd107b913 100644 --- a/designer_base/src/com/fr/design/extra/PluginOperateUtils.java +++ b/designer_base/src/com/fr/design/extra/PluginOperateUtils.java @@ -296,21 +296,17 @@ public class PluginOperateUtils { && StringUtils.isNotEmpty(pluginView.getEnvVersion()); } - public static String getSuccessInfo(PluginTaskResult result){ + public static String getSuccessInfo(PluginTaskResult result) { StringBuilder pluginInfo = new StringBuilder(); - PluginTask currentTask = result.getCurrentTask(); - PluginContext context = PluginManager.getContext(currentTask.getMarker()); - if(context != null){ - pluginInfo.append(context.getName()); - } List pluginTaskResults = result.asList(); - for(PluginTaskResult pluginTaskResult : pluginTaskResults){ - List pluginTasks = pluginTaskResult.getPreTasks(); - for(PluginTask pluginTask : pluginTasks){ - PluginContext pluginContext = PluginManager.getContext(pluginTask.getMarker()); - if(pluginContext != null){ - pluginInfo.append(pluginContext.getName()); - } + for (PluginTaskResult pluginTaskResult : pluginTaskResults) { + if(pluginInfo.length() != 0){ + pluginInfo.append("、"); + } + PluginTask pluginTask = pluginTaskResult.getCurrentTask(); + PluginContext pluginContext = PluginManager.getContext(pluginTask.getMarker()); + if (pluginContext != null) { + pluginInfo.append(pluginContext.getName()); } } return pluginInfo.toString(); diff --git a/designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java b/designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java index 75a017705..2ad36842b 100644 --- a/designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java +++ b/designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java @@ -27,7 +27,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback { jsCallback.execute("success"); FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Delete_Success")); JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Delete_Success")); - }else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) { + }else if (result.errorCode() == PluginErrorCode.NeedUninstallDependingPluginFirst) { int rv = JOptionPane.showOptionDialog( null, Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Delete_Dependence")),