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

shelf: cleanup - reuse existing method and optimize error notifications

Browse Source
This commit is contained in:
Nadya Zabrodina
2018-11-06 20:24:36 +03:00
parent 5dc71a66cb
commit acb49d7a03
2 changed files with 21 additions and 30 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
+5 -5
View File
@@ -692,11 +692,11 @@ public class ShelveChangesManager implements JDOMExternalizable, ProjectComponen
});
}
private static List<TextFilePatch> loadTextPatches(final Project project,
final ShelvedChangeList changeList,
final List<ShelvedChange> changes,
final List<FilePatch> remainingPatches,
final CommitContext commitContext)
static List<TextFilePatch> loadTextPatches(final Project project,
final ShelvedChangeList changeList,
final List<ShelvedChange> changes,
final List<FilePatch> remainingPatches,
final CommitContext commitContext)
throws IOException, PatchSyntaxException {
final List<TextFilePatch> textFilePatches = loadPatches(project, changeList.PATH, commitContext);
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java
+16 -25
View File
@@ -59,6 +59,7 @@ 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;
@@ -676,37 +677,27 @@ public class ShelvedChangesViewManager implements Disposable {
}
private void removeChangesFromChangeList(@NotNull Project project,
@NotNull ShelvedChangeList list,
@NotNull List<ShelvedChange> changes,
@NotNull List<ShelvedBinaryFile> binaryFiles) {
final ArrayList<ShelvedBinaryFile> oldBinaries = new ArrayList<>(list.getBinaryFiles());
final ArrayList<ShelvedChange> oldChanges = new ArrayList<>(list.getChanges(project));
oldBinaries.removeAll(binaryFiles);
oldChanges.removeAll(changes);
@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> patches = new ArrayList<>();
final List<VcsException> exceptions = new ArrayList<>();
for (ShelvedChange change : oldChanges) {
try {
patches.add(change.loadFilePatch(myProject, commitContext));
}
catch (IOException | PatchSyntaxException e) {
exceptions.add(new VcsException(e));
}
final List<FilePatch> remainingPatches = new ArrayList<>();
try {
ShelveChangesManager.loadTextPatches(myProject, list, changes, remainingPatches, commitContext);
}
if (patches.isEmpty() && oldBinaries.isEmpty()) {
catch (IOException | PatchSyntaxException e) {
LOG.info(e);
VcsImplUtil.showErrorMessage(myProject, e.getMessage(), "Cannot delete files from " + list.DESCRIPTION);
return;
}
if (remainingPatches.isEmpty() && remainingBinaries.isEmpty()) {
myShelveChangesManager.deleteChangeList(list);
}
else {
myShelveChangesManager.saveRemainingPatches(list, patches, oldBinaries, commitContext, true);
}
if (! exceptions.isEmpty()) {
String title = list.DESCRIPTION == null ? "" : list.DESCRIPTION;
title = title.substring(0, Math.min(10, title.length()));
AbstractVcsHelper.getInstance(myProject).showErrors(exceptions, "Deleting files from '" + title + "'");
myShelveChangesManager.saveRemainingPatches(list, remainingPatches, remainingBinaries, commitContext, true);
}
}