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

vcs: remove unnecessary wrapper

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-04-19 16:11:45 +03:00
parent 99f603ffe6
commit 79a4b7aa97
1 changed files with 13 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsCurrentRevisionProxy.java
+13 -40
View File
@@ -59,7 +59,7 @@ public class VcsCurrentRevisionProxy implements ContentRevision {
@Nullable
public String getContent() throws VcsException {
return getVcsRevision().getContent();
return ContentRevisionCache.getAsString(getVcsRevision().second, getFile(), null);
}
@NotNull
@@ -70,7 +70,7 @@ public class VcsCurrentRevisionProxy implements ContentRevision {
@NotNull
public VcsRevisionNumber getRevisionNumber() {
try {
return getVcsRevision().getRevisionNumber();
return getVcsRevision().first;
}
catch(VcsException ex) {
return VcsRevisionNumber.NULL;
@@ -78,51 +78,24 @@ public class VcsCurrentRevisionProxy implements ContentRevision {
}
@NotNull
private ContentRevision getVcsRevision() throws VcsException {
final FilePath file = getFile();
final Pair<VcsRevisionNumber, byte[]> pair;
private Pair<VcsRevisionNumber, byte[]> getVcsRevision() throws VcsException {
try {
pair = ContentRevisionCache.getOrLoadCurrentAsBytes(myProject, file, myVcsKey,
return ContentRevisionCache.getOrLoadCurrentAsBytes(myProject, getFile(), myVcsKey,
new CurrentRevisionProvider() {
@Override
public VcsRevisionNumber getCurrentRevision() throws VcsException {
return getCurrentRevisionNumber();
}
@Override
public VcsRevisionNumber getCurrentRevision() throws VcsException {
return getCurrentRevisionNumber();
}
@Override
public Pair<VcsRevisionNumber, byte[]> get() throws VcsException, IOException {
return loadContent();
}
});
@Override
public Pair<VcsRevisionNumber, byte[]> get() throws VcsException, IOException {
return loadContent();
}
});
}
catch (IOException e) {
throw new VcsException(e);
}
return new ByteBackedContentRevision() {
@Override
public String getContent() throws VcsException {
return ContentRevisionCache.getAsString(getContentAsBytes(), file, null);
}
@Nullable
@Override
public byte[] getContentAsBytes() throws VcsException {
return pair.getSecond();
}
@NotNull
@Override
public FilePath getFile() {
return file;
}
@NotNull
@Override
public VcsRevisionNumber getRevisionNumber() {
return pair.getFirst();
}
};
}
@NotNull