diff options
| author | Dmitry Jemerov <intelliyole@gmail.com> | 2015-07-09 17:45:52 +0200 |
|---|---|---|
| committer | Dmitry Jemerov <intelliyole@gmail.com> | 2015-07-09 17:45:52 +0200 |
| commit | 68caff40cfce97bba23f505ec7db33a0d406e709 (patch) | |
| tree | fa09c8bb187a46a0a1eacd2d722ab6209935e24e /src/Java/JavaDocumentationBuilder.kt | |
| parent | 3921ac60ee89bbd02444f85e8b8b52c7f77c6e27 (diff) | |
| parent | 2f3bd214b78c99d06e4dac9e7ff474fd8f0d7ec5 (diff) | |
| download | dokka-68caff40cfce97bba23f505ec7db33a0d406e709.tar.gz dokka-68caff40cfce97bba23f505ec7db33a0d406e709.tar.bz2 dokka-68caff40cfce97bba23f505ec7db33a0d406e709.zip | |
Merge pull request #26 from bintree/master
Fix project after types enhancement from annotations
Diffstat (limited to 'src/Java/JavaDocumentationBuilder.kt')
| -rw-r--r-- | src/Java/JavaDocumentationBuilder.kt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Java/JavaDocumentationBuilder.kt b/src/Java/JavaDocumentationBuilder.kt index 466ba304..fdd385fb 100644 --- a/src/Java/JavaDocumentationBuilder.kt +++ b/src/Java/JavaDocumentationBuilder.kt @@ -189,9 +189,9 @@ public class JavaDocumentationBuilder(private val options: DocumentationOptions, private fun getSignature(element: PsiElement?) = when(element) { is PsiClass -> element.getQualifiedName() - is PsiField -> element.getContainingClass().getQualifiedName() + "#" + element.getName() + is PsiField -> element.getContainingClass()!!.getQualifiedName() + "#" + element.getName() is PsiMethod -> - element.getContainingClass().getQualifiedName() + "#" + element.getName() + "(" + + element.getContainingClass()!!.getQualifiedName() + "#" + element.getName() + "(" + element.getParameterList().getParameters().map { it.getType().typeSignature() }.join(",") + ")" else -> null } |