This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch doxia-2.0.0 in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
commit 776dfe6db3552eb8f8b5f1feb52c7ebefb50d309 Author: Michael Osipov <[email protected]> AuthorDate: Sun Oct 22 22:43:29 2023 +0200 Directory, not folder --- .../java/org/apache/maven/plugin/jxr/AbstractJxrReport.java | 10 +++++----- .../src/main/java/org/apache/maven/plugin/jxr/JxrReport.java | 4 ++-- .../main/java/org/apache/maven/plugin/jxr/JxrTestReport.java | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java index 4655ba6..cef5bb6 100644 --- a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java +++ b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java @@ -173,7 +173,7 @@ public abstract class AbstractJxrReport extends AbstractMavenReport { * Checks whether the given directory contains Java files. * * @param dir the source directory - * @return true if the folder or one of its subfolders contains at least 1 Java file + * @return true if the directory or one of its subdirectories contains at least 1 Java file */ private boolean hasSources(File dir) { if (dir.exists() && dir.isDirectory()) { @@ -198,7 +198,7 @@ public abstract class AbstractJxrReport extends AbstractMavenReport { * directory. * * @param locale The user locale to use for the Xref generation - * @param destinationDirectory The output folder + * @param destinationDirectory The output directory * @param sourceDirs The source directories * @throws java.io.IOException * @throws org.apache.maven.jxr.JxrException @@ -331,13 +331,13 @@ public abstract class AbstractJxrReport extends AbstractMavenReport { * Copy styles and related resources to the given directory * * @param dir the directory to copy the resources to - * @param sourceFolder resources subfolder to copy from + * @param sourceDirectory resources subdirectory to copy from * @param files names of files to copy */ - private void copyResources(String dir, String sourceFolder, String... files) { + private void copyResources(String dir, String sourceDirectory, String... files) { try { for (String file : files) { - URL resourceUrl = this.getClass().getClassLoader().getResource(sourceFolder + file); + URL resourceUrl = this.getClass().getClassLoader().getResource(sourceDirectory + file); File destResourceFile = new File(dir, file); FileUtils.copyURLToFile(resourceUrl, destResourceFile); } diff --git a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java index 712c056..725e14d 100644 --- a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java +++ b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java @@ -53,13 +53,13 @@ public class JxrReport extends AbstractJxrReport { private String sourcePath; /** - * Folder where the Xref files will be copied to. + * Directory where the Xref files will be copied to. */ @Parameter(defaultValue = "${project.reporting.outputDirectory}/xref") private String destDir; /** - * Folder where Javadoc is generated for this project. + * Directory where Javadoc is generated for this project. */ @Parameter(defaultValue = "${project.reporting.outputDirectory}/apidocs") private File javadocDir; diff --git a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java index 255c59f..c7f43bb 100644 --- a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java +++ b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java @@ -46,13 +46,13 @@ public class JxrTestReport extends AbstractJxrReport { private List<String> sourceDirs; /** - * Folder where the Xref files will be copied to. + * Directory where the Xref files will be copied to. */ @Parameter(defaultValue = "${project.reporting.outputDirectory}/xref-test") private String destDir; /** - * Folder where Test Javadoc is generated for this project. + * Directory where Test Javadoc is generated for this project. */ @Parameter(defaultValue = "${project.reporting.outputDirectory}/testapidocs") private File testJavadocDir;
