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: @NotNull

Browse Source
This commit is contained in:
Aleksey Pivovarov
2016-02-26 14:03:09 +03:00
parent 036f4efc5f
commit 26657c674f
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/src/com/intellij/openapi/vcs/vfs/ContentRevisionVirtualFile.java
+4 -3
View File
@@ -34,13 +34,13 @@ import java.nio.ByteBuffer;
* @author yole
*/
public class ContentRevisionVirtualFile extends AbstractVcsVirtualFile {
private final ContentRevision myContentRevision;
@NotNull private final ContentRevision myContentRevision;
private byte[] myContent;
private boolean myContentLoadFailed;
private static final WeakHashMap<ContentRevision, ContentRevisionVirtualFile> ourMap = new WeakHashMap<ContentRevision, ContentRevisionVirtualFile>();
public static ContentRevisionVirtualFile create(ContentRevision contentRevision) {
public static ContentRevisionVirtualFile create(@NotNull ContentRevision contentRevision) {
synchronized(ourMap) {
ContentRevisionVirtualFile revisionVirtualFile = ourMap.get(contentRevision);
if (revisionVirtualFile == null) {
@@ -51,7 +51,7 @@ public class ContentRevisionVirtualFile extends AbstractVcsVirtualFile {
}
}
private ContentRevisionVirtualFile(ContentRevision contentRevision) {
private ContentRevisionVirtualFile(@NotNull ContentRevision contentRevision) {
super(contentRevision.getFile().getPath(), VcsFileSystem.getInstance());
myContentRevision = contentRevision;
setCharset(CharsetToolkit.UTF8_CHARSET);
@@ -119,6 +119,7 @@ public class ContentRevisionVirtualFile extends AbstractVcsVirtualFile {
}
}
@NotNull
public ContentRevision getContentRevision() {
return myContentRevision;
}
platform/vcs-api/src/com/intellij/openapi/vcs/vfs/VcsVirtualFile.java
+11 -6
View File
@@ -28,6 +28,7 @@ import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.openapi.vfs.VirtualFileSystem;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
import java.nio.charset.Charset;
@@ -43,15 +44,17 @@ public class VcsVirtualFile extends AbstractVcsVirtualFile {
private boolean myContentLoadFailed = false;
private Charset myCharset;
public VcsVirtualFile(String path,
VcsFileRevision revision, VirtualFileSystem fileSystem) {
public VcsVirtualFile(@NotNull String path,
@Nullable VcsFileRevision revision,
@NotNull VirtualFileSystem fileSystem) {
super(path, fileSystem);
myFileRevision = revision;
}
public VcsVirtualFile(String path,
byte[] content,
String revision, VirtualFileSystem fileSystem) {
public VcsVirtualFile(@NotNull String path,
@NotNull byte[] content,
@Nullable String revision,
@NotNull VirtualFileSystem fileSystem) {
this(path, null, fileSystem);
myContent = content;
setRevision(revision);
@@ -70,7 +73,8 @@ public class VcsVirtualFile extends AbstractVcsVirtualFile {
private void loadContent() throws IOException {
if (myContent != null) return;
assert myFileRevision != null;
final VcsFileSystem vcsFileSystem = ((VcsFileSystem)getFileSystem());
try {
@@ -122,6 +126,7 @@ public class VcsVirtualFile extends AbstractVcsVirtualFile {
}
@Nullable
public VcsFileRevision getFileRevision() {
return myFileRevision;
}