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-40750 NPE at MoveChangesDialog

Browse Source
This commit is contained in:
Dmitry Avdeev
2009-10-21 12:59:03 +04:00
parent 66f98700d7
commit e20cb466db
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictResolution.java
+9 -1
View File
@@ -16,6 +16,7 @@
package com.intellij.openapi.vcs.changes.conflicts;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.vcs.changes.*;
import com.intellij.openapi.vcs.changes.shelf.ShelveChangesCommitExecutor;
import com.intellij.openapi.vcs.changes.ui.CommitChangeListDialog;
@@ -43,7 +44,14 @@ public enum ChangelistConflictResolution {
ChangeListManagerImpl manager = getManager(project);
Set<ChangeList> changeLists = new HashSet<ChangeList>();
for (Change change : changes) {
changeLists.add(manager.getChangeList(change));
LocalChangeList list = manager.getChangeList(change);
if (list != null) {
changeLists.add(list);
}
}
if (changeLists.isEmpty()) {
Messages.showInfoMessage(project, "The conflict seems to be resolved", "No Conflict Found");
return true;
}
MoveChangesDialog dialog = new MoveChangesDialog(project, changes, changeLists, "Move Changes");
dialog.show();