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

[shelf]: cleanUp - extract methods, add annotations, add timeStamp info

Browse Source 
* introduce PatchInfo class to store timestamp for last patch parsing;
* change cached loaded patches map types to accept PatchInfo as a value;
* extract isPatchFileChangedOrNotLoaded method for future usages;
This commit is contained in:
Nadya Zabrodina
2017-05-17 17:23:02 +03:00
parent 3a895e21e7
commit c19201cb24
1 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java
+38 -14
View File
@@ -296,7 +296,7 @@ public class DiffShelvedChangesAction extends AnAction implements DumbAware {
}
static class PatchesPreloader {
private final SoftHardCacheMap<String, List<TextFilePatch>> myFilePatchesMap = new SoftHardCacheMap<>(5, 5);
private final SoftHardCacheMap<String, PatchInfo> myFilePatchesMap = new SoftHardCacheMap<>(5, 5);
private final Project myProject;
PatchesPreloader(final Project project) {
@@ -304,24 +304,48 @@ public class DiffShelvedChangesAction extends AnAction implements DumbAware {
}
@NotNull
public TextFilePatch getPatch(final ShelvedChange shelvedChange, CommitContext commitContext) throws VcsException {
List<TextFilePatch> textFilePatches = myFilePatchesMap.get(shelvedChange.getPatchPath());
if (textFilePatches == null) {
try {
textFilePatches = ShelveChangesManager.loadPatches(myProject, shelvedChange.getPatchPath(), commitContext);
}
catch (IOException | PatchSyntaxException e) {
throw new VcsException(e);
}
myFilePatchesMap.put(shelvedChange.getPatchPath(), textFilePatches);
public TextFilePatch getPatch(final ShelvedChange shelvedChange, @NotNull CommitContext commitContext) throws VcsException {
String patchPath = shelvedChange.getPatchPath();
if (myFilePatchesMap.get(patchPath) == null || isPatchFileChanged(patchPath)) {
readFilePatchAndUpdateCaches(patchPath, commitContext);
}
for (TextFilePatch textFilePatch : textFilePatches) {
if (shelvedChange.getBeforePath().equals(textFilePatch.getBeforeName())) {
return textFilePatch;
PatchInfo patchInfo = myFilePatchesMap.get(patchPath);
if (patchInfo != null) {
for (TextFilePatch textFilePatch : patchInfo.myTextFilePatches) {
if (shelvedChange.getBeforePath().equals(textFilePatch.getBeforeName())) {
return textFilePatch;
}
}
}
throw new VcsException("Can not find patch for " + shelvedChange.getBeforePath() + " in patch file.");
}
private void readFilePatchAndUpdateCaches(@NotNull String patchPath, @NotNull CommitContext commitContext) throws VcsException {
try {
myFilePatchesMap.put(patchPath, new PatchInfo(ShelveChangesManager.loadPatches(myProject, patchPath, commitContext),
new File(patchPath).lastModified()));
}
catch (IOException | PatchSyntaxException e) {
throw new VcsException(e);
}
}
public boolean isPatchFileChanged(String patchPath) {
PatchInfo patchInfo = myFilePatchesMap.get(patchPath);
long lastModified = new File(patchPath).lastModified();
return patchInfo != null && lastModified != patchInfo.myLoadedTimeStamp;
}
private static class PatchInfo {
private final long myLoadedTimeStamp;
@NotNull private final List<TextFilePatch> myTextFilePatches;
public PatchInfo(@NotNull List<TextFilePatch> patches, long loadedTimeStamp) {
myTextFilePatches = patches;
myLoadedTimeStamp = loadedTimeStamp;
}
}
}
private static class MyDiffRequestChain extends UserDataHolderBase implements DiffRequestChain, GoToChangePopupBuilder.Chain {