diff --git a/plugins/git4idea/src/git4idea/stash/GitShelveChangesSaver.java b/plugins/git4idea/src/git4idea/stash/GitShelveChangesSaver.java index 6bfa7aa090eb..9d6d4ae684f9 100644 --- a/plugins/git4idea/src/git4idea/stash/GitShelveChangesSaver.java +++ b/plugins/git4idea/src/git4idea/stash/GitShelveChangesSaver.java @@ -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); } }