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

a more concise way to cancel project-bound progresses automatically on project disposal (IDEA-CR-15966)

Browse Source
This commit is contained in:
peter
2016-11-24 16:13:35 +01:00
parent d9a8f7cc36
commit 4f80e698de
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
+3 -9
View File
@@ -64,7 +64,6 @@ public class ProgressWindow extends ProgressIndicatorBase implements BlockingPro
private String myProcessId = "<unknown>";
@Nullable private volatile Runnable myBackgroundHandler;
private int myDelayInMillis = DEFAULT_PROGRESS_DIALOG_POSTPONE_TIME_MILLIS;
@Nullable private Disposable myCancelOnProjectDisposal;
public interface Listener {
void progressWindowCreated(ProgressWindow pw);
@@ -122,12 +121,7 @@ public class ProgressWindow extends ProgressIndicatorBase implements BlockingPro
ApplicationManager.getApplication().getMessageBus().syncPublisher(TOPIC).progressWindowCreated(this);
if (myProject != null) {
myCancelOnProjectDisposal = () -> {
if (isRunning()) {
cancel();
}
};
Disposer.register(myProject, myCancelOnProjectDisposal);
Disposer.register(myProject, this);
}
}
@@ -398,8 +392,8 @@ public class ProgressWindow extends ProgressIndicatorBase implements BlockingPro
@Override
public void dispose() {
stopSystemActivity();
if (myCancelOnProjectDisposal != null) {
Disposer.dispose(myCancelOnProjectDisposal);
if (isRunning()) {
cancel();
}
}