Browse Source

Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into feature/10.0

research/11.0
zheng 5 years ago
parent
commit
300d1aa798
  1. 4
      designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java
  2. 4
      designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java
  3. 2
      designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java
  4. 2
      designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java

4
designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java

@ -18,7 +18,7 @@ public class DesignerStartup extends Activator {
public void start() {
startSub(PreStartActivator.class);
getSub("parallel").start();
startSub("parallel");
//designer模块启动好后,查看demo
browserDemo();
startSub(DesignerShowActivator.class);
@ -28,7 +28,7 @@ public class DesignerStartup extends Activator {
private void browserDemo() {
if (getModule().leftFindSingleton(StartupArgs.class) != null && getModule().leftFindSingleton(StartupArgs.class).isDemo()) {
if (findSingleton(StartupArgs.class) != null && findSingleton(StartupArgs.class).isDemo()) {
ServerStarter.browserDemoURL();
}
}

4
designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java

@ -36,7 +36,7 @@ public class DesignerWorkspaceActivator extends Activator {
@Override
public void on(Event event, Workspace current) {
getSub(EnvBasedModule.class).stop();
stopSub(EnvBasedModule.class);
}
});
/*切换环境后,重新启动所有相关模块,最先执行*/
@ -45,7 +45,7 @@ public class DesignerWorkspaceActivator extends Activator {
@Override
public void on(Event event, Workspace current) {
getSub(EnvBasedModule.class).start();
startSub(EnvBasedModule.class);
startServer(current);
}
});

2
designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java

@ -22,7 +22,7 @@ public class DesignerWorkspaceProvider extends Activator {
//检查环境
DesignerEnvManager.checkNameEnvMap();
if (getModule().leftFindSingleton(StartupArgs.class) != null && getModule().leftFindSingleton(StartupArgs.class).isDemo()) {
if (findSingleton(StartupArgs.class) != null && findSingleton(StartupArgs.class).isDemo()) {
DesignerEnvManager.getEnvManager().setCurrentEnv2Default();
} else {
try {

2
designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java

@ -35,7 +35,7 @@ public class PreStartActivator extends Activator {
BuildContext.setBuildFilePath("/com/fr/stable/build.properties");
// 如果端口被占用了 说明程序已经运行了一次,也就是说,已经建立一个监听服务器,现在只要给服务器发送命令就好了
final String[] args = getModule().upFindSingleton(StartupArgs.class).get();
final String[] args = findSingleton(StartupArgs.class).get();
// 检查是否是-Ddebug = true 启动 并切换对应的端口以及环境配置文件
checkDebugStart();
if (DesignUtils.isStarted()) {

Loading…
Cancel
Save