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/03/31 12:54:35 UTC
[isis] 10/20: ISIS-2484: fixing index doc tooling
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 7c1efea776dd817d15e591d2bc3792c54cad302f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Mar 29 11:57:24 2021 +0100
ISIS-2484: fixing index doc tooling
(cherry picked from commit d5e0268a8ba26d34a0539148a4e7f97fa709317e)
---
.../java/org/apache/isis/tooling/cli/projdoc/ProjectDocWriter.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocWriter.java b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocWriter.java
index d292694..e83766e 100644
--- a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocWriter.java
+++ b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocWriter.java
@@ -60,6 +60,7 @@ final class ProjectDocWriter {
val currentUnit = _Refs.<J2AdocUnit>objectRef(null);
val overviewPagesFolder = overview.getPagesFolder();
+ val indexRootFolder = index.getRootFolder();
val deleteCount = _Refs.intRef(0);
int writeCount = 0;
@@ -78,11 +79,9 @@ final class ProjectDocWriter {
if(mode.includeIndex()) {
// delete all generated documents in the index
- _Files.searchFiles(overviewPagesFolder, dir->true, file-> {
+ _Files.searchFiles(indexRootFolder, dir->true, file-> {
val fileName = file.getName();
val fileAbsolutePath = file.getAbsolutePath();
- final File parentFile = file.getParentFile();
- final String parentFileName = parentFile.getName();
return fileName.endsWith(".adoc") &&
!fileAbsolutePath.contains(File.separatorChar + "hooks" + File.separatorChar) &&
!fileName.equals(overview.getSystemOverviewFilename());