MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 19:02:13 +07:00
Code Issues Packages Projects Releases Wiki Activity

Unshelve changes: select 1) same named list or 2)active changelist in existing lists dropdown; always fill new changelist name

Browse Source
This commit is contained in:
irengrig
2011-11-02 14:58:04 +04:00
parent 1c2f7a3359
commit 1253f2edca
1 changed files with 5 additions and 7 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
+5 -7
View File
@@ -57,19 +57,17 @@ public class UnshelveChangesAction extends AnAction {
final ChangeListManager changeListManager = ChangeListManager.getInstance(project);
final List<LocalChangeList> 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();