You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/02/23 00:11:46 UTC
[isis] 08/11: ISIS-2444: xref's now fixed, removed config param
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b9014a978e3eebb4723d0c0890c035de073cd29c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 22 23:05:44 2021 +0000
ISIS-2444: xref's now fixed, removed config param
... that doesn't need to be a config param any more
---
.../isis/tooling/cli/projdoc/ProjectDocModel.java | 1 -
.../apache/isis/tooling/j2adoc/J2AdocContext.java | 21 ++-------------------
.../apache/isis/tooling/j2adoc/test/J2AdocTest.java | 1 -
3 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocModel.java b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocModel.java
index 936e20d..4e710db 100644
--- a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocModel.java
+++ b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocModel.java
@@ -119,7 +119,6 @@ public class ProjectDocModel {
}
})
.licenseHeader(cliConfig.getGlobal().getLicenseHeader())
- .xrefPageIdFormat(cliConfig.getCommands().getIndex().getDocumentGlobalIndexXrefPageIdFormat())
.namespacePartsSkipCount(cliConfig.getGlobal().getNamespacePartsSkipCount())
.skipTitleHeader(cliConfig.getCommands().getIndex().isSkipTitleHeader())
.build();
diff --git a/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/J2AdocContext.java b/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/J2AdocContext.java
index 636f7ad..0261a5f 100644
--- a/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/J2AdocContext.java
+++ b/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/J2AdocContext.java
@@ -48,7 +48,6 @@ import lombok.extern.log4j.Log4j2;
@Value @Builder @Log4j2
public class J2AdocContext {
- private final @NonNull String xrefPageIdFormat;
private final @Nullable String licenseHeader;
@Builder.Default
@@ -242,21 +241,6 @@ public class J2AdocContext {
return Optional.ofNullable(unitIndex.get(key));
}
-// // -- PREDEFINED FORMATS
-//
-// public static J2AdocContextBuilder javaSourceWithFootnotesFormat() {
-// return J2AdocContext.builder()
-// .converterFactory(J2AdocConverter::createDefault)
-// .formatterFactory(UnitFormatterWithSourceAndCallouts::new)
-// ;
-// }
-//
-// public static J2AdocContextBuilder compactFormat() {
-// return J2AdocContext.builder()
-// .converterFactory(J2AdocConverter::createDefault)
-// .formatterFactory(UnitFormatterCompact::new)
-// ;
-// }
public String xref(final @NonNull J2AdocUnit unit) {
@@ -272,9 +256,8 @@ public class J2AdocContext {
.stream()
.collect(Collectors.joining("/"));
- val xref = String.format("xref:s[%s]",
- String.format(getXrefPageIdFormat(), xrefModule, xrefCoordinates),
- unit.getFriendlyName());
+ val xref = String.format("xref:refguide:%s:index/%s.adoc[%s]",
+ xrefModule, xrefCoordinates, unit.getFriendlyName());
return xref;
}
diff --git a/tooling/java2adoc/src/test/java/org/apache/isis/tooling/j2adoc/test/J2AdocTest.java b/tooling/java2adoc/src/test/java/org/apache/isis/tooling/j2adoc/test/J2AdocTest.java
index 00cfcd2..461e6c5 100644
--- a/tooling/java2adoc/src/test/java/org/apache/isis/tooling/j2adoc/test/J2AdocTest.java
+++ b/tooling/java2adoc/src/test/java/org/apache/isis/tooling/j2adoc/test/J2AdocTest.java
@@ -54,7 +54,6 @@ class J2AdocTest {
.builder()
// .javaSourceWithFootnotesFormat()
//.compactFormat()
- .xrefPageIdFormat("system:generated:index/%s.adoc")
.build();
analyzerConfig.getSources(JAVA)