Browse Source

Merge pull request #1633 in BA/design from ~JU/design:feature/10.0 to feature/10.0

* commit '45b39e006c592dcfe46422ea4d87d0aa4cff0a94':
  DEC-472 新模块划分与启动、关闭框架
  DEC-472 新模块划分与启动、关闭框架
  DEC-472 新模块划分与启动、关闭框架
master
superman 7 years ago
parent
commit
b0f869f5cd
  1. 4
      designer/src/com/fr/start/Designer.java
  2. 1
      designer/src/com/fr/start/module/StartFinishActivator.java

4
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.ComparatorUtils;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.ModuleStartup; import com.fr.module.ModuleContext;
import com.fr.stable.ProductConstants; import com.fr.stable.ProductConstants;
import com.fr.stable.StableUtils; import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
@ -83,7 +83,7 @@ public class Designer extends BaseDesigner {
*/ */
public static void main(String[] args) { public static void main(String[] args) {
Module designerRoot = ModuleStartup.parse("/com/fr/config/starter/designer-startup.xml"); Module designerRoot = ModuleContext.parseRoot("designer-startup.xml");
//传递启动参数 //传递启动参数
designerRoot.setSingleton(StartupArgs.class, new StartupArgs(args)); designerRoot.setSingleton(StartupArgs.class, new StartupArgs(args));
designerRoot.start(); designerRoot.start();

1
designer/src/com/fr/start/module/StartFinishActivator.java

@ -19,7 +19,6 @@ public class StartFinishActivator extends Activator {
DesignUtils.creatListeningServer(getStartPort(), startFileSuffix()); DesignUtils.creatListeningServer(getStartPort(), startFileSuffix());
ModuleContext.clearModuleListener(); ModuleContext.clearModuleListener();
GlobalListenerProviderManager.getInstance().init(); GlobalListenerProviderManager.getInstance().init();
// Register.setStarted(true);
} }
private int getStartPort() { private int getStartPort() {

Loading…
Cancel
Save