azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor, fix warnings in KotlinClassFileIndex

Browse Source
This commit is contained in:
Alexander Udalov
2014-09-12 21:18:18 +04:00
parent ecaf87f51c
commit 8cc1a1da27
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java
+6 -4
View File
@@ -41,12 +41,12 @@ public final class KotlinClassFileIndex extends ScalarIndexExtension<FqName> {
private static final KeyDescriptor<FqName> KEY_DESCRIPTOR = new KeyDescriptor<FqName>() { private static final KeyDescriptor<FqName> KEY_DESCRIPTOR = new KeyDescriptor<FqName>() {
@Override @Override
public void save(DataOutput out, FqName value) throws IOException { public void save(@NotNull DataOutput out, FqName value) throws IOException {
out.writeUTF(value.asString()); out.writeUTF(value.asString());
} }
@Override @Override
public FqName read(DataInput in) throws IOException { public FqName read(@NotNull DataInput in) throws IOException {
return new FqName(in.readUTF()); return new FqName(in.readUTF());
} }
@@ -66,14 +66,14 @@ public final class KotlinClassFileIndex extends ScalarIndexExtension<FqName> {
private static final FileBasedIndex.InputFilter INPUT_FILTER = new FileBasedIndex.InputFilter() { private static final FileBasedIndex.InputFilter INPUT_FILTER = new FileBasedIndex.InputFilter() {
@Override @Override
public boolean acceptInput(VirtualFile file) { public boolean acceptInput(@NotNull VirtualFile file) {
return file.getFileType() == JavaClassFileType.INSTANCE; return file.getFileType() == JavaClassFileType.INSTANCE;
} }
}; };
public static final DataIndexer<FqName, Void, FileContent> INDEXER = new DataIndexer<FqName, Void, FileContent>() { public static final DataIndexer<FqName, Void, FileContent> INDEXER = new DataIndexer<FqName, Void, FileContent>() {
@NotNull @NotNull
@Override @Override
public Map<FqName, Void> map(FileContent inputData) { public Map<FqName, Void> map(@NotNull FileContent inputData) {
try { try {
KotlinJvmBinaryClass kotlinClass = KotlinBinaryClassCache.getKotlinBinaryClass(inputData.getFile()); KotlinJvmBinaryClass kotlinClass = KotlinBinaryClassCache.getKotlinBinaryClass(inputData.getFile());
if (kotlinClass != null && kotlinClass.getClassHeader().getKind() != KotlinClassHeader.Kind.INCOMPATIBLE_ABI_VERSION) { if (kotlinClass != null && kotlinClass.getClassHeader().getKind() != KotlinClassHeader.Kind.INCOMPATIBLE_ABI_VERSION) {
@@ -99,11 +99,13 @@ public final class KotlinClassFileIndex extends ScalarIndexExtension<FqName> {
return INDEXER; return INDEXER;
} }
@NotNull
@Override @Override
public KeyDescriptor<FqName> getKeyDescriptor() { public KeyDescriptor<FqName> getKeyDescriptor() {
return KEY_DESCRIPTOR; return KEY_DESCRIPTOR;
} }
@NotNull
@Override @Override
public FileBasedIndex.InputFilter getInputFilter() { public FileBasedIndex.InputFilter getInputFilter() {
return INPUT_FILTER; return INPUT_FILTER;