REPORT-9723【阻塞】【10.0二轮回归】切换远程工作目录失败

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

@@ -115,19 +115,12 @@ public class SwitchExistEnv extends MenuDef {
             }
             WorkContext.switchTo(workspace, new WorkContextCallback() {
                 @Override
-                public void success() {
+                public void done() {
                     DesignerEnvManager.getEnvManager().setCurEnvName(envName);
                     DesignUtils.refreshDesignerFrame();
                     HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshToolArea();
                     fireDSChanged();
                 }
-
-                @Override
-                public void fail() {
-                    JOptionPane.showMessageDialog(
-                            DesignerContext.getDesignerFrame(),
-                            Inter.getLocText(new String[]{"M-SwitchWorkspace", "Failed"}));
-                }
             });
         }
     }

designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java

@@ -1,11 +1,11 @@
 package com.fr.design.env;
 
-import com.fr.env.operator.decision.DecisionOperator;
 import com.fr.locale.InterProviderFactory;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;
 import com.fr.workspace.connect.WorkspaceClient;
 import com.fr.workspace.connect.WorkspaceConnection;
+import com.fr.workspace.server.authority.decision.DecisionOperator;
 
 /**
  * Created by juhaoyu on 2018/6/14.

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

@@ -133,16 +133,8 @@ public class TemplatePane extends JPanel implements MouseListener {
         GeneralContext.fireEnvWillChangeListener();
         try {
             WorkContext.switchTo(DesignerWorkspaceGenerator.generate(selectedEnv), new WorkContextCallback() {
-                
-                @Override
-                public void fail() {
-                    
-                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"M-SwitchWorkspace", "Failed"}),
-                            null, 0, UIManager.getIcon("OptionPane.errorIcon"));
-                }
-                
                 @Override
-                public void success() {
+                public void done() {
                     DesignerEnvManager.getEnvManager().setCurEnvName(selectedName);
                     DesignUtils.refreshDesignerFrame();
                 }

designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java

@@ -6,11 +6,11 @@ import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.remote.ui.AuthorityManagerPane;
-import com.fr.env.operator.authority.AuthorityOperator;
 import com.fr.general.Inter;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.DesignAuthority;
 import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.authority.AuthorityOperator;
 
 import java.awt.event.ActionEvent;
 

designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java

@@ -18,12 +18,12 @@ import com.fr.design.remote.RemoteDesignAuthorityCreator;
 import com.fr.design.remote.ui.list.AuthorityList;
 import com.fr.design.remote.ui.list.AuthorityListCellRenderer;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.env.RemoteDesignMember;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.DesignAuthority;
 import com.fr.stable.ArrayUtils;
+import com.fr.workspace.server.authority.RemoteDesignMember;
 
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;

designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java

@@ -13,12 +13,12 @@ import com.fr.design.remote.ui.list.AddedMemberListCellRender;
 import com.fr.design.remote.ui.list.AddingMemberList;
 import com.fr.design.remote.ui.list.AddingMemberListCellRender;
 import com.fr.design.remote.ui.list.MemberListSelectedChangeListener;
-import com.fr.env.RemoteDesignMember;
-import com.fr.env.operator.decision.DecisionOperator;
 import com.fr.general.Inter;
 import com.fr.stable.StringUtils;
 import com.fr.third.guava.collect.ImmutableList;
 import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.authority.RemoteDesignMember;
+import com.fr.workspace.server.authority.decision.DecisionOperator;
 
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;

designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberList.java

@@ -1,6 +1,7 @@
 package com.fr.design.remote.ui.list;
 
-import com.fr.env.RemoteDesignMember;
+
+import com.fr.workspace.server.authority.RemoteDesignMember;
 
 import javax.swing.DefaultListModel;
 import java.awt.Point;

designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberListCellRender.java

@@ -3,7 +3,7 @@ package com.fr.design.remote.ui.list;
 import com.fr.base.BaseUtils;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.remote.button.IconButton;
-import com.fr.env.RemoteDesignMember;
+import com.fr.workspace.server.authority.RemoteDesignMember;
 
 import javax.swing.BorderFactory;
 import javax.swing.JList;

designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberList.java

@@ -1,6 +1,6 @@
 package com.fr.design.remote.ui.list;
 
-import com.fr.env.RemoteDesignMember;
+import com.fr.workspace.server.authority.RemoteDesignMember;
 
 import javax.swing.DefaultListModel;
 import java.awt.Point;

designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberListCellRender.java

@@ -3,7 +3,7 @@ package com.fr.design.remote.ui.list;
 import com.fr.base.BaseUtils;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.env.RemoteDesignMember;
+import com.fr.workspace.server.authority.RemoteDesignMember;
 
 import javax.swing.BorderFactory;
 import javax.swing.JList;

designer-base/src/main/java/com/fr/design/remote/ui/list/MemberList.java

@@ -1,7 +1,7 @@
 package com.fr.design.remote.ui.list;
 
 
-import com.fr.env.RemoteDesignMember;
+import com.fr.workspace.server.authority.RemoteDesignMember;
 
 import javax.swing.DefaultListModel;
 import javax.swing.JList;

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

@@ -3,7 +3,6 @@ package com.fr.design.mainframe.socketio;
 import com.fr.decision.webservice.utils.DecisionServiceConstants;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.loghandler.DesignerLogHandler;
-import com.fr.env.operator.socket.SocketInfoOperator;
 import com.fr.general.Inter;
 import com.fr.general.LogRecordTime;
 import com.fr.general.LogUtils;
@@ -13,6 +12,7 @@ import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;
 import com.fr.workspace.base.WorkspaceConstants;
 import com.fr.workspace.engine.server.rpc.netty.RemoteCallClient;
+import com.fr.workspace.server.socket.SocketInfoOperator;
 import io.socket.client.IO;
 import io.socket.client.Socket;
 import io.socket.emitter.Emitter;