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

rename JetClass.isTrait() to isInterface(); rename ClassKind.TRAIT to INTERACE

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-04-27 14:04:19 +02:00
parent ee60ce8369
commit cce1be3892
62 changed files with 95 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt
+1 -1
View File
@@ -54,7 +54,7 @@ class LazyJavaClassDescriptor(
private val kind = when {
jClass.isAnnotationType() -> ClassKind.ANNOTATION_CLASS
jClass.isInterface() -> ClassKind.TRAIT
jClass.isInterface() -> ClassKind.INTERFACE
jClass.isEnum() -> ClassKind.ENUM_CLASS
else -> ClassKind.CLASS
}
core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassKind.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.descriptors;
public enum ClassKind {
CLASS,
TRAIT,
INTERFACE,
ENUM_CLASS,
ENUM_ENTRY,
ANNOTATION_CLASS,
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java
+2 -2
View File
@@ -988,7 +988,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
if (!startFromName) {
renderAnnotations(klass, builder);
renderVisibility(klass.getVisibility(), builder);
if (!(klass.getKind() == ClassKind.TRAIT && klass.getModality() == Modality.ABSTRACT
if (!(klass.getKind() == ClassKind.INTERFACE && klass.getModality() == Modality.ABSTRACT
|| klass.getKind().isSingleton() && klass.getModality() == Modality.FINAL)) {
renderModality(klass.getModality(), builder);
}
@@ -1056,7 +1056,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
switch (klass.getKind()) {
case CLASS:
return "class";
case TRAIT:
case INTERFACE:
return "trait";
case ENUM_CLASS:
return "enum class";
core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
+3 -3
View File
@@ -303,7 +303,7 @@ public class DescriptorUtils {
}
public static boolean isTrait(@Nullable DeclarationDescriptor descriptor) {
return isKindOf(descriptor, ClassKind.TRAIT);
return isKindOf(descriptor, ClassKind.INTERFACE);
}
public static boolean isClass(@Nullable DeclarationDescriptor descriptor) {
@@ -332,7 +332,7 @@ public class DescriptorUtils {
Collection<JetType> superclassTypes = classDescriptor.getTypeConstructor().getSupertypes();
for (JetType type : superclassTypes) {
ClassDescriptor superClassDescriptor = getClassDescriptorForType(type);
if (superClassDescriptor.getKind() != ClassKind.TRAIT) {
if (superClassDescriptor.getKind() != ClassKind.INTERFACE) {
return type;
}
}
@@ -361,7 +361,7 @@ public class DescriptorUtils {
if (isAnonymousObject(classDescriptor)) {
return Visibilities.INTERNAL;
}
assert classKind == ClassKind.CLASS || classKind == ClassKind.TRAIT || classKind == ClassKind.ANNOTATION_CLASS;
assert classKind == ClassKind.CLASS || classKind == ClassKind.INTERFACE || classKind == ClassKind.ANNOTATION_CLASS;
return Visibilities.PUBLIC;
}
core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class Flags {
switch (kind) {
case CLASS:
return ProtoBuf.Class.Kind.CLASS;
case TRAIT:
case INTERFACE:
return ProtoBuf.Class.Kind.TRAIT;
case ENUM_CLASS:
return ProtoBuf.Class.Kind.ENUM_CLASS;
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt
+1 -1
View File
@@ -48,7 +48,7 @@ fun visibility(visibility: ProtoBuf.Visibility) = when (visibility) {
public fun classKind(kind: ProtoBuf.Class.Kind): ClassKind = when (kind) {
ProtoBuf.Class.Kind.CLASS -> ClassKind.CLASS
ProtoBuf.Class.Kind.TRAIT -> ClassKind.TRAIT
ProtoBuf.Class.Kind.TRAIT -> ClassKind.INTERFACE
ProtoBuf.Class.Kind.ENUM_CLASS -> ClassKind.ENUM_CLASS
ProtoBuf.Class.Kind.ENUM_ENTRY -> ClassKind.ENUM_ENTRY
ProtoBuf.Class.Kind.ANNOTATION_CLASS -> ClassKind.ANNOTATION_CLASS