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

vcs: simplify: merge modal & non-modal branches

Browse Source 
use conditional modal logic for Task.Backgroundable
calling start/stopBackgroundVcsOperation seems reasonable in both cases.

Relates to IDEA-151547.
This commit is contained in:
Kirill Likhodedov
2016-03-02 16:25:24 +03:00
parent cb8eaad3ba
commit 10d49689a2
1 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
+23 -30
View File
@@ -48,8 +48,9 @@ import com.intellij.util.NullableFunction;
import com.intellij.util.WaitForProgressToShow;
import com.intellij.util.concurrency.Semaphore;
import com.intellij.util.ui.ConfirmationDialog;
import org.jetbrains.annotations.*;
import org.jetbrains.annotations.CalledInAwt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collection;
@@ -115,38 +116,30 @@ public class CommitHelper {
}
private boolean doCommit(final GeneralCommitProcessor processor) {
Task.Backgroundable task = new Task.Backgroundable(myProject, myActionName, true, myConfiguration.getCommitOption()) {
public void run(@NotNull final ProgressIndicator indicator) {
final ProjectLevelVcsManager vcsManager = ProjectLevelVcsManager.getInstance(myProject);
vcsManager.startBackgroundVcsOperation();
try {
delegateCommitToVcsThread(processor);
}
finally {
vcsManager.stopBackgroundVcsOperation();
}
}
final Runnable action = new Runnable() {
public void run() {
delegateCommitToVcsThread(processor);
@Override
public boolean shouldStartInBackground() {
return !myForceSyncCommit && super.shouldStartInBackground();
}
@Override
public boolean isConditionalModal() {
return myForceSyncCommit;
}
};
if (myForceSyncCommit) {
ProgressManager.getInstance().runProcessWithProgressSynchronously(action, myActionName, true, myProject);
boolean success = doesntContainErrors(processor.getVcsExceptions());
if (success) {
reportResult(processor);
}
return success;
}
else {
Task.Backgroundable task =
new Task.Backgroundable(myProject, myActionName, true, myConfiguration.getCommitOption()) {
public void run(@NotNull final ProgressIndicator indicator) {
final ProjectLevelVcsManager vcsManager = ProjectLevelVcsManager.getInstance(myProject);
vcsManager.startBackgroundVcsOperation();
try {
action.run();
}
finally {
vcsManager.stopBackgroundVcsOperation();
}
}
};
ProgressManager.getInstance().run(task);
return false;
}
ProgressManager.getInstance().run(task);
return doesntContainErrors(processor.getVcsExceptions());
}
private void delegateCommitToVcsThread(final GeneralCommitProcessor processor) {