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

JDR subsystem: utility methods made public

Browse Source
This commit is contained in:
Andrey Breslav
2013-11-19 15:22:57 +04:00
parent 9879965407
commit 8a354ccd15
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java
+3 -3
View File
@@ -290,7 +290,7 @@ public final class JavaClassResolver {
} }
@NotNull @NotNull
private static ClassKind determineClassKind(@NotNull JavaClass klass) { public static ClassKind determineClassKind(@NotNull JavaClass klass) {
if (klass.isInterface()) { if (klass.isInterface()) {
return klass.isAnnotationType() ? ClassKind.ANNOTATION_CLASS : ClassKind.TRAIT; return klass.isAnnotationType() ? ClassKind.ANNOTATION_CLASS : ClassKind.TRAIT;
} }
@@ -298,7 +298,7 @@ public final class JavaClassResolver {
} }
@NotNull @NotNull
private static Modality determineClassModality(@NotNull JavaClass klass) { public static Modality determineClassModality(@NotNull JavaClass klass) {
return klass.isAnnotationType() return klass.isAnnotationType()
? Modality.FINAL ? Modality.FINAL
: Modality.convertFromFlags(klass.isAbstract() || klass.isInterface(), !klass.isFinal()); : Modality.convertFromFlags(klass.isAbstract() || klass.isInterface(), !klass.isFinal());
@@ -410,7 +410,7 @@ public final class JavaClassResolver {
return FqNameUnsafe.fromSegments(correctedSegments); return FqNameUnsafe.fromSegments(correctedSegments);
} }
private static boolean isInnerClass(@NotNull JavaClass javaClass) { public static boolean isInnerClass(@NotNull JavaClass javaClass) {
return javaClass.getOuterClass() != null && !javaClass.isStatic(); return javaClass.getOuterClass() != null && !javaClass.isStatic();
} }