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

IDEA-69532 (CVS: history view is empty; CompareWith... dialog shows no revisions)

Browse Source
This commit is contained in:
Bas Leijdekkers
2011-05-12 13:38:54 +02:00
parent e3f8e05534
commit 87b67d6624
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/util/WaitForProgressToShow.java
+16
View File
@@ -46,6 +46,22 @@ public class WaitForProgressToShow {
}
}
public static void runOrInvokeAndWaitAboveProgress(final Runnable command, @Nullable final ModalityState modalityState) {
final Application application = ApplicationManager.getApplication();
if (application.isDispatchThread()) {
command.run();
} else {
final ProgressIndicator pi = ProgressManager.getInstance().getProgressIndicator();
if (pi != null) {
execute(pi);
application.invokeAndWait(command, pi.getModalityState());
} else {
final ModalityState notNullModalityState = modalityState == null ? ModalityState.NON_MODAL : modalityState;
application.invokeAndWait(command, notNullModalityState);
}
}
}
public static void runOrInvokeLaterAboveProgress(final Runnable command, @Nullable final ModalityState modalityState, @NotNull final Project project) {
final Application application = ApplicationManager.getApplication();
if (application.isDispatchThread()) {
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/ModalityContextImpl.java
+1 -2
View File
@@ -47,8 +47,7 @@ public class ModalityContextImpl implements ModalityContext {
action.run();
}
else {
ModalityState modalityState = getCurrentModalityState();
WaitForProgressToShow.runOrInvokeLaterAboveProgress(action, modalityState, project);
WaitForProgressToShow.runOrInvokeAndWaitAboveProgress(action, getCurrentModalityState());
}
}