From 684b47e4c1ec7989fb59c642ac36aaab5c798b6d Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Mon, 6 Aug 2018 11:00:04 +0800 Subject: [PATCH 1/2] REPORT-10385 --- .../com/fr/start/module/DesignerWorkspaceProvider.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java index bfcb4fefe..aae7bb2cd 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java @@ -2,12 +2,16 @@ package com.fr.start.module; import com.fr.design.DesignerEnvManager; import com.fr.design.env.DesignerWorkspaceGenerator; +import com.fr.design.env.DesignerWorkspaceInfo; import com.fr.design.mainframe.TemplatePane; import com.fr.general.ComparatorUtils; import com.fr.module.Activator; +import com.fr.stable.StableUtils; import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; +import java.io.File; + /** * Created by juhaoyu on 2018/1/8. * 设计器启动时的环境相关模块activator @@ -24,8 +28,10 @@ public class DesignerWorkspaceProvider extends Activator { } else { try { String current = DesignerEnvManager.getEnvManager().getCurEnvName(); - Workspace workspace = DesignerWorkspaceGenerator.generate(DesignerEnvManager.getEnvManager().getWorkspaceInfo(current)); - if (workspace == null) { + DesignerWorkspaceInfo workspaceInfo = DesignerEnvManager.getEnvManager().getWorkspaceInfo(current); + Workspace workspace = DesignerWorkspaceGenerator.generate(workspaceInfo); + boolean checkValid = workspace == null ? false : workspaceInfo.checkValid(); + if (!checkValid) { TemplatePane.getInstance().dealEvnExceptionWhenStartDesigner(); } else { WorkContext.switchTo(workspace); From 23733ff80c299e477330f34cf2b03674e80b5c19 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Mon, 6 Aug 2018 11:02:03 +0800 Subject: [PATCH 2/2] REPORT-10385 --- .../java/com/fr/start/module/DesignerWorkspaceProvider.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java index aae7bb2cd..211e67db3 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java @@ -4,13 +4,11 @@ import com.fr.design.DesignerEnvManager; import com.fr.design.env.DesignerWorkspaceGenerator; import com.fr.design.env.DesignerWorkspaceInfo; import com.fr.design.mainframe.TemplatePane; -import com.fr.general.ComparatorUtils; import com.fr.module.Activator; -import com.fr.stable.StableUtils; + import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; -import java.io.File; /** * Created by juhaoyu on 2018/1/8.