Browse Source

Merge pull request #479 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0

* commit 'd2a9cecc594a3888afe97e974fdc2d4078d1d8c9':
  REPORT-11216 10.0远程设计问题解决
research/10.0
ju 6 years ago
parent
commit
096a562dc6
  1. 9
      designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java

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

@ -1,11 +1,11 @@
package com.fr.start.module; package com.fr.start.module;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.EnvChangeEntrance;
import com.fr.design.env.DesignerWorkspaceGenerator; import com.fr.design.env.DesignerWorkspaceGenerator;
import com.fr.design.env.DesignerWorkspaceInfo; import com.fr.design.env.DesignerWorkspaceInfo;
import com.fr.design.mainframe.TemplatePane; import com.fr.log.FineLoggerFactory;
import com.fr.module.Activator; import com.fr.module.Activator;
import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContext;
import com.fr.workspace.Workspace; import com.fr.workspace.Workspace;
@ -30,12 +30,13 @@ public class DesignerWorkspaceProvider extends Activator {
Workspace workspace = DesignerWorkspaceGenerator.generate(workspaceInfo); Workspace workspace = DesignerWorkspaceGenerator.generate(workspaceInfo);
boolean checkValid = workspace != null && workspaceInfo.checkValid(); boolean checkValid = workspace != null && workspaceInfo.checkValid();
if (!checkValid) { if (!checkValid) {
TemplatePane.getInstance().dealEvnExceptionWhenStartDesigner(); EnvChangeEntrance.getInstance().dealEvnExceptionWhenStartDesigner();
} else { } else {
WorkContext.switchTo(workspace); WorkContext.switchTo(workspace);
} }
} catch (Throwable e) { } catch (Throwable e) {
TemplatePane.getInstance().dealEvnExceptionWhenStartDesigner(); FineLoggerFactory.getLogger().error(e.getMessage(), e);
EnvChangeEntrance.getInstance().dealEvnExceptionWhenStartDesigner();
} }
} }
} }

Loading…
Cancel
Save