Use correct ways to get uri for node
diff --git a/core/src/main/kotlin/Formats/DacExtraOutlineServices.kt b/core/src/main/kotlin/Formats/DacExtraOutlineServices.kt
index e9a2049..58bcd60 100644
--- a/core/src/main/kotlin/Formats/DacExtraOutlineServices.kt
+++ b/core/src/main/kotlin/Formats/DacExtraOutlineServices.kt
@@ -11,7 +11,7 @@
val languageService: LanguageService
) : DacOutlineFormatService {
override fun computeOutlineURI(node: DocumentationNode): URI =
- uriProvider.containerUriOfNode(node).resolve("navtree_data.js")
+ uriProvider.containerUri(node).resolve("navtree_data.js")
override fun format(uri: URI, to: Appendable, node: DocumentationNode) {
to.append("var NAVTREE_DATA = ").appendNavTree(node.members).append(";")
@@ -30,7 +30,7 @@
val enums = node.getMembersOfKinds(NodeKind.Enum)
val exceptions = node.getMembersOfKinds(NodeKind.Exception)
- append("[ \"${node.name}\", \"${uriProvider.mainUriForNode(node)}\", [ ")
+ append("[ \"${node.name}\", \"${uriProvider.mainUriOrWarn(node)}\", [ ")
var needComma = false
if (interfaces.firstOrNull() != null) {
appendNavTreePagesOfKind("Interfaces", interfaces)
@@ -79,7 +79,7 @@
}
private fun Appendable.appendNavTreeChild(node: DocumentationNode): Appendable {
- append("[ \"${node.nameWithOuterClass()}\", \"${uriProvider.mainUriForNode(node)}\"")
+ append("[ \"${node.nameWithOuterClass()}\", \"${uriProvider.tryGetMainUri(node)}\"")
append(", null, null, null ]")
return this
}
@@ -91,7 +91,7 @@
) : DacOutlineFormatService {
override fun computeOutlineURI(node: DocumentationNode): URI =
- uriProvider.containerUriOfNode(node).resolve("lists.js")
+ uriProvider.containerUri(node).resolve("lists.js")
override fun format(uri: URI, to: Appendable, node: DocumentationNode) {
val pageNodes = node.getAllPageNodes()
@@ -104,7 +104,7 @@
to.append(" { " +
"id:$id, " +
"label:\"${pageNode.qualifiedName()}\", " +
- "link:\"${uriProvider.mainUriForNode(node)}\", " +
+ "link:\"${uriProvider.mainUriOrWarn(node)}\", " +
"type:\"${pageNode.getClassOrPackage()}\", " +
"deprecated:\"false\" }")
id++
diff --git a/core/src/main/kotlin/Formats/DacHtmlFormat.kt b/core/src/main/kotlin/Formats/DacHtmlFormat.kt
index a3a379c..aa07245 100644
--- a/core/src/main/kotlin/Formats/DacHtmlFormat.kt
+++ b/core/src/main/kotlin/Formats/DacHtmlFormat.kt
@@ -104,7 +104,7 @@
for (node in family) {
val selected = if (node == selectedNode) "selected " else ""
appendln(" <li class=\"${selected}api apilevel-\">" +
- "<a href=\"/${uriProvider.mainUriForNode(node)}\">${node.nameWithOuterClass()}</a></li>")
+ "<a href=\"/${uriProvider.mainUriOrWarn(node)}\">${node.nameWithOuterClass()}</a></li>")
}
appendln(" </ul>")
}
diff --git a/core/src/main/kotlin/Formats/DacOutlineService.kt b/core/src/main/kotlin/Formats/DacOutlineService.kt
index a1c898a..2bf62ee 100644
--- a/core/src/main/kotlin/Formats/DacOutlineService.kt
+++ b/core/src/main/kotlin/Formats/DacOutlineService.kt
@@ -12,7 +12,7 @@
val uriProvider: JavaLayoutHtmlUriProvider,
val languageService: LanguageService
) : DacOutlineFormatService {
- override fun computeOutlineURI(node: DocumentationNode): URI = uriProvider.containerUriOfNode(node).resolve("_toc.yaml")
+ override fun computeOutlineURI(node: DocumentationNode): URI = uriProvider.containerUri(node).resolve("_toc.yaml")
override fun format(uri: URI, to: Appendable, node: DocumentationNode) {
appendOutline(uri, to, listOf(node))
@@ -41,11 +41,11 @@
fun appendOutlineHeader(uri: URI, node: DocumentationNode, to: Appendable) {
if (node is DocumentationModule) {
to.appendln("- title: Package Index")
- to.appendln(" path: ${uriProvider.mainUriForNode(node)}")
+ to.appendln(" path: ${uriProvider.mainUriOrWarn(node)}")
to.appendln(" status_text: no-toggle")
} else {
to.appendln("- title: ${languageService.renderName(node)}")
- to.appendln(" path: ${uriProvider.mainUriForNode(node)}")
+ to.appendln(" path: ${uriProvider.mainUriOrWarn(node)}")
to.appendln(" status_text: apilevel-")
}
}