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: wrap unshelve action body into progress for continuation to don't assert

Browse Source
This commit is contained in:
irengrig
2011-04-08 15:02:58 +04:00
parent 98ffa87fd2
commit 58cdd2dff4
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/UnshelveChangesAction.java
+16 -4
View File
@@ -27,11 +27,16 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.VcsBundle;
import com.intellij.openapi.vcs.changes.BackgroundFromStartOption;
import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vcs.changes.LocalChangeList;
import com.intellij.openapi.vcs.changes.ui.ChangeListChooser;
import org.jetbrains.annotations.NotNull;
import java.util.List;
@@ -65,7 +70,7 @@ public class UnshelveChangesAction extends AnAction {
}
}
defaultName = changeLists.length == 1 ? changeLists [0].DESCRIPTION : null;
ChangeListChooser chooser = new ChangeListChooser(project, allChangeLists, list,
final ChangeListChooser chooser = new ChangeListChooser(project, allChangeLists, list,
VcsBundle.message("unshelve.changelist.chooser.title"), defaultName);
chooser.show();
if (!chooser.isOK()) {
@@ -74,9 +79,16 @@ public class UnshelveChangesAction extends AnAction {
FileDocumentManager.getInstance().saveAllDocuments();
for(ShelvedChangeList changeList: changeLists) {
ShelveChangesManager.getInstance(project).unshelveChangeList(changeList, changes, binaryFiles, chooser.getSelectedList());
}
final List<ShelvedBinaryFile> finalBinaryFiles = binaryFiles;
final List<ShelvedChange> finalChanges = changes;
ProgressManager.getInstance().run(new Task.Backgroundable(project, "Unshelve changes", true, BackgroundFromStartOption.getInstance()) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
for(ShelvedChangeList changeList: changeLists) {
ShelveChangesManager.getInstance(project).unshelveChangeList(changeList, finalChanges, finalBinaryFiles, chooser.getSelectedList());
}
}
});
}
@Override