From caddc849501787e349c9ef46e05fa0284c6c5660 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Mon, 25 Jun 2012 23:55:29 +0400 Subject: [PATCH] kdoc: KClass: remove unnecessary name parameter --- .../org/jetbrains/kotlin/doc/model/KotlinModel.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt index 9e68d1bdfd2..9234c9fb5e4 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt @@ -711,7 +711,7 @@ $highlight""" val container = dec if (container is NamespaceDescriptor) { val pkg = getPackage(container) - return pkg.getClass(name, classElement) + return pkg.getClass(classElement) } else { dec = dec?.getContainingDeclaration() } @@ -958,11 +958,12 @@ class KPackage(model: KModel, val descriptor: NamespaceDescriptor, fun toString() = "KPackage($name)" - fun getClass(name: String, descriptor: ClassDescriptor): KClass { + fun getClass(descriptor: ClassDescriptor): KClass { + val name = descriptor.getName().getName() var created = false val klass = classMap.getOrPut(name) { created = true - KClass(this, descriptor, name) + KClass(this, descriptor) } if (created) { // sometimes we may have source files for a package in different source directories @@ -1067,10 +1068,10 @@ class KType(val jetType: JetType, model: KModel, val klass: KClass?, val argumen class KClass( val pkg: KPackage, - val descriptor: ClassDescriptor, - val simpleName: String) + val descriptor: ClassDescriptor) : KClassOrPackage(pkg.model, descriptor), Comparable { + val simpleName = descriptor.getName().getName() var group: String = "Other" var annotations: List = arrayList() var typeParameters: List = arrayList() @@ -1126,7 +1127,7 @@ class KClass( return $url } - public val name: String = pkg.qualifiedName(simpleName) + public val name: String = pkg.qualifiedName(descriptor.getName().getName()) public val packageName: String = pkg.name