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

IDEADEV-40416: Changes view: Move file to new changelist: "Make this changelist active" check box has no effect

Browse Source
This commit is contained in:
Dmitry Avdeev
2009-09-17 16:56:30 +04:00
parent d01d6a753f
commit 74733057d7
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListChooserPanel.java
+9 -3
View File
@@ -3,6 +3,7 @@ package com.intellij.openapi.vcs.changes.ui;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.vcs.VcsBundle;
import com.intellij.openapi.vcs.VcsConfiguration;
import com.intellij.openapi.vcs.changes.ChangeList;
import com.intellij.openapi.vcs.changes.ChangeListEditHandler;
import com.intellij.openapi.vcs.changes.ChangeListManager;
@@ -88,9 +89,10 @@ public class ChangeListChooserPanel extends JPanel {
@Nullable
public LocalChangeList getSelectedList(Project project) {
ChangeListManager manager = ChangeListManager.getInstance(project);
if (myRbNew.isSelected()) {
String newText = myNewListPanel.getName();
if (ChangeListManager.getInstance(project).findChangeList(newText) != null) {
if (manager.findChangeList(newText) != null) {
Messages.showErrorDialog(project,
VcsBundle.message("changes.newchangelist.warning.already.exists.text", newText),
VcsBundle.message("changes.newchangelist.warning.already.exists.title"));
@@ -102,9 +104,13 @@ public class ChangeListChooserPanel extends JPanel {
return (LocalChangeList)myExisitingsCombo.getSelectedItem();
}
else {
LocalChangeList changeList =
ChangeListManager.getInstance(project).addChangeList(myNewListPanel.getName(), myNewListPanel.getDescription());
LocalChangeList changeList = manager.addChangeList(myNewListPanel.getName(), myNewListPanel.getDescription());
myNewListPanel.changelistCreatedOrChanged(changeList);
if (myNewListPanel.getMakeActiveCheckBox().isSelected()) {
manager.setDefaultChangeList(changeList);
}
VcsConfiguration.getInstance(project).MAKE_NEW_CHANGELIST_ACTIVE = myNewListPanel.getMakeActiveCheckBox().isSelected();
return changeList;
}
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/NewChangelistDialog.java
-1
View File
@@ -23,7 +23,6 @@ public class NewChangelistDialog extends DialogWrapper {
setTitle(VcsBundle.message("changes.dialog.newchangelist.title"));
myPanel.init(project, null);
myPanel.getMakeActiveCheckBox().setSelected(VcsConfiguration.getInstance(project).MAKE_NEW_CHANGELIST_ACTIVE);
init();
}