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

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
@@ -385,7 +385,7 @@ public final class Namer {
@NotNull
public JsExpression classCreateInvocation(@NotNull ClassDescriptor descriptor) {
switch (descriptor.getKind()) {
case TRAIT:
case INTERFACE:
return traitCreationMethodReference();
case ENUM_CLASS:
return enumClassCreationMethodReference();
@@ -99,7 +99,7 @@ public final class ClassTranslator extends AbstractTranslator {
}
private boolean isTrait() {
return descriptor.getKind().equals(ClassKind.TRAIT);
return descriptor.getKind().equals(ClassKind.INTERFACE);
}
@NotNull
@@ -89,7 +89,7 @@ public final class JsDescriptorUtils {
ClassDescriptor classDescriptor = getClassDescriptorForType(type);
return !FAKE_CLASSES.contains(getFqNameSafe(classDescriptor).asString()) &&
!(classDescriptor.getKind() == ClassKind.TRAIT && isNativeObject(classDescriptor));
!(classDescriptor.getKind() == ClassKind.INTERFACE && isNativeObject(classDescriptor));
}
});
}