From 1253f2edcabebae15a5912f4660666cb5c845d65 Mon Sep 17 00:00:00 2001 From: irengrig Date: Wed, 2 Nov 2011 14:53:39 +0400 Subject: [PATCH] Unshelve changes: select 1) same named list or 2)active changelist in existing lists dropdown; always fill new changelist name --- .../vcs/changes/shelf/UnshelveChangesAction.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) 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 b83ae6e502d3..a009d5ad2446 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 @@ -57,19 +57,17 @@ public class UnshelveChangesAction extends AnAction { final ChangeListManager changeListManager = ChangeListManager.getInstance(project); final List allChangeLists = changeListManager.getChangeListsCopy(); - String defaultName = changeLists.length == 1 ? changeLists [0].DESCRIPTION : null; + String defaultName = changeLists [0].DESCRIPTION; LocalChangeList list = null; - if (defaultName == null) { - // use first - list = allChangeLists.get(0); - } else { + if (changeLists.length == 1) { final LocalChangeList sameNamedList = changeListManager.findChangeList(defaultName); if (sameNamedList != null) { list = sameNamedList; - defaultName = null; } } - defaultName = changeLists.length == 1 ? changeLists [0].DESCRIPTION : null; + if (list == null) { + list = changeListManager.getDefaultChangeList(); + } final ChangeListChooser chooser = new ChangeListChooser(project, allChangeLists, list, VcsBundle.message("unshelve.changelist.chooser.title"), defaultName); chooser.show();