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

shelf: cleanUp - extract shelf delete logic to ShelveChangesManager

Browse Source
This commit is contained in:
Nadya Zabrodina
2018-11-06 20:24:37 +03:00
parent 74fae6b7d2
commit 5c3bdfbc02
2 changed files with 71 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
+60
View File
@@ -42,6 +42,7 @@ import com.intellij.util.messages.Topic;
import com.intellij.util.text.CharArrayCharSequence;
import com.intellij.util.ui.UIUtil;
import com.intellij.vcsUtil.FilesProgress;
import com.intellij.vcsUtil.VcsImplUtil;
import com.intellij.vcsUtil.VcsUtil;
import org.jdom.Element;
import org.jdom.Parent;
@@ -688,6 +689,65 @@ public class ShelveChangesManager implements JDOMExternalizable, ProjectComponen
});
}
@NotNull
Map<ShelvedChangeList, Date> deleteShelves(@NotNull List<ShelvedChangeList> shelvedListsToDelete,
@NotNull List<ShelvedChangeList> shelvedListsFromChanges,
@NotNull List<ShelvedChange> changesToDelete,
@NotNull List<ShelvedBinaryFile> binariesToDelete) {
// filter changes
ArrayList<ShelvedChangeList> shelvedListsFromChangesToDelete = newArrayList(shelvedListsFromChanges);
shelvedListsFromChangesToDelete.removeAll(shelvedListsToDelete);
if (shelvedListsFromChangesToDelete.size() + binariesToDelete.size() == 0 && shelvedListsToDelete.isEmpty()) {
return Collections.emptyMap();
}
//store original dates to restore if needed
Map<ShelvedChangeList, Date> createdDeletedListsWithOriginalDate = newHashMap();
for (ShelvedChangeList changeList : shelvedListsToDelete) {
Date originalDate = changeList.DATE;
ShelvedChangeList recentlyDeleted = deleteChangeList(changeList);
//was not completely deleted
if (recentlyDeleted != null) {
createdDeletedListsWithOriginalDate.put(recentlyDeleted, originalDate);
}
}
for (ShelvedChangeList list : shelvedListsFromChangesToDelete) {
Date originalDate = list.DATE;
ShelvedChangeList listWithDeletedChanges = removeChangesFromChangeList(list, changesToDelete, binariesToDelete);
if (listWithDeletedChanges != null) {
createdDeletedListsWithOriginalDate.put(listWithDeletedChanges, originalDate);
}
}
return createdDeletedListsWithOriginalDate;
}
@Nullable
private ShelvedChangeList removeChangesFromChangeList(@NotNull ShelvedChangeList list,
@NotNull List<ShelvedChange> changes,
@NotNull List<ShelvedBinaryFile> binaryFiles) {
final ArrayList<ShelvedBinaryFile> remainingBinaries = new ArrayList<>(list.getBinaryFiles());
remainingBinaries.removeAll(binaryFiles);
final CommitContext commitContext = new CommitContext();
final List<FilePatch> remainingPatches = new ArrayList<>();
try {
loadTextPatches(myProject, list, changes, remainingPatches, commitContext);
}
catch (IOException | PatchSyntaxException e) {
LOG.info(e);
VcsImplUtil.showErrorMessage(myProject, e.getMessage(), "Cannot delete files from " + list.DESCRIPTION);
return null;
}
if (remainingPatches.isEmpty() && remainingBinaries.isEmpty()) {
return deleteChangeList(list);
}
else {
return saveRemainingPatches(list, remainingPatches, remainingBinaries, commitContext, true);
}
}
static List<TextFilePatch> loadTextPatches(final Project project,
final ShelvedChangeList changeList,
final List<ShelvedChange> changes,
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java
+11 -54
View File
@@ -19,8 +19,6 @@ import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.diff.impl.patch.FilePatch;
import com.intellij.openapi.diff.impl.patch.PatchSyntaxException;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager;
@@ -34,7 +32,10 @@ import com.intellij.openapi.util.Couple;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.*;
import com.intellij.openapi.vcs.changes.*;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.DiffPreviewUpdateProcessor;
import com.intellij.openapi.vcs.changes.DnDActivateOnHoldTargetContent;
import com.intellij.openapi.vcs.changes.PreviewDiffSplitterComponent;
import com.intellij.openapi.vcs.changes.actions.ShowDiffPreviewAction;
import com.intellij.openapi.vcs.changes.issueLinks.IssueLinkRenderer;
import com.intellij.openapi.vcs.changes.issueLinks.TreeLinkMouseListener;
@@ -59,7 +60,6 @@ import com.intellij.util.ui.GraphicsUtil;
import com.intellij.util.ui.tree.TreeUtil;
import com.intellij.util.ui.update.MergingUpdateQueue;
import com.intellij.util.ui.update.Update;
import com.intellij.vcsUtil.VcsImplUtil;
import com.intellij.vcsUtil.VcsUtil;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.CalledInAwt;
@@ -94,9 +94,9 @@ public class ShelvedChangesViewManager implements Disposable {
private final ChangesViewContentManager myContentManager;
private final ShelveChangesManager myShelveChangesManager;
private final Project myProject;
private final ShelfTree myTree;
final ShelfTree myTree;
private MyShelfContent myContent = null;
private final DeleteProvider myDeleteProvider = new MyShelveDeleteProvider();
final DeleteProvider myDeleteProvider = new MyShelveDeleteProvider();
private final MergingUpdateQueue myUpdateQueue;
private final VcsConfiguration myVcsConfiguration;
@@ -613,32 +613,15 @@ public class ShelvedChangesViewManager implements Disposable {
if (project == null) return;
List<ShelvedChangeList> shelvedListsToDelete = TreeUtil.collectSelectedObjectsOfType(myTree, ShelvedChangeList.class);
ArrayList<ShelvedChangeList> shelvedListsFromChanges = newArrayList(getShelvedLists(dataContext));
// filter changes
shelvedListsFromChanges.removeAll(shelvedListsToDelete);
List<ShelvedChange> changesToDelete = getChangesNotInLists(shelvedListsToDelete, getShelveChanges(dataContext));
List<ShelvedBinaryFile> binariesToDelete = getBinariesNotInLists(shelvedListsToDelete, getBinaryShelveChanges(dataContext));
int fileListSize = binariesToDelete.size() + changesToDelete.size();
if (fileListSize == 0 && shelvedListsToDelete.isEmpty()) return;
Map<ShelvedChangeList, Date> createdDeletedListsWithOriginalDate = newHashMap();
for (ShelvedChangeList changeList : shelvedListsToDelete) {
Date originalDate = changeList.DATE;
ShelvedChangeList recentlyDeleted = ShelveChangesManager.getInstance(myProject).deleteChangeList(changeList);
if (recentlyDeleted != null) {
createdDeletedListsWithOriginalDate.put(recentlyDeleted, originalDate);
}
}
for (ShelvedChangeList list : shelvedListsFromChanges) {
Date originalDate = list.DATE;
ShelvedChangeList listWithDeletedChanges = removeChangesFromChangeList(project, list, changesToDelete, binariesToDelete);
if (listWithDeletedChanges != null) {
createdDeletedListsWithOriginalDate.put(listWithDeletedChanges, originalDate);
}
}
if (!createdDeletedListsWithOriginalDate.isEmpty()) {
showUndoDeleteNotification(shelvedListsToDelete, fileListSize, createdDeletedListsWithOriginalDate);
Map<ShelvedChangeList, Date> createdDeletedListsWithOriginalDates =
myShelveChangesManager.deleteShelves(shelvedListsToDelete, getShelvedLists(dataContext), changesToDelete, binariesToDelete);
if (!createdDeletedListsWithOriginalDates.isEmpty()) {
showUndoDeleteNotification(shelvedListsToDelete, fileListSize, createdDeletedListsWithOriginalDates);
}
}
@@ -710,32 +693,6 @@ public class ShelvedChangesViewManager implements Disposable {
return (size == 1 ? "one" : size) + StringUtil.pluralize(" file", size);
}
@Nullable
private ShelvedChangeList removeChangesFromChangeList(@NotNull Project project,
@NotNull ShelvedChangeList list,
@NotNull List<ShelvedChange> changes,
@NotNull List<ShelvedBinaryFile> binaryFiles) {
final ArrayList<ShelvedBinaryFile> remainingBinaries = new ArrayList<>(list.getBinaryFiles());
remainingBinaries.removeAll(binaryFiles);
final CommitContext commitContext = new CommitContext();
final List<FilePatch> remainingPatches = new ArrayList<>();
try {
ShelveChangesManager.loadTextPatches(myProject, list, changes, remainingPatches, commitContext);
}
catch (IOException | PatchSyntaxException e) {
LOG.info(e);
VcsImplUtil.showErrorMessage(myProject, e.getMessage(), "Cannot delete files from " + list.DESCRIPTION);
return null;
}
if (remainingPatches.isEmpty() && remainingBinaries.isEmpty()) {
return myShelveChangesManager.deleteChangeList(list);
}
else {
return myShelveChangesManager.saveRemainingPatches(list, remainingPatches, remainingBinaries, commitContext, true);
}
}
@Override
public boolean canDeleteElement(@NotNull DataContext dataContext) {
return !getShelvedLists(dataContext).isEmpty();