[maven-javadoc-plugin] branch scanner updated: relativize

[elharo]

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch scanner
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git


The following commit(s) were added to refs/heads/scanner by this push:
     new 326f4453 relativize
326f4453 is described below

commit 326f4453087a5f88ef0688c8e0bab7e148d8d3f6
Author: Elliotte Rusty Harold <elh...@ibiblio.org>
AuthorDate: Sun Jul 9 22:32:34 2023 -0400

    relativize
---
 .../java/org/apache/maven/plugins/javadoc/FileAccumulator.java     | 7 ++++---
 src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java    | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/plugins/javadoc/FileAccumulator.java 
b/src/main/java/org/apache/maven/plugins/javadoc/FileAccumulator.java
index f6c2b4a2..a45210bc 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/FileAccumulator.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/FileAccumulator.java
@@ -31,12 +31,13 @@ import java.util.List;
 
 class FileAccumulator implements FileVisitor<Path> {
 
+    private Path base;
     private List<PathMatcher> sourceFileIncludes = new ArrayList<>();
     private List<PathMatcher> sourceFileExcludes = new ArrayList<>();
     private List<String> includedFiles = new ArrayList<>();
 
-    FileAccumulator(List<String> sourceFileIncludes, List<String> 
sourceFileExcludes) {
-
+    FileAccumulator(Path base, List<String> sourceFileIncludes, List<String> 
sourceFileExcludes) {
+        this.base = base;
         FileSystem fileSystem = FileSystems.getDefault();
         for (String glob : sourceFileIncludes) {
             this.sourceFileIncludes.add(fileSystem.getPathMatcher("glob:" + 
glob));
@@ -57,7 +58,7 @@ class FileAccumulator implements FileVisitor<Path> {
     public FileVisitResult visitFile(Path path, BasicFileAttributes ex) throws 
IOException {
         for (PathMatcher matcher : sourceFileIncludes) {
             if (matcher.matches(path)) {
-                includedFiles.add(path.toString());
+                includedFiles.add(base.relativize(path).toString());
                 break;
             }
         }
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java 
b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
index 5eb7956f..04be4569 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -414,7 +414,8 @@ public class JavadocUtil {
         ds.setBasedir(sourceDirectory);
         ds.scan();
 
-        FileAccumulator accumulator = new FileAccumulator(sourceFileIncludes, 
sourceFileExcludes);
+        FileAccumulator accumulator =
+                new FileAccumulator(sourceDirectory.toPath(), 
sourceFileIncludes, sourceFileExcludes);
         try {
             Files.walkFileTree(sourceDirectory.toPath(), accumulator);
         } catch (IOException e) {