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

cancel project-bound progresses automatically on project disposal

Browse Source
This commit is contained in:
peter
2016-11-18 11:59:01 +01:00
parent e13693e661
commit 2cb545dee6
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
+13 -1
View File
@@ -22,7 +22,6 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.EmptyRunnable;
import com.intellij.openapi.wm.IdeFocusManager;
@@ -65,6 +64,7 @@ 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);
@@ -120,6 +120,15 @@ 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);
}
}
@Override
@@ -389,6 +398,9 @@ public class ProgressWindow extends ProgressIndicatorBase implements BlockingPro
@Override
public void dispose() {
stopSystemActivity();
if (myCancelOnProjectDisposal != null) {
Disposer.dispose(myCancelOnProjectDisposal);
}
}
@Override