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

Rename ClassKind.isObject -> isSingleton

Browse Source 
"isObject" gives a false impression that this is a check if the kind is OBJECT
This commit is contained in:
Alexander Udalov
2013-11-21 16:43:37 +04:00
parent 9a8d639ac5
commit 2c6bf6171f
21 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java
+3 -3
View File
@@ -5,10 +5,10 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.descriptors.serialization.*;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.storage.StorageManager;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.storage.StorageManager;
import java.util.ArrayList;
import java.util.Collection;
@@ -62,7 +62,7 @@ public class DeserializedPackageMemberScope extends DeserializedMemberScope {
if (classDescriptor == null) {
return null;
}
return classDescriptor.getKind().isObject() == object ? classDescriptor : null;
return classDescriptor.getKind().isSingleton() == object ? classDescriptor : null;
}
@Override
@@ -81,7 +81,7 @@ public class DeserializedPackageMemberScope extends DeserializedMemberScope {
ClassDescriptor classDescriptor = findClassDescriptor(className, object);
if (classDescriptor != null) {
assert classDescriptor.getKind().isObject() == object;
assert classDescriptor.getKind().isSingleton() == object;
result.add(classDescriptor);
}
}