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

simplify TransactionGuardImpl: no modality state passing around

Browse Source
This commit is contained in:
peter
2016-03-01 09:10:54 +01:00
parent 79efada657
commit a1125ffc6f
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/openapi/application/TransactionGuardImpl.java
+4 -16
View File
@@ -92,12 +92,6 @@ public class TransactionGuardImpl extends TransactionGuard {
@Override
public void submitMergeableTransaction(@NotNull final TransactionKind kind, @NotNull final Runnable transaction) {
submitTransaction(kind, transaction, ModalityState.defaultModalityState());
}
public void submitTransaction(@NotNull final TransactionKind kind,
@NotNull final Runnable transaction,
ModalityState modalityState) {
Runnable runnable = new Runnable() {
@Override
public void run() {
@@ -111,12 +105,12 @@ public class TransactionGuardImpl extends TransactionGuard {
}
};
//todo replace with SwingUtilities when write actions are required to run under a guard
final Application app = ApplicationManager.getApplication();
if (app.isDispatchThread()) {
runnable.run();
} else {
app.invokeLater(runnable, modalityState, app.getDisposed());
//todo add ModalityState.any() when write actions are required to run under a guard
app.invokeLater(runnable, app.getDisposed());
}
}
@@ -145,12 +139,6 @@ public class TransactionGuardImpl extends TransactionGuard {
@Override
public void submitTransactionAndWait(@NotNull TransactionKind kind, @NotNull final Runnable transaction) throws ProcessCanceledException {
submitTransactionAndWait(kind, transaction, ModalityState.defaultModalityState());
}
public void submitTransactionAndWait(@NotNull TransactionKind kind,
@NotNull final Runnable transaction,
ModalityState modalityState) {
Application app = ApplicationManager.getApplication();
assert !app.isDispatchThread() : "submitTransactionAndWait should not be invoked on dispatch thread";
assert !app.isReadAccessAllowed() : "submitTransactionAndWait should not be invoked from a read action";
@@ -158,7 +146,7 @@ public class TransactionGuardImpl extends TransactionGuard {
final Semaphore semaphore = new Semaphore();
semaphore.down();
final Throwable[] exception = {null};
submitTransaction(kind, new Runnable() {
submitMergeableTransaction(kind, new Runnable() {
@Override
public void run() {
try {
@@ -171,7 +159,7 @@ public class TransactionGuardImpl extends TransactionGuard {
semaphore.up();
}
}
}, modalityState);
});
semaphore.waitFor();
if (exception[0] != null) {
throw new RuntimeException(exception[0]);