From 7d30cb1eeddfd9dcd8ee372df8bbbd7d58bcaca3 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Wed, 17 Jun 2015 19:13:23 +0300 Subject: [PATCH] [shelf] inline the only method invocation to reduce overloading variants --- .../openapi/vcs/changes/shelf/ShelveChangesManager.java | 5 ----- .../openapi/vcs/changes/shelf/UnshelveChangesAction.java | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java index 5de3f17a5fbb..3e5d7baf84d5 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java @@ -355,11 +355,6 @@ public class ShelveChangesManager extends AbstractProjectComponent implements JD } } - public void unshelveChangeList(final ShelvedChangeList changeList, @Nullable final List changes, - @Nullable final List binaryFiles, final LocalChangeList targetChangeList) { - unshelveChangeList(changeList, changes, binaryFiles, targetChangeList, true); - } - @AsynchronousExecution public void unshelveChangeList(final ShelvedChangeList changeList, @Nullable final List changes, diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/UnshelveChangesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/UnshelveChangesAction.java index 19760bf65df7..8f9d4b217e01 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/UnshelveChangesAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/UnshelveChangesAction.java @@ -83,7 +83,7 @@ public class UnshelveChangesAction extends DumbAwareAction { public void run(@NotNull ProgressIndicator indicator) { for (ShelvedChangeList changeList : changeLists) { ShelveChangesManager.getInstance(project) - .unshelveChangeList(changeList, finalChanges, finalBinaryFiles, chooser.getSelectedList()); + .unshelveChangeList(changeList, finalChanges, finalBinaryFiles, chooser.getSelectedList(), true); } } });