aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2015-10-28 17:38:48 +0100
committerDmitry Jemerov <yole@jetbrains.com>2015-10-29 11:57:24 +0100
commit0eae82a20d11bce32a395d3e26fbcc7b92ce21bb (patch)
tree90ca68838b4c56e702fdaf0c63a849885dc721d7 /src
parentc81053d3677d9e99c99935cdaab710f8746d44f2 (diff)
downloaddokka-0eae82a20d11bce32a395d3e26fbcc7b92ce21bb.tar.gz
dokka-0eae82a20d11bce32a395d3e26fbcc7b92ce21bb.tar.bz2
dokka-0eae82a20d11bce32a395d3e26fbcc7b92ce21bb.zip
cleanup
Diffstat (limited to 'src')
-rw-r--r--src/Model/DocumentationModule.kt11
-rw-r--r--src/Model/DocumentationNode.kt4
2 files changed, 4 insertions, 11 deletions
diff --git a/src/Model/DocumentationModule.kt b/src/Model/DocumentationModule.kt
deleted file mode 100644
index e74c544b..00000000
--- a/src/Model/DocumentationModule.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.jetbrains.dokka
-
-public class DocumentationModule(name: String, content: Content = Content.Empty) : DocumentationNode(name, content, DocumentationNode.Kind.Module) {
- fun merge(other: DocumentationModule): DocumentationModule {
- val model = DocumentationModule(name)
- model.addAllReferencesFrom(other)
- model.addAllReferencesFrom(this)
- return model
- }
-}
-
diff --git a/src/Model/DocumentationNode.kt b/src/Model/DocumentationNode.kt
index 6f6cee7e..468cb878 100644
--- a/src/Model/DocumentationNode.kt
+++ b/src/Model/DocumentationNode.kt
@@ -117,6 +117,10 @@ public open class DocumentationNode(val name: String,
}
+public class DocumentationModule(name: String, content: Content = Content.Empty)
+ : DocumentationNode(name, content, DocumentationNode.Kind.Module) {
+}
+
val DocumentationNode.path: List<DocumentationNode>
get() {
val parent = owner