From 13de7fc48c8b65675eb77c81ff12b69f087b77e4 Mon Sep 17 00:00:00 2001 From: ju Date: Thu, 1 Feb 2018 15:24:07 +0800 Subject: [PATCH 1/3] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/start/Designer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/start/Designer.java b/designer/src/com/fr/start/Designer.java index fa4e505978..183e4e2c43 100644 --- a/designer/src/com/fr/start/Designer.java +++ b/designer/src/com/fr/start/Designer.java @@ -41,7 +41,7 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.module.Module; -import com.fr.module.ModuleStartup; +import com.fr.module.ModuleContext; import com.fr.stable.ProductConstants; import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; @@ -83,7 +83,7 @@ public class Designer extends BaseDesigner { */ public static void main(String[] args) { - Module designerRoot = ModuleStartup.parse("/com/fr/config/starter/designer-startup.xml"); + Module designerRoot = ModuleContext.parse("designer-startup.xml"); //传递启动参数 designerRoot.setSingleton(StartupArgs.class, new StartupArgs(args)); designerRoot.start(); From ee5850583a2a4a668ac2ae173e3ca97e61c06d98 Mon Sep 17 00:00:00 2001 From: ju Date: Thu, 1 Feb 2018 15:25:55 +0800 Subject: [PATCH 2/3] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/start/Designer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer/src/com/fr/start/Designer.java b/designer/src/com/fr/start/Designer.java index 183e4e2c43..2b42da2161 100644 --- a/designer/src/com/fr/start/Designer.java +++ b/designer/src/com/fr/start/Designer.java @@ -83,7 +83,7 @@ public class Designer extends BaseDesigner { */ public static void main(String[] args) { - Module designerRoot = ModuleContext.parse("designer-startup.xml"); + Module designerRoot = ModuleContext.parseRoot("designer-startup.xml"); //传递启动参数 designerRoot.setSingleton(StartupArgs.class, new StartupArgs(args)); designerRoot.start(); From 45b39e006c592dcfe46422ea4d87d0aa4cff0a94 Mon Sep 17 00:00:00 2001 From: ju Date: Thu, 1 Feb 2018 15:47:24 +0800 Subject: [PATCH 3/3] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/start/module/StartFinishActivator.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer/src/com/fr/start/module/StartFinishActivator.java b/designer/src/com/fr/start/module/StartFinishActivator.java index 6ae48b66ca..da14410f64 100644 --- a/designer/src/com/fr/start/module/StartFinishActivator.java +++ b/designer/src/com/fr/start/module/StartFinishActivator.java @@ -19,7 +19,6 @@ public class StartFinishActivator extends Activator { DesignUtils.creatListeningServer(getStartPort(), startFileSuffix()); ModuleContext.clearModuleListener(); GlobalListenerProviderManager.getInstance().init(); -// Register.setStarted(true); } private int getStartPort() {