diff options
Diffstat (limited to 'platform/platform-impl/src/com/intellij/openapi/application/impl')
2 files changed, 12 insertions, 9 deletions
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java index 7c8acbc4c25c..46fae517170d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java @@ -781,7 +781,7 @@ public class ApplicationImpl extends PlatformComponentManagerImpl implements App } @Override - public void restart(boolean exitConfirmed) { + public void restart(final boolean exitConfirmed) { exit(false, exitConfirmed, true, true); } @@ -801,7 +801,7 @@ public class ApplicationImpl extends PlatformComponentManagerImpl implements App exiting = true; try { - if (!force && getDefaultModalityState() != ModalityState.NON_MODAL) { + if (!force && !exitConfirmed && getDefaultModalityState() != ModalityState.NON_MODAL) { return; } @@ -1067,8 +1067,7 @@ public class ApplicationImpl extends PlatformComponentManagerImpl implements App private static Thread getEventQueueThread() { EventQueue eventQueue = Toolkit.getDefaultToolkit().getSystemEventQueue(); try { - Method method = EventQueue.class.getDeclaredMethod("getDispatchThread"); - method.setAccessible(true); + Method method = ReflectionUtil.getDeclaredMethod(EventQueue.class, "getDispatchThread"); return (Thread)method.invoke(eventQueue); } catch (Exception e) { diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ModalityInvokatorImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ModalityInvokatorImpl.java index ab2be68b70bd..de7a7e76aa70 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ModalityInvokatorImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ModalityInvokatorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,23 +27,27 @@ import com.intellij.openapi.util.Condition; import org.jetbrains.annotations.NotNull; public class ModalityInvokatorImpl implements ModalityInvokator { + @NotNull @Override - public ActionCallback invokeLater(Runnable runnable) { + public ActionCallback invokeLater(@NotNull Runnable runnable) { return invokeLater(runnable, ApplicationManager.getApplication().getDisposed()); } + @NotNull @Override - public ActionCallback invokeLater(final Runnable runnable, @NotNull final Condition expired) { + public ActionCallback invokeLater(@NotNull final Runnable runnable, @NotNull final Condition expired) { return LaterInvocator.invokeLater(runnable, expired); } + @NotNull @Override - public ActionCallback invokeLater(final Runnable runnable, @NotNull final ModalityState state, @NotNull final Condition expired) { + public ActionCallback invokeLater(@NotNull final Runnable runnable, @NotNull final ModalityState state, @NotNull final Condition expired) { return LaterInvocator.invokeLater(runnable, state, expired); } + @NotNull @Override - public ActionCallback invokeLater(Runnable runnable, @NotNull ModalityState state) { + public ActionCallback invokeLater(@NotNull Runnable runnable, @NotNull ModalityState state) { return invokeLater(runnable, state, ApplicationManager.getApplication().getDisposed()); } }
\ No newline at end of file |