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
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
+1 -1
View File
@@ -166,7 +166,7 @@ public abstract class JavaBaseScope extends JetScopeImpl {
private static Collection<ClassDescriptor> filterObjects(@NotNull Collection<ClassDescriptor> classes, boolean objects) {
List<ClassDescriptor> result = new ArrayList<ClassDescriptor>();
for (ClassDescriptor descriptor : classes) {
if (descriptor.getKind().isObject() == objects) {
if (descriptor.getKind().isSingleton() == objects) {
result.add(descriptor);
}
}
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java
+2 -2
View File
@@ -67,7 +67,7 @@ public abstract class JavaClassMembersScope extends JavaBaseScope {
@Override
public ClassDescriptor getObjectDescriptor(@NotNull Name name) {
ClassDescriptor innerClass = getInnerClassesMap().get(name);
if (innerClass != null && innerClass.getKind().isObject()) {
if (innerClass != null && innerClass.getKind().isSingleton()) {
return innerClass;
}
return null;
@@ -76,7 +76,7 @@ public abstract class JavaClassMembersScope extends JavaBaseScope {
@Override
public ClassifierDescriptor getClassifier(@NotNull Name name) {
ClassDescriptor innerClass = getInnerClassesMap().get(name);
if (innerClass == null || innerClass.getKind().isObject()) {
if (innerClass == null || innerClass.getKind().isSingleton()) {
return null;
}
return innerClass;
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java
+2 -2
View File
@@ -56,7 +56,7 @@ public final class JavaPackageScope extends JavaBaseScope {
@Override
public ClassifierDescriptor getClassifier(@NotNull Name name) {
ClassDescriptor classDescriptor = memberResolver.resolveClass(packageFQN.child(name), IGNORE_KOTLIN_SOURCES);
if (classDescriptor == null || classDescriptor.getKind().isObject()) {
if (classDescriptor == null || classDescriptor.getKind().isSingleton()) {
return null;
}
return classDescriptor;
@@ -65,7 +65,7 @@ public final class JavaPackageScope extends JavaBaseScope {
@Override
public ClassDescriptor getObjectDescriptor(@NotNull Name name) {
ClassDescriptor classDescriptor = memberResolver.resolveClass(packageFQN.child(name), IGNORE_KOTLIN_SOURCES);
if (classDescriptor != null && classDescriptor.getKind().isObject()) {
if (classDescriptor != null && classDescriptor.getKind().isSingleton()) {
return classDescriptor;
}
return null;