Drop KPackage and deprecated stuff from Reflection/ReflectionFactory

This commit is contained in:
Alexander Udalov
2015-11-17 13:50:56 +03:00
parent 8a5b63a669
commit ad6888dac6
5 changed files with 2 additions and 70 deletions
@@ -14,7 +14,6 @@
* limitations under the License.
*/
@file:Suppress("DEPRECATION")
package kotlin.reflect.jvm.internal
import org.jetbrains.kotlin.descriptors.ConstructorDescriptor
@@ -26,9 +25,8 @@ import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.scopes.MemberScope
import kotlin.jvm.internal.KotlinPackage
import kotlin.reflect.KCallable
import kotlin.reflect.KPackage
internal class KPackageImpl(override val jClass: Class<*>, val moduleName: String) : KDeclarationContainerImpl(), KPackage {
internal class KPackageImpl(override val jClass: Class<*>, val moduleName: String) : KDeclarationContainerImpl() {
private val descriptor = ReflectProperties.lazySoft {
with(moduleData) {
packageFacadeProvider.registerModule(moduleName)
@@ -44,7 +42,6 @@ internal class KPackageImpl(override val jClass: Class<*>, val moduleName: Strin
override val constructorDescriptors: Collection<ConstructorDescriptor>
get() = emptyList()
@Suppress("UNCHECKED_CAST")
override fun getProperties(name: Name): Collection<PropertyDescriptor> =
scope.getContributedVariables(name, NoLookupLocation.FROM_REFLECTION)
@@ -87,16 +87,4 @@ public class ReflectionFactoryImpl extends ReflectionFactory {
public KMutableProperty2 mutableProperty2(MutablePropertyReference2 p) {
return p instanceof MutablePropertyReference2Impl ? new KMutableProperty2Augmented(p) : new KMutableProperty2FromReferenceImpl(p);
}
// Deprecated
@Override
public KClass foreignKotlinClass(Class javaClass) {
return getOrCreateKotlinClass(javaClass);
}
@Override
public KPackage createKotlinPackage(Class javaClass, String moduleName) {
return new KPackageImpl(javaClass, moduleName);
}
}