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

require not-null parentDisposable for later-transactions

Browse Source
This commit is contained in:
peter
2016-03-29 15:10:48 +02:00
parent c0913f741e
commit 4f1217e3fb
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/openapi/application/TransactionGuard.java
+1 -2
View File
@@ -21,7 +21,6 @@ import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Ref;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* A service managing model transactions.<p/>
@@ -144,7 +143,7 @@ public abstract class TransactionGuard {
* Schedules a given runnable to be executed inside a transaction later on Swing thread.
* Same as {@link #submitTransaction(Disposable, Runnable)}, but the runnable is never executed immediately.
*/
public abstract void submitTransactionLater(@Nullable Disposable parentDisposable, @NotNull Runnable transaction);
public abstract void submitTransactionLater(@NotNull Disposable parentDisposable, @NotNull Runnable transaction);
/**
* Schedules a transaction and waits for it to be completed. Fails if invoked on UI thread inside an incompatible transaction,
platform/core-impl/src/com/intellij/openapi/application/TransactionGuardImpl.java
+1 -2
View File
@@ -25,7 +25,6 @@ import com.intellij.psi.impl.DebugUtil;
import com.intellij.util.concurrency.Semaphore;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.Queue;
@@ -260,7 +259,7 @@ public class TransactionGuardImpl extends TransactionGuard {
}
@Override
public void submitTransactionLater(@Nullable final Disposable parentDisposable, @NotNull final Runnable transaction) {
public void submitTransactionLater(@NotNull final Disposable parentDisposable, @NotNull final Runnable transaction) {
Application app = ApplicationManager.getApplication();
app.invokeLater(new Runnable() {
@Override
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
+1 -1
View File
@@ -1457,7 +1457,7 @@ public class FileBasedIndexImpl extends FileBasedIndex {
else {
// we do invoke later since we can have read lock acquired
//noinspection SSBasedInspection
TransactionGuard.getInstance().submitTransactionLater(null, rebuildRunnable);
TransactionGuard.getInstance().submitTransactionLater(app, rebuildRunnable);
}
}
}