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: refactoring - extract methods, inline recycling

Browse Source 
* create separated methods for 2 cases:
 1. only update modified old list
 2. update modified old list and create new separated recycled list
  with unshelved changes;
* inline recycled method for second case to avoid useless view update;
* update view after all (notify changes);
This commit is contained in:
Nadya Zabrodina
2018-11-06 20:24:35 +03:00
parent 141aa56bea
commit 851e833608
1 changed files with 24 additions and 10 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
+24 -10
View File
@@ -891,25 +891,39 @@ public class ShelveChangesManager implements JDOMExternalizable, ProjectComponen
public void saveRemainingPatches(final ShelvedChangeList changeList, final List<FilePatch> remainingPatches,
final List<ShelvedBinaryFile> remainingBinaries, CommitContext commitContext) {
ShelvedChangeList listCopy;
if (changeList.isRecycled()) {
saveRemainingChangesInList(changeList, remainingPatches, remainingBinaries, commitContext);
}
else {
saveRemainingAndRecycleOthers(changeList, remainingPatches, remainingBinaries, commitContext);
}
notifyStateChanged();
}
private void saveRemainingAndRecycleOthers(@NotNull final ShelvedChangeList changeList, final List<FilePatch> remainingPatches,
final List<ShelvedBinaryFile> remainingBinaries, CommitContext commitContext) {
try {
listCopy = !changeList.isRecycled() ? createChangelistCopy(changeList) : null;
ShelvedChangeList listCopy = createChangelistCopy(changeList);
saveRemainingChangesInList(changeList, remainingPatches, remainingBinaries, commitContext);
filterShelvedList(listCopy, changeList.getChanges(myProject), changeList.getBinaryFiles());
listCopy.updateDate();
listCopy.setRecycled(true);
saveListAsScheme(listCopy);
}
catch (IOException e) {
// do not delete if cannot recycle
return;
}
}
private void saveRemainingChangesInList(@NotNull ShelvedChangeList changeList,
List<FilePatch> remainingPatches,
List<ShelvedBinaryFile> remainingBinaries, CommitContext commitContext) {
writePatchesToFile(myProject, changeList.PATH, remainingPatches, commitContext);
changeList.getBinaryFiles().retainAll(remainingBinaries);
changeList.clearLoadedChanges();
if (listCopy != null) {
filterShelvedList(listCopy, changeList.getChanges(myProject), changeList.getBinaryFiles());
recycleChangeList(listCopy);
// all newly create ShelvedChangeList have to be added to SchemesManger as new scheme
saveListAsScheme(listCopy);
}
notifyStateChanged();
}
private void saveListAsScheme(@NotNull ShelvedChangeList list) {