From 0f883e9d2920c83f890f7ff8c79d75c015a4b5b1 Mon Sep 17 00:00:00 2001 From: ju Date: Fri, 16 Mar 2018 14:28:05 +0800 Subject: [PATCH] =?UTF-8?q?CORE-49=20=E6=96=B0=E6=A8=A1=E5=9D=97=E5=8C=96?= =?UTF-8?q?=E4=B8=AD=E5=9C=A8=E7=9B=91=E5=90=AC=E4=B8=AD=E5=8E=BB=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E5=AD=90=E6=A8=A1=E5=9D=97=E7=9A=84=E5=86=99=E6=B3=95?= =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98=201=E3=80=81=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=9C=A8xml=E4=B8=AD=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E9=85=8D=E7=BD=AE=E7=9A=84=E4=BB=A3=E7=A0=81=202?= =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96EventDispatcher=203=E3=80=81?= =?UTF-8?q?=E5=AE=9A=E4=B9=89Prepare=E6=8E=A5=E5=8F=A3=E6=9D=A5=E8=AE=A9?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=BF=9B=E8=A1=8C=E6=95=B0=E6=8D=AE=E4=BA=A4?= =?UTF-8?q?=E6=8D=A2=20=E6=8E=A5=E4=B8=8B=E6=9D=A5=EF=BC=9A=201=E3=80=81?= =?UTF-8?q?=E6=8C=89=E7=85=A7extension=E5=8C=85=E7=9A=84package-info?= =?UTF-8?q?=E4=B8=AD=E6=8F=8F=E8=BF=B0=E7=9A=84=EF=BC=9A=E5=9C=A8=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E5=A5=BD=E6=A8=A1=E5=9D=97=E6=A0=91=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E6=A8=A1=E5=9D=97=E5=90=AF=E5=8A=A8=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=EF=BC=88=E4=B9=9F=E5=B0=B1=E6=98=AF=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84=E4=B8=8A=E4=B8=8B=E5=B1=82=E4=BE=9D=E8=B5=96=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=EF=BC=8C=E6=88=90=E4=B8=BA=E5=B7=A6=E5=8F=B3=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=EF=BC=89=EF=BC=8C=E8=AE=A9=E6=A8=A1=E5=9D=97=E4=B8=8E?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B9=8B=E9=97=B4=E4=B8=8D=E5=85=89=E6=9C=89?= =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E5=B1=82=E7=9A=84=E5=BC=95=E7=94=A8=EF=BC=8C?= =?UTF-8?q?=E4=B9=9F=E5=8C=85=E5=90=AB=E5=B7=A6=E5=8F=B3=E7=9A=84=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=202=E3=80=81=E5=88=A9=E7=94=A8=E5=B7=A6=E5=8F=B3?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=EF=BC=8C=E5=9C=A8ModuleStableRepoAccessor?= =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E6=96=B9=E6=B3=95=EF=BC=8C=E5=8A=A0?= =?UTF-8?q?=E5=BC=BA=E6=A8=A1=E5=9D=97=E9=97=B4=E6=95=B0=E6=8D=AE=E4=BA=A4?= =?UTF-8?q?=E6=8D=A2=E6=97=B6=E7=9A=84=E8=AF=AD=E4=B9=89=EF=BC=88=E7=8E=B0?= =?UTF-8?q?=E5=9C=A8=E7=9C=8B=E6=95=B0=E6=8D=AE=E4=BA=A4=E6=8D=A2=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=97=B6=E4=BC=9A=E6=84=9F=E8=A7=89=E4=B8=8D?= =?UTF-8?q?=E6=B8=85=E6=99=B0=EF=BC=8C=E4=B8=8D=E7=9F=A5=E9=81=93=E8=B0=81?= =?UTF-8?q?=E5=92=8C=E8=B0=81=E4=BA=A4=E6=8D=A2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/start/module/DesignerEnvProvider.java | 2 +- designer/src/com/fr/start/module/DesignerModuleActivator.java | 2 +- designer/src/com/fr/start/module/DesignerStartup.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/designer/src/com/fr/start/module/DesignerEnvProvider.java b/designer/src/com/fr/start/module/DesignerEnvProvider.java index 4b050f5991..df843a5dfd 100644 --- a/designer/src/com/fr/start/module/DesignerEnvProvider.java +++ b/designer/src/com/fr/start/module/DesignerEnvProvider.java @@ -15,7 +15,7 @@ public class DesignerEnvProvider extends Activator { @Override public void start() { - String[] args = getModule().findSingleton(StartupArgs.class).get(); + String[] args = getModule().upFindSingleton(StartupArgs.class).get(); if (args != null) { for (String arg : args) { if (ComparatorUtils.equals(arg, "demo")) { diff --git a/designer/src/com/fr/start/module/DesignerModuleActivator.java b/designer/src/com/fr/start/module/DesignerModuleActivator.java index 99f09b8158..c51444ef54 100644 --- a/designer/src/com/fr/start/module/DesignerModuleActivator.java +++ b/designer/src/com/fr/start/module/DesignerModuleActivator.java @@ -15,7 +15,7 @@ public class DesignerModuleActivator extends Activator { @Override public void start() { - ModuleContext.registerModuleListener(getModule().findSingleton(ModuleListener.class)); + ModuleContext.registerModuleListener(getModule().upFindSingleton(ModuleListener.class)); ModuleContext.startModule(DesignerModule.class.getName()); ModuleContext.clearModuleListener(); } diff --git a/designer/src/com/fr/start/module/DesignerStartup.java b/designer/src/com/fr/start/module/DesignerStartup.java index 49be1c89ff..9abb23dfe5 100644 --- a/designer/src/com/fr/start/module/DesignerStartup.java +++ b/designer/src/com/fr/start/module/DesignerStartup.java @@ -36,7 +36,7 @@ public class DesignerStartup extends Activator { startSub(BasicActivator.class); //启动画面 SplashWindow splashWindow = createSplashWindow(); - String[] args = getModule().findSingleton(StartupArgs.class).get(); + String[] args = getModule().upFindSingleton(StartupArgs.class).get(); Designer designer = new Designer(args); //启动env startSub(DesignerEnvProvider.class); @@ -69,7 +69,7 @@ public class DesignerStartup extends Activator { } // 如果端口被占用了 说明程序已经运行了一次,也就是说，已经建立一个监听服务器，现在只要给服务器发送命令就好了 if (DesignUtils.isStarted()) { - DesignUtils.clientSend(getModule().findSingleton(StartupArgs.class).get()); + DesignUtils.clientSend(getModule().upFindSingleton(StartupArgs.class).get()); return true; } return false;