MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Don't let the chance to AWTAutoShutdown to kill dispatch queue in the gap between splash is already been hidden and IdeFrame not yet shown.

Browse Source
This commit is contained in:
Maxim Shafirov
2012-11-02 15:38:39 +04:00
parent 46af205b2a
commit 6c47a08ecc
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/idea/IdeaApplication.java
+23 -14
View File
@@ -37,7 +37,9 @@ import com.intellij.openapi.updateSettings.impl.UpdateChecker;
import com.intellij.openapi.updateSettings.impl.UpdateSettings;
import com.intellij.openapi.util.*;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.wm.IdeFrame;
import com.intellij.openapi.wm.WindowManager;
import com.intellij.openapi.wm.WindowManagerListener;
import com.intellij.openapi.wm.ex.WindowManagerEx;
import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeFrame;
import com.intellij.ui.Splash;
@@ -286,18 +288,36 @@ public class IdeaApplication {
// application components. So it is proper to perform replacement only here.
ApplicationEx app = ApplicationManagerEx.getApplicationEx();
// app.setupIdeQueue(IdeEventQueue.getInstance());
final WindowManagerEx windowManager = (WindowManagerEx)WindowManager.getInstance();
WindowManagerListener splashDisposer = new WindowManagerListener() {
@Override
public void frameCreated(IdeFrame frame) {
if (mySplash != null) {
mySplash.dispose();
mySplash = null; // Allow GC collect the splash window
}
windowManager.removeListener(this);
}
@Override
public void beforeFrameReleased(IdeFrame frame) {}
};
windowManager.addListener(splashDisposer);
try {
IdeEventQueue.getInstance().setWindowManager((WindowManagerEx)WindowManager.getInstance());
IdeEventQueue.getInstance().setWindowManager(windowManager);
final Ref<Boolean> willOpenProject = new Ref<Boolean>(Boolean.FALSE);
final AppLifecycleListener lifecyclePublisher = app.getMessageBus().syncPublisher(AppLifecycleListener.TOPIC);
lifecyclePublisher.appFrameCreated(args, willOpenProject);
LOG.info("App initialization took " + (System.nanoTime() - PluginManager.startupStart) / 1000000 + " ms");
PluginManager.dumpPluginClassStatistics();
//if (!willOpenProject.get()) {
if (!willOpenProject.get()) {
WelcomeFrame.showNow();
lifecyclePublisher.welcomeScreenDisplayed();
//}
splashDisposer.frameCreated(null);
}
}
catch (PluginException e) {
Messages.showErrorDialog("Plugin " + e.getPluginId() + " couldn't be loaded, the IDE will now exit.\n" +
@@ -306,17 +326,6 @@ public class IdeaApplication {
System.exit(-1);
}
app.invokeLater(new Runnable() {
@Override
public void run() {
if (mySplash != null) {
mySplash.dispose();
mySplash = null; // Allow GC collect the splash window
}
}
}, ModalityState.NON_MODAL);
app.invokeLater(new Runnable() {
@Override
public void run() {