platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictResolution.java

   1 package com.intellij.openapi.vcs.changes.conflicts;
   2
   3 import com.intellij.openapi.project.Project;
   4 import com.intellij.openapi.vcs.changes.*;
   5 import com.intellij.openapi.vcs.changes.shelf.ShelveChangesCommitExecutor;
   6 import com.intellij.openapi.vcs.changes.ui.CommitChangeListDialog;
   7 import com.intellij.openapi.vfs.VirtualFile;
   8
   9 import java.util.Collection;
  10 import java.util.HashSet;
  11 import java.util.Set;
  12
  13 /**
  14  * @author Dmitry Avdeev
  15  */
  16 public enum ChangelistConflictResolution {
  17
  18   SHELVE {
  19     @Override
  20     public boolean resolveConflict(Project project, Collection<Change> changes) {
  21       LocalChangeList changeList = getManager(project).getChangeList(changes.iterator().next());
  22       return CommitChangeListDialog.commitChanges(project, changes, changeList, new ShelveChangesCommitExecutor(project), null);
  23     }},
  24
  25   MOVE {
  26     @Override
  27     public boolean resolveConflict(Project project, Collection<Change> changes) {
  28       ChangeListManagerImpl manager = getManager(project);
  29       Set<ChangeList> changeLists = new HashSet<ChangeList>();
  30       for (Change change : changes) {
  31         changeLists.add(manager.getChangeList(change));
  32       }
  33       MoveChangesDialog dialog = new MoveChangesDialog(project, changes, changeLists, "Move Changes");
  34       dialog.show();
  35       if (dialog.isOK()) {
  36         manager.moveChangesTo(manager.getDefaultChangeList(), changes.toArray(new Change[changes.size()]));
  37         return true;
  38       }
  39       return false;
  40     }},
  41
  42   SWITCH{
  43     @Override
  44     public boolean resolveConflict(Project project, Collection<Change> changes) {
  45       LocalChangeList changeList = getManager(project).getChangeList(changes.iterator().next());
  46       assert changeList != null;
  47       getManager(project).setDefaultChangeList(changeList);
  48       return true;
  49     }},
  50
  51   IGNORE {
  52     @Override
  53     public boolean resolveConflict(Project project, Collection<Change> changes) {
  54       ChangeListManagerImpl manager = getManager(project);
  55       for (Change change : changes) {
  56         VirtualFile file = change.getVirtualFile();
  57         if (file != null) {
  58           manager.getConflictTracker().ignoreConflict(file, true);
  59         }
  60       }
  61       return true;
  62     }};
  63
  64   public abstract boolean resolveConflict(Project project, Collection<Change> changes);
  65
  66   private static ChangeListManagerImpl getManager(Project project) {
  67     return (ChangeListManagerImpl)ChangeListManager.getInstance(project);
  68   }
  69 }