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

* commit '21e9ad2fba6f0d726c159412a25324751c02eafb':
  REPORT-52212 【10.0.16冒烟】切换远程出现白色弹窗 update 遗漏的
  REPORT-52212 【10.0.16冒烟】切换远程出现白色弹窗

designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@@ -95,7 +95,9 @@ public class EnvChangeEntrance {
      * @param envName 目标工作目录名称
      */
     public void switch2Env(final String envName) {
-        switch2Env(envName, PopTipStrategy.LATER);
+        if (switch2Env(envName, PopTipStrategy.LATER)) {
+            PopTipStrategy.LATER.showTip(new SuccessPopTip());
+        }
     }
 
     /**
@@ -117,7 +119,7 @@ public class EnvChangeEntrance {
                     @Override
                     public void show() {
                         FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
                     }
                 });
                 return false;
@@ -155,7 +157,7 @@ public class EnvChangeEntrance {
                 public void show() {
                     FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                                                       Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                                                      Toolkit.i18nText("Fine-Design_Basic_Error"),
+                                                      Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
                                                       ERROR_MESSAGE,
                                                       UIManager.getIcon("OptionPane.errorIcon"));
                 }
@@ -171,7 +173,7 @@ public class EnvChangeEntrance {
                 FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
                 strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                                                                          Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                                                                         Toolkit.i18nText("Fine-Design_Basic_Error"),
+                                                                         Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
                                                                          ERROR_MESSAGE,
                                                                          UIManager.getIcon("OptionPane.errorIcon")));
             }
@@ -191,7 +193,7 @@ public class EnvChangeEntrance {
         if (ComparatorUtils.equals(result, TestConnectionResult.AUTH_FAILED)) {
             strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                                                                      Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                                                                     Toolkit.i18nText("Fine-Design_Basic_Error"),
+                                                                     Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
                                                                      ERROR_MESSAGE,
                                                                      UIManager.getIcon("OptionPane.errorIcon")));
         } else {
@@ -444,7 +446,9 @@ public class EnvChangeEntrance {
 
             @Override
             public void doOk() {
-                envListOkAction(envListPane, PopTipStrategy.LATER);
+                if (envListOkAction(envListPane, PopTipStrategy.LATER)) {
+                    PopTipStrategy.LATER.showTip(new SuccessPopTip());
+                }
                 // 切换完成后清理密码
                 updateNotRememberPwdEnv();
             }
@@ -553,4 +557,14 @@ public class EnvChangeEntrance {
     interface PopTip {
         void show();
     }
+
+    private static class SuccessPopTip implements PopTip {
+        @Override
+        public void show() {
+            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                                              Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Success"),
+                                              Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                                              FineJOptionPane.INFORMATION_MESSAGE);
+        }
+    }
 }

designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java

@@ -52,7 +52,6 @@ public class DesignerWorkspaceActivator extends Activator {
 
             @Override
             public void on(Event event, Workspace workspace) {
-                WorkspaceChangeLoadingDialog.showDialog();
                 PluginClassRefreshManager.getInstance().removePluginListener();
                 HistoryTemplateListCache.getInstance().stash();
             }
@@ -64,7 +63,6 @@ public class DesignerWorkspaceActivator extends Activator {
             @Override
             public void on(Event event, Workspace workspace) {
 
-                HistoryTemplateListCache.getInstance().load();
                 PluginClassRefreshManager.getInstance().addPluginListener();
                 WorkspaceChangeLoadingDialog.hideDialog();
             }