From 92b29a8fe79a72c9c576cb5d87c4aa4799785581 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 6 Jun 2014 17:23:04 +0400 Subject: [PATCH] Rewrite KotlinClassFinder to Kotlin --- ...nClassFinder.java => KotlinClassFinder.kt} | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) rename core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/{KotlinClassFinder.java => KotlinClassFinder.kt} (53%) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.kt similarity index 53% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.kt index 48e0a34cdb0..2a99d416ae1 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,18 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.kotlin; +package org.jetbrains.jet.lang.resolve.kotlin -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.annotations.Nullable +import org.jetbrains.jet.lang.resolve.java.structure.JavaClass +import org.jetbrains.jet.lang.resolve.name.FqName -public interface KotlinClassFinder { +public trait KotlinClassFinder { + public fun findKotlinClass(fqName: FqName): KotlinJvmBinaryClass? - @Nullable - KotlinJvmBinaryClass findKotlinClass(@NotNull FqName fqName); - - @Nullable - KotlinJvmBinaryClass findKotlinClass(@NotNull JavaClass javaClass); + public fun findKotlinClass(javaClass: JavaClass): KotlinJvmBinaryClass? }