Browse Source

REPORT-2354 一些交互问题

master
kerry 7 years ago
parent
commit
c40f3371cd
  1. 12
      designer_base/src/com/fr/design/extra/PluginOperateUtils.java
  2. 2
      designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java

12
designer_base/src/com/fr/design/extra/PluginOperateUtils.java

@ -298,21 +298,17 @@ public class PluginOperateUtils {
public static String getSuccessInfo(PluginTaskResult result) { public static String getSuccessInfo(PluginTaskResult result) {
StringBuilder pluginInfo = new StringBuilder(); StringBuilder pluginInfo = new StringBuilder();
PluginTask currentTask = result.getCurrentTask();
PluginContext context = PluginManager.getContext(currentTask.getMarker());
if(context != null){
pluginInfo.append(context.getName());
}
List<PluginTaskResult> pluginTaskResults = result.asList(); List<PluginTaskResult> pluginTaskResults = result.asList();
for (PluginTaskResult pluginTaskResult : pluginTaskResults) { for (PluginTaskResult pluginTaskResult : pluginTaskResults) {
List<PluginTask> pluginTasks = pluginTaskResult.getPreTasks(); if(pluginInfo.length() != 0){
for(PluginTask pluginTask : pluginTasks){ pluginInfo.append("、");
}
PluginTask pluginTask = pluginTaskResult.getCurrentTask();
PluginContext pluginContext = PluginManager.getContext(pluginTask.getMarker()); PluginContext pluginContext = PluginManager.getContext(pluginTask.getMarker());
if (pluginContext != null) { if (pluginContext != null) {
pluginInfo.append(pluginContext.getName()); pluginInfo.append(pluginContext.getName());
} }
} }
}
return pluginInfo.toString(); return pluginInfo.toString();
} }

2
designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java

@ -27,7 +27,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
jsCallback.execute("success"); jsCallback.execute("success");
FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Delete_Success")); FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Delete_Success"));
JOptionPane.showMessageDialog(null, 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( int rv = JOptionPane.showOptionDialog(
null, null,
Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Delete_Dependence")), Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Delete_Dependence")),

Loading…
Cancel
Save