Merge pull request #242 in DESIGN/design from ~HZZZ/design61:release/10.0 to release/10.0

* commit 'ee9ebf43b23e6a8741921822338436d20f39f67a':
  REPORT-9388 远程设计重构-设计器目录树-工具栏-10.0远程下比9.0多出两个工具栏按钮
  REPORT-9706 在远程环境下，切换成本地的时候弹出一个错误提示框呢
  REPORT-9741【10.0二轮回归】设计器菜单栏-文件-切换至远程服务器

designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java

@@ -22,7 +22,8 @@ import com.fr.workspace.WorkContextCallback;
 import com.fr.workspace.Workspace;
 import com.fr.workspace.connect.AuthException;
 
-import javax.swing.*;
+import javax.swing.JOptionPane;
+import javax.swing.UIManager;
 import java.awt.event.ActionEvent;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -108,9 +109,8 @@ public class SwitchExistEnv extends MenuDef {
             try {
                 workspace = DesignerWorkspaceGenerator.generate(selectedEnv);
                 if (workspace == null) {
-                    JOptionPane.showMessageDialog(
-                        DesignerContext.getDesignerFrame(),
-                        Inter.getLocText(new String[]{"FR-Designer_M-SwitchWorkspace", "Failed"}));
+                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"FR-Designer_M-SwitchWorkspace", "Failed"}),
+                            null, 0, UIManager.getIcon("OptionPane.errorIcon"));
                     return;
                 }
                 WorkContext.switchTo(workspace, new WorkContextCallback() {
@@ -125,9 +125,8 @@ public class SwitchExistEnv extends MenuDef {
                     }
                 });
             } catch (AuthException exception) {
-                JOptionPane.showMessageDialog(
-                        DesignerContext.getDesignerFrame(),
-                        Inter.getLocText(new String[]{"Fine-Designer_Basic_Remote_Connect_Auth_Failed"}));
+                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"Fine-Designer_Basic_Remote_Connect_Auth_Failed", "Failed"}),
+                        null, 0, UIManager.getIcon("OptionPane.errorIcon"));
             }
         }
     }

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@@ -36,6 +36,7 @@ import com.fr.io.utils.ResourceIOUtils;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.project.ProjectConstants;
+import com.fr.workspace.WorkContext;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
@@ -149,7 +150,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
         ToolBarDef toolbarDef = new ToolBarDef();
         toolbarDef.addShortCut(openReportAction, refreshTreeAction);
-        toolbarDef.addShortCut(openFolderAction, renameAction);
+        if (WorkContext.getCurrent().isLocal()) {
+            toolbarDef.addShortCut(openFolderAction, renameAction);
+        }
         toolbarDef.addShortCut(delFileAction);
         Set<ShortCut> extraShortCuts = ExtraDesignClassManager.getInstance().getExtraShortCuts();
         for (ShortCut shortCut : extraShortCuts) {
@@ -158,6 +161,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
         toolbarDef.updateToolBar(toolBar);
         refreshActions();
+        refresh();
     }
 
 

designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java

@@ -20,6 +20,7 @@ import com.fr.stable.EnvChangedListener;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.WorkContextCallback;
 import com.fr.workspace.Workspace;
+import com.fr.workspace.connect.AuthException;
 
 import javax.swing.*;
 import java.awt.*;
@@ -135,9 +136,8 @@ public class TemplatePane extends JPanel implements MouseListener {
         try {
             Workspace workspace = DesignerWorkspaceGenerator.generate(selectedEnv);
             if (workspace == null) {
-                JOptionPane.showMessageDialog(
-                    DesignerContext.getDesignerFrame(),
-                    Inter.getLocText(new String[]{"FR-Designer_M-SwitchWorkspace", "Failed"}));
+                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"FR-Designer_M-SwitchWorkspace", "Failed"}),
+                        null, 0, UIManager.getIcon("OptionPane.errorIcon"));
                 return false;
             }
             WorkContext.switchTo(workspace, new WorkContextCallback() {
@@ -152,8 +152,8 @@ public class TemplatePane extends JPanel implements MouseListener {
                 template.refreshToolArea();
             }
             setJLabel(selectedName);
-        } catch (Exception e) {
-            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"M-SwitchWorkspace", "Failed"}),
+        } catch (AuthException e) {
+            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"Fine-Designer_Basic_Remote_Connect_Auth_Failed", "Failed"}),
                     null, 0, UIManager.getIcon("OptionPane.errorIcon"));
             return false;
         }

designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java

@@ -55,7 +55,6 @@ public class DesignerSocketIO {
             status = Status.Disconnecting;
             socketIO.get().close();
             socketIO = Optional.absent();
-            status = Status.Disconnected;
         }
     }
 
@@ -82,8 +81,8 @@ public class DesignerSocketIO {
                     if (status != Status.Disconnecting) {
                         JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"Fine-Designer_Basic_Remote_Disconnected"}),
                                 null, 0, UIManager.getIcon("OptionPane.errorIcon"));
-                        status = Status.Disconnected;
                     }
+                    status = Status.Disconnected;
                 }
             });
             socketIO.get().connect();