Merge pull request #519 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0

* commit 'fe66bd8aa18b782327909e1e3641e928cfe280e5':
  REPORT-11590 环境切换执行完毕后关闭选择对话框，启动时环境切换和9保持一致

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

@@ -52,19 +52,28 @@ public class EnvChangeEntrance {
         });
     }
 
-    private boolean envListOkAction(EnvListPane envListPane) {
+    private boolean envListOkAction(EnvListPane envListPane, PopTipStrategy strategy) {
         final String selectedName = envListPane.updateEnvManager();
-        return switch2Env(selectedName);
+        return switch2Env(selectedName, strategy);
     }
 
 
+    /**
+     * 切换到指定名称的工作目录
+     *
+     * @param envName 目标工作目录名称
+     */
+    public void switch2Env(final String envName) {
+        switch2Env(envName, PopTipStrategy.LATER);
+    }
+
     /**
      * 切换到新环境
      *
      * @param envName 新工作环境名称
      * @return 是否成功
      */
-    public boolean switch2Env(final String envName) {
+    private boolean switch2Env(final String envName, PopTipStrategy strategy) {
         DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
         DesignerWorkspaceInfo selectedEnv = envManager.getWorkspaceInfo(envName);
 
@@ -72,8 +81,13 @@ public class EnvChangeEntrance {
             Workspace workspace = DesignerWorkspaceGenerator.generate(selectedEnv);
             boolean checkValid = workspace != null && selectedEnv.checkValid();
             if (!checkValid) {
+                strategy.showTip(new PopTip() {
+                    @Override
+                    public void show() {
                         JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
                                 UIManager.getString("OptionPane.messageDialogTitle"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
+                    }
+                });
                 return false;
             }
             WorkContext.switchTo(workspace, new WorkContextCallback() {
@@ -96,13 +110,24 @@ public class EnvChangeEntrance {
         } catch (AuthException | RegistEditionException e) {
             // String title = Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed");
             // String title = Toolkit.i18nText("Fine-Design_Basic_Lic_Does_Not_Support_Remote");
+            strategy.showTip(new PopTip() {
+                @Override
+                public void show() {
                     JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
                             UIManager.getString("OptionPane.messageDialogTitle"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
+                }
+            });
             return false;
         } catch (Exception exception) {
             FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
+            strategy.showTip(new PopTip() {
+                @Override
+                public void show() {
                     JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
                             UIManager.getString("OptionPane.messageDialogTitle"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
+                }
+            });
+
             return false;
         }
         TemplateTreePane.getInstance().refreshDockingView();
@@ -136,13 +161,11 @@ public class EnvChangeEntrance {
 
             @Override
             public void doOk() {
-                envListDialog.dispose();
+                envListOkAction(envListPane, PopTipStrategy.LATER);
-                envListOkAction(envListPane);
             }
 
             @Override
             public void doCancel() {
-
                 envListDialog.dispose();
             }
         });
@@ -160,11 +183,9 @@ public class EnvChangeEntrance {
 
             @Override
             public void doOk() {
-
+                if (!envListOkAction(envListPane, PopTipStrategy.NOW)) {
-                if (!envListOkAction(envListPane)) {
                     System.exit(0);
                 }
-
             }
 
             @Override
@@ -175,4 +196,40 @@ public class EnvChangeEntrance {
         envListDialog.setVisible(true);
     }
 
+
+    /**
+     * 提示显示策略
+     */
+    enum PopTipStrategy {
+
+        /**
+         * 切换失败，就马上提示失败，不关闭选择列表对话框
+         */
+        NOW {
+            @Override
+            void showTip(PopTip tip) {
+                tip.show();
+            }
+        },
+        /**
+         * 切换失败，自动关闭选择列表对话框，然后提示切换失败
+         */
+        LATER {
+            @Override
+            void showTip(final PopTip tip) {
+                SwingUtilities.invokeLater(new Runnable() {
+                    @Override
+                    public void run() {
+                        tip.show();
+                    }
+                });
+            }
+        };
+
+        abstract void showTip(PopTip tip);
+    }
+
+    interface PopTip {
+        void show();
+    }
 }