|
|
@ -9,7 +9,6 @@ import com.fr.form.ui.WidgetInfoConfig; |
|
|
|
import com.fr.module.Activator; |
|
|
|
import com.fr.module.Activator; |
|
|
|
import com.fr.start.Designer; |
|
|
|
import com.fr.start.Designer; |
|
|
|
import com.fr.start.EnvSwitcher; |
|
|
|
import com.fr.start.EnvSwitcher; |
|
|
|
import com.fr.start.ServerStarter; |
|
|
|
|
|
|
|
import com.fr.start.SplashContext; |
|
|
|
import com.fr.start.SplashContext; |
|
|
|
import com.fr.startup.activators.BasicActivator; |
|
|
|
import com.fr.startup.activators.BasicActivator; |
|
|
|
import com.fr.workspace.Workspace; |
|
|
|
import com.fr.workspace.Workspace; |
|
|
@ -36,6 +35,7 @@ public class DesignerStartup extends Activator { |
|
|
|
startSub(EnvBasedModule.class); |
|
|
|
startSub(EnvBasedModule.class); |
|
|
|
getRoot().getSingleton(EnvSwitcher.class).switch2LastEnv(); |
|
|
|
getRoot().getSingleton(EnvSwitcher.class).switch2LastEnv(); |
|
|
|
ExecutorService service = Executors.newSingleThreadExecutor(); |
|
|
|
ExecutorService service = Executors.newSingleThreadExecutor(); |
|
|
|
|
|
|
|
registerEnvListener(); |
|
|
|
service.submit(new Runnable() { |
|
|
|
service.submit(new Runnable() { |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void run() { |
|
|
|
public void run() { |
|
|
@ -44,7 +44,6 @@ public class DesignerStartup extends Activator { |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
service.shutdown(); |
|
|
|
service.shutdown(); |
|
|
|
registerEnvListener(); |
|
|
|
|
|
|
|
DesignerContext.getDesignerFrame().setVisible(true); |
|
|
|
DesignerContext.getDesignerFrame().setVisible(true); |
|
|
|
//启动画面结束
|
|
|
|
//启动画面结束
|
|
|
|
SplashContext.getInstance().hide(); |
|
|
|
SplashContext.getInstance().hide(); |
|
|
|