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

Cleanup & lambdify

Browse Source
This commit is contained in:
Kirill Likhodedov
2016-10-30 13:09:40 +03:00
parent 69908b5f3c
commit 8eb6907cb3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsInitialization.java
+6 -3
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Attachment;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressIndicatorProvider;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.progress.impl.ProgressManagerImpl;
@@ -36,6 +37,7 @@ import org.jetbrains.annotations.TestOnly;
import javax.swing.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.concurrent.Future;
@@ -85,11 +87,11 @@ public class VcsInitialization implements Disposable {
list = myList;
myInitStarted = true; // list would not be modified starting from this point
Future<?> future = myFuture;
if (future != null && future.isCancelled() || ProgressManager.getGlobalProgressIndicator().isCanceled()) {
if (future != null && future.isCancelled() || ProgressIndicatorProvider.getGlobalProgressIndicator().isCanceled()) {
return;
}
}
Collections.sort(list, (o1, o2) -> o1.getFirst().getOrder() - o2.getFirst().getOrder());
Collections.sort(list, Comparator.comparingInt(o -> o.getFirst().getOrder()));
for (Pair<VcsInitObject, Runnable> pair : list) {
ProgressManager.checkCanceled();
pair.getSecond().run();
@@ -136,7 +138,8 @@ public class VcsInitialization implements Disposable {
TimeoutUtil.sleep(10);
}
if (myIndicator.isRunning()) {
LOG.error("Failed to wait for completion of VCS initialization for project "+myProject, new Attachment("thread dump", ThreadDumper.dumpThreadsToString()));
LOG.error("Failed to wait for completion of VCS initialization for project "+ myProject,
new Attachment("thread dump", ThreadDumper.dumpThreadsToString()));
}
}
}