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

[git] simplify old progress title restoration

Browse Source 
it can be done in any thread, no need in complex continuation stuff here
This commit is contained in:
Kirill Likhodedov
2015-07-24 16:17:03 +03:00
parent 3044bae718
commit 9a1a303d21
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/stash/GitShelveChangesSaver.java
+2 -9
View File
@@ -26,8 +26,6 @@ import com.intellij.openapi.vcs.changes.shelf.ShelvedChangesViewManager;
import com.intellij.openapi.vcs.impl.LocalChangesUnderRoots;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.continuation.ContinuationContext;
import com.intellij.util.continuation.TaskDescriptor;
import com.intellij.util.continuation.Where;
import git4idea.GitPlatformFacade;
import git4idea.commands.Git;
import git4idea.i18n.GitBundle;
@@ -90,18 +88,13 @@ public class GitShelveChangesSaver extends GitChangesSaver {
protected void load(ContinuationContext context) {
if (myShelvedLists != null) {
LOG.info("load ");
final String oldProgressTitle = myProgressIndicator.getText();
String oldProgressTitle = myProgressIndicator.getText();
myProgressIndicator.setText(GitBundle.getString("update.unshelving.changes"));
context.next(new TaskDescriptor("", Where.AWT) {
@Override
public void run(ContinuationContext context) {
myProgressIndicator.setText(oldProgressTitle);
}
});
for (ShelvedChangeList list : myShelvedLists.values()) {
GitShelveUtils.doSystemUnshelve(myProject, list, myShelveManager, context,
getConflictLeftPanelTitle(), getConflictRightPanelTitle());
}
myProgressIndicator.setText(oldProgressTitle);
}
}