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

[vcs]: do not use cached changelist value while editing

Browse Source 
* IDEA-174855 edit changelist looses changes;
* IDEA-133289 Set Active Changelist is not working well;
* remove useless checks;
This commit is contained in:
Nadya Zabrodina
2017-06-29 15:09:16 +03:00
parent 759790f63c
commit 89c0cd140e
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/EditChangelistDialog.java
+11 -11
View File
@@ -19,6 +19,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.VcsBundle;
import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vcs.changes.LocalChangeList;
@@ -69,20 +70,19 @@ public class EditChangelistDialog extends DialogWrapper {
return;
}
if (!Comparing.equal(oldName, myPanel.getChangeListName(), true) || !Comparing.equal(oldComment, myPanel.getDescription(), true)) {
final ChangeListManager clManager = ChangeListManager.getInstance(myProject);
final ChangeListManager clManager = ChangeListManager.getInstance(myProject);
final String newName = myPanel.getChangeListName();
if (! myList.getName().equals(newName)) {
clManager.editName(myList.getName(), newName);
}
final String newDescription = myPanel.getDescription();
if (! myList.getComment().equals(newDescription)) {
clManager.editComment(myList.getName(), newDescription);
}
final String newDescription = myPanel.getDescription();
if (!StringUtil.equals(oldComment, newDescription)) {
clManager.editComment(oldName, newDescription);
}
final String newName = myPanel.getChangeListName();
if (!StringUtil.equals(oldName, newName)) {
clManager.editName(oldName, newName);
}
if (!myList.isDefault() && myPanel.getMakeActiveCheckBox().isSelected()) {
ChangeListManager.getInstance(myProject).setDefaultChangeList(myList);
clManager.setDefaultChangeList(newName);
}
myPanel.changelistCreatedOrChanged(myList);
super.doOKAction();