From 8a354ccd15c0ff197a92e83c3745fbcd5ae4ea71 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 19 Nov 2013 15:22:57 +0400 Subject: [PATCH] JDR subsystem: utility methods made public --- .../jet/lang/resolve/java/resolver/JavaClassResolver.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java index dc4e157c4d5..447b9e96bac 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java @@ -290,7 +290,7 @@ public final class JavaClassResolver { } @NotNull - private static ClassKind determineClassKind(@NotNull JavaClass klass) { + public static ClassKind determineClassKind(@NotNull JavaClass klass) { if (klass.isInterface()) { return klass.isAnnotationType() ? ClassKind.ANNOTATION_CLASS : ClassKind.TRAIT; } @@ -298,7 +298,7 @@ public final class JavaClassResolver { } @NotNull - private static Modality determineClassModality(@NotNull JavaClass klass) { + public static Modality determineClassModality(@NotNull JavaClass klass) { return klass.isAnnotationType() ? Modality.FINAL : Modality.convertFromFlags(klass.isAbstract() || klass.isInterface(), !klass.isFinal()); @@ -410,7 +410,7 @@ public final class JavaClassResolver { return FqNameUnsafe.fromSegments(correctedSegments); } - private static boolean isInnerClass(@NotNull JavaClass javaClass) { + public static boolean isInnerClass(@NotNull JavaClass javaClass) { return javaClass.getOuterClass() != null && !javaClass.isStatic(); }