Merge pull request #3504 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '6407a41422dda19a76d3377e2fcd84f3b89921cb':
  REPORT-47193 插件管理提示弹窗优化
  REPORT-47193 插件管理提示弹窗优化

designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java

@@ -44,40 +44,32 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
             FineLoggerFactory.getLogger().info(successInfo);
             FineJOptionPane.showMessageDialog(null, successInfo);
         } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
-            int rv = FineJOptionPane.showOptionDialog(
+            int rv = FineJOptionPane.showConfirmDialog(
                     null,
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Dependence"),
+                    Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Dependence"),
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
+                    Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
-                    FineJOptionPane.YES_NO_CANCEL_OPTION,
+                    FineJOptionPane.OK_CANCEL_OPTION,
-                    FineJOptionPane.INFORMATION_MESSAGE,
+                    FineJOptionPane.INFORMATION_MESSAGE
-                    null,
-                    FineJOptionPane.OPTION_YES_NO_CANCEL,
-                    null
             );
-            if (rv == FineJOptionPane.NO_OPTION || rv == FineJOptionPane.CANCEL_OPTION || rv == FineJOptionPane.CLOSED_OPTION) {
+            if (rv == FineJOptionPane.OK_OPTION) {
-                return;
+                List<PluginTask> pluginTasks = result.getPreTasks();
+                for(PluginTask pluginTask : pluginTasks){
+                    PluginMarker marker = pluginTask.getMarker();
+                    PluginOperateUtils.installPluginOnline(marker, jsCallback);
+                }
+                PluginManager.getController().install(zipFile, new InstallFromDiskCallback(zipFile, jsCallback));
             }
-            List<PluginTask> pluginTasks = result.getPreTasks();
-            for(PluginTask pluginTask : pluginTasks){
-                PluginMarker marker = pluginTask.getMarker();
-                PluginOperateUtils.installPluginOnline(marker, jsCallback);
-            }
-            PluginManager.getController().install(zipFile, new InstallFromDiskCallback(zipFile, jsCallback));
         } else if(result.errorCode() == PluginErrorCode.HasLowerPluginWhenInstall){
-            int rv = FineJOptionPane.showOptionDialog(
+            int rv = FineJOptionPane.showConfirmDialog(
                     null,
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Install_Lower"),
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
-                    FineJOptionPane.YES_NO_CANCEL_OPTION,
+                    FineJOptionPane.OK_CANCEL_OPTION,
-                    FineJOptionPane.INFORMATION_MESSAGE,
+                    FineJOptionPane.INFORMATION_MESSAGE
-                    null,
-                    FineJOptionPane.OPTION_YES_NO_CANCEL,
-                    null
             );
-            if (rv == FineJOptionPane.NO_OPTION || rv == FineJOptionPane.CANCEL_OPTION || rv == FineJOptionPane.CLOSED_OPTION) {
+            if (rv == FineJOptionPane.OK_OPTION) {
-                return;
+                PluginOperateUtils.updatePluginFromDisk(zipFile, jsCallback);
             }
-            PluginOperateUtils.updatePluginFromDisk(zipFile, jsCallback);
         }else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"));

designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java

@@ -41,22 +41,20 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
             FineLoggerFactory.getLogger().info(successInfo);
             FineJOptionPane.showMessageDialog(null, successInfo);
         } else if(result.errorCode() == PluginErrorCode.HasLowerPluginWhenInstall){
-            int rv = FineJOptionPane.showOptionDialog(
+            int rv = FineJOptionPane.showConfirmDialog(
                     null,
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Install_Lower"),
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
-                    FineJOptionPane.YES_NO_CANCEL_OPTION,
+                    FineJOptionPane.OK_CANCEL_OPTION,
-                    FineJOptionPane.INFORMATION_MESSAGE,
+                    FineJOptionPane.INFORMATION_MESSAGE
-                    null,
-                    FineJOptionPane.OPTION_YES_NO_CANCEL,
-                    null
             );
-            if (rv == FineJOptionPane.NO_OPTION || rv == FineJOptionPane.CANCEL_OPTION || rv == FineJOptionPane.CLOSED_OPTION) {
+            if (rv == FineJOptionPane.OK_OPTION) {
+                PluginMarker pluginMarker = result.getCurrentTask().getMarker();
+                PluginOperateUtils.updatePluginOnline(pluginMarker, jsCallback);
+            }
+            else {
                 jsCallback.execute("success");
-                return;
             }
-            PluginMarker pluginMarker = result.getCurrentTask().getMarker();
-            PluginOperateUtils.updatePluginOnline(pluginMarker, jsCallback);
         } else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"));

designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java

@@ -31,20 +31,16 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
             FineLoggerFactory.getLogger().info(successInfo);
             FineJOptionPane.showMessageDialog(null, successInfo);
         }else if (result.errorCode() == PluginErrorCode.NeedUninstallDependingPluginFirst) {
-            int rv = FineJOptionPane.showOptionDialog(
+            int rv = FineJOptionPane.showConfirmDialog(
                     null,
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Dependence"),
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
-                    FineJOptionPane.YES_NO_CANCEL_OPTION,
+                    FineJOptionPane.OK_CANCEL_OPTION,
-                    FineJOptionPane.INFORMATION_MESSAGE,
+                    FineJOptionPane.INFORMATION_MESSAGE
-                    null,
-                    FineJOptionPane.OPTION_YES_NO_CANCEL,
-                    null
             );
-            if (rv == FineJOptionPane.CANCEL_OPTION || rv == FineJOptionPane.CLOSED_OPTION) {
+            if (rv == FineJOptionPane.OK_OPTION) {
-                return;
+                PluginManager.getController().uninstall(pluginMarker, true, new UninstallPluginCallback(pluginMarker, jsCallback));
             }
-            PluginManager.getController().uninstall(pluginMarker, true, new UninstallPluginCallback(pluginMarker, jsCallback));
         } else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Failed"));

designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java

@@ -43,40 +43,32 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
             FineLoggerFactory.getLogger().info(successInfo);
             FineJOptionPane.showMessageDialog(null, successInfo);
         } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
-            int rv = FineJOptionPane.showOptionDialog(
+            int rv = FineJOptionPane.showConfirmDialog(
                     null,
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Dependence"),
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
-                    FineJOptionPane.YES_NO_CANCEL_OPTION,
+                    FineJOptionPane.OK_CANCEL_OPTION,
-                    FineJOptionPane.INFORMATION_MESSAGE,
+                    FineJOptionPane.INFORMATION_MESSAGE
-                    null,
-                    FineJOptionPane.OPTION_YES_NO_CANCEL,
-                    null
             );
-            if (rv == FineJOptionPane.NO_OPTION || rv == FineJOptionPane.CANCEL_OPTION || rv == FineJOptionPane.CLOSED_OPTION) {
+            if (rv == FineJOptionPane.OK_OPTION) {
-                return;
+                List<PluginTask> pluginTasks = result.getPreTasks();
-            }
+                for(PluginTask pluginTask : pluginTasks){
-            List<PluginTask> pluginTasks = result.getPreTasks();
+                    PluginMarker marker = pluginTask.getMarker();
-            for(PluginTask pluginTask : pluginTasks){
+                    PluginOperateUtils.updatePluginOnline(marker, jsCallback);
-                PluginMarker marker = pluginTask.getMarker();
+                }
-                PluginOperateUtils.updatePluginOnline(marker, jsCallback);
+                PluginManager.getController().update(zipFile, new UpdateFromDiskCallback(zipFile, jsCallback));
             }
-            PluginManager.getController().update(zipFile, new UpdateFromDiskCallback(zipFile, jsCallback));
         } else if(result.errorCode() == PluginErrorCode.NoPluginToUpdate){
-            int rv = FineJOptionPane.showOptionDialog(
+            int rv = FineJOptionPane.showConfirmDialog(
                     null,
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_No_Plugin_Update"),
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
-                    FineJOptionPane.YES_NO_CANCEL_OPTION,
+                    FineJOptionPane.OK_CANCEL_OPTION,
-                    FineJOptionPane.INFORMATION_MESSAGE,
+                    FineJOptionPane.INFORMATION_MESSAGE
-                    null,
-                    FineJOptionPane.OPTION_YES_NO_CANCEL,
-                    null
             );
-            if (rv == FineJOptionPane.NO_OPTION || rv == FineJOptionPane.CANCEL_OPTION || rv == FineJOptionPane.CLOSED_OPTION) {
+            if (rv == FineJOptionPane.OK_OPTION) {
-                return;
+                PluginOperateUtils.installPluginFromDisk(zipFile, jsCallback);
             }
-            PluginOperateUtils.installPluginFromDisk(zipFile, jsCallback);
         }else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Failed"));