From 4581d496a74f93fe700094766b2e6b89350ad4c8 Mon Sep 17 00:00:00 2001 From: ju Date: Mon, 26 Feb 2018 11:13:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?DEC-472=20=E6=96=B0=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=88=92=E5=88=86=E4=B8=8E=E5=90=AF=E5=8A=A8=E3=80=81=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=A1=86=E6=9E=B6=20=E5=90=AF=E5=8A=A8=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E9=80=89=E6=8B=A9=E7=8E=AF=E5=A2=83=E6=97=B6?= =?UTF-8?q?=E6=8A=9B=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/start/module/DesignerStartup.java | 12 ++++------ .../gui/itree/filetree/EnvFileTree.java | 2 -- .../src/com/fr/start/BaseDesigner.java | 24 +++++++++---------- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/designer/src/com/fr/start/module/DesignerStartup.java b/designer/src/com/fr/start/module/DesignerStartup.java index dba7603b9..24c80264b 100644 --- a/designer/src/com/fr/start/module/DesignerStartup.java +++ b/designer/src/com/fr/start/module/DesignerStartup.java @@ -7,6 +7,7 @@ import com.fr.module.Activator; import com.fr.stable.ProductConstants; import com.fr.stable.module.ModuleListener; import com.fr.start.Designer; +import com.fr.start.EnvSwitcher; import com.fr.start.ReportSplashPane; import com.fr.start.SplashWindow; import com.fr.startup.activators.BasicActivator; @@ -34,13 +35,16 @@ public class DesignerStartup extends Activator { startSub(BasicActivator.class); //启动画面 SplashWindow splashWindow = createSplashWindow(); + String[] args = getModule().findSingleton(StartupArgs.class).get(); + Designer designer = new Designer(args); //启动env startSub(DesignerEnvProvider.class); //启动各个模块 getSub("core").start(); getSub("designer").start(); + getRoot().getSingleton(EnvSwitcher.class).switch2LastEnv(); //启动设计器界面 - startDesigner(); + designer.show(args); //启动画面结束 splashWindow.setVisible(false); splashWindow.dispose(); @@ -55,12 +59,6 @@ public class DesignerStartup extends Activator { return splashWindow; } - - private void startDesigner() { - - new Designer(getModule().getSingleton(StartupArgs.class).get()); - } - private boolean checkMultiStart() { if (isDebug()) { diff --git a/designer_base/src/com/fr/design/gui/itree/filetree/EnvFileTree.java b/designer_base/src/com/fr/design/gui/itree/filetree/EnvFileTree.java index 9e35d062e..7aa9dd2c4 100644 --- a/designer_base/src/com/fr/design/gui/itree/filetree/EnvFileTree.java +++ b/designer_base/src/com/fr/design/gui/itree/filetree/EnvFileTree.java @@ -49,8 +49,6 @@ public class EnvFileTree extends RefreshableJTree { this.setSubPathes(subPathes); this.init(); - //9.0的时候是在设置环境之前构造的这个对象,10.0改为之后了 - this.refreshEnv(FRContext.getCurrentEnv()); } private void setTreeRootPath(String path) { diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index 409106486..1e4ef4500 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/designer_base/src/com/fr/start/BaseDesigner.java @@ -3,26 +3,21 @@ */ package com.fr.start; -import com.fr.base.FRContext; import com.fr.design.DesignerEnvManager; import com.fr.design.ExtraDesignClassManager; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.file.MutilTempalteTabPane; import com.fr.design.file.TemplateTreePane; import com.fr.design.fun.DesignerStartOpenFileProcessor; -import com.fr.design.fun.impl.GlobalListenerProviderManager; +import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; -import com.fr.design.mainframe.TemplatePane; import com.fr.design.mainframe.toolbar.ToolBarMenuDock; import com.fr.design.utils.DesignUtils; -import com.fr.env.SignIn; import com.fr.file.FILE; import com.fr.file.FILEFactory; import com.fr.file.FileFILE; import com.fr.general.ComparatorUtils; import com.fr.general.FRLogger; -import com.fr.general.Inter; -import com.fr.general.ModuleContext; import com.fr.stable.OperatingSystem; import java.awt.*; @@ -44,25 +39,28 @@ public abstract class BaseDesigner extends ToolBarMenuDock { } private void init(String[] args) { - + // 初始化look and feel.这个在预加载之前执行是因为lookAndFeel里的东西,预加载时也要用到 DesignUtils.initLookAndFeel(); // 初始化Log Handler DesignerEnvManager.loadLogSetting(); - DesignerFrame df = createDesignerFrame(); + createDesignerFrame(); + } + public void show(String[] args) { + collectUserInformation(); - showDesignerFrame(args, df, false); + showDesignerFrame(args, DesignerContext.getDesignerFrame(), false); for (int i = 0; !TemplateTreePane.getInstance().getTemplateFileTree().isTemplateShowing() && i < LOAD_TREE_MAXNUM; i++) { TemplateTreePane.getInstance().getTemplateFileTree().refresh(); } } - - - private DesignerFrame createDesignerFrame() { - return new DesignerFrame(this); + + private void createDesignerFrame() { + + new DesignerFrame(this); } From a19aa9e817e00a6a1c7a09b873bc2ecf47c9361a Mon Sep 17 00:00:00 2001 From: ju Date: Mon, 26 Feb 2018 11:22:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?DEC-472=20=E6=96=B0=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=88=92=E5=88=86=E4=B8=8E=E5=90=AF=E5=8A=A8=E3=80=81=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=A1=86=E6=9E=B6=20=E5=90=AF=E5=8A=A8=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E9=80=89=E6=8B=A9=E7=8E=AF=E5=A2=83=E6=97=B6?= =?UTF-8?q?=E6=8A=9B=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/start/module/DesignerStartup.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer/src/com/fr/start/module/DesignerStartup.java b/designer/src/com/fr/start/module/DesignerStartup.java index 24c80264b..49be1c89f 100644 --- a/designer/src/com/fr/start/module/DesignerStartup.java +++ b/designer/src/com/fr/start/module/DesignerStartup.java @@ -4,6 +4,7 @@ import com.fr.design.DesignerEnvManager; import com.fr.design.utils.DesignUtils; import com.fr.general.ComparatorUtils; import com.fr.module.Activator; +import com.fr.stable.CoreActivator; import com.fr.stable.ProductConstants; import com.fr.stable.module.ModuleListener; import com.fr.start.Designer; @@ -40,7 +41,7 @@ public class DesignerStartup extends Activator { //启动env startSub(DesignerEnvProvider.class); //启动各个模块 - getSub("core").start(); + getSub(CoreActivator.class).start(); getSub("designer").start(); getRoot().getSingleton(EnvSwitcher.class).switch2LastEnv(); //启动设计器界面