You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2025/08/15 10:36:53 UTC
(maven-javadoc-plugin) branch master updated: Typos and grammar (#1234)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 90cd443f Typos and grammar (#1234)
90cd443f is described below
commit 90cd443f884c925c0bfefacafbb24bf10c87b16d
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Fri Aug 15 10:36:49 2025 +0000
Typos and grammar (#1234)
---
.../plugins/javadoc/AbstractFixJavadocMojo.java | 4 +--
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 34 +++++++++++-----------
.../apache/maven/plugins/javadoc/JavadocUtil.java | 14 ++++-----
.../apache/maven/plugins/javadoc/StaleHelper.java | 2 +-
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java
index 999fb309..5b319727 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java
@@ -863,7 +863,7 @@ public abstract class AbstractFixJavadocMojo extends AbstractMojo {
}
/**
- * Process the given {@link JavaClass}, ie add missing javadoc tags depending user parameters.
+ * Process the given {@link JavaClass}, ie add missing javadoc tags depending on user parameters.
*
* @param javaClass not null
* @throws IOException if any
@@ -1069,7 +1069,7 @@ public abstract class AbstractFixJavadocMojo extends AbstractMojo {
/**
* @param modifiers list of modifiers (public, private, protected, package)
- * @return <code>true</code> if modifier is align with <code>level</code>.
+ * @return <code>true</code> if modifier is aligned with <code>level</code>.
*/
private boolean isInLevel(List<String> modifiers) {
if (LEVEL_PUBLIC.equalsIgnoreCase(level.trim())) {
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index 8a191aef..fcd1889e 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -515,7 +515,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
* Detect the Java API link for the current build, e.g. <code>https://docs.oracle.com/javase/1.4.2/docs/api/</code>
* for Java source 1.4.
* <br/>
- * By default, the goal detects the Javadoc API link depending the value of the <code>source</code>
+ * By default, the goal detects the Javadoc API link depending on the value of the <code>source</code>
* parameter in the <code>org.apache.maven.plugins:maven-compiler-plugin</code>
* (defined in <code>${project.build.plugins}</code> or in <code>${project.build.pluginManagement}</code>),
* or try to compute it from the {@code javadocExecutable} version.
@@ -528,7 +528,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
private boolean detectJavaApiLink;
/**
- * Use this parameter <b>only</b> if if you want to override the default URLs.
+ * Use this parameter <b>only</b> if you want to override the default URLs.
*
* The key should match {@code api_x}, where {@code x} matches the Java version.
*
@@ -846,7 +846,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
// ----------------------------------------------------------------------
/**
- * Specifies whether or not the author text is included in the generated Javadocs.
+ * Specifies whether the author text is included in the generated Javadocs.
* @see <a href="https://docs.oracle.com/en/java/javase/17/docs/specs/man/javadoc.html#standard-doclet-options">Doclet option author</a>.
*/
@Parameter(property = "author", defaultValue = "true")
@@ -1149,7 +1149,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
private String noqualifier;
/**
- * Omits from the generated docs the "Since" sections associated with the since tags.
+ * Omits the "Since" sections from the generated docs.
* @see <a href="https://docs.oracle.com/en/java/javase/17/docs/specs/man/javadoc.html#standard-doclet-options">Doclet option nosince</a>.
*/
@Parameter(property = "nosince", defaultValue = "false")
@@ -1345,8 +1345,8 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
private TagletArtifact tagletArtifact;
/**
- * Specifies several Taglet artifacts containing the taglet class files (.class). These taglets class names will be
- * auto-detect and so no need to specify them.
+ * Specifies several Taglet artifacts containing the taglet class files (.class). These taglet class names will be
+ * auto-detected and so no need to specify them.
* <br/>
* Example:
* <pre>
@@ -2111,7 +2111,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
sourceDirectory, sourceFileIncludes, sourceFileExcludes, excludedPackages));
// in the aggregate goal (and theoretically in others too), there can be
- // more then one module-info.java. Filter out all of them.
+ // more than one module-info.java. Filter out all of them.
if (autoExclude && files.removeIf(s -> s.endsWith("module-info.java"))) {
getLog().debug("Auto exclude module-info.java due to source value");
}
@@ -3377,7 +3377,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
}
/**
- * Get the path of the Javadoc tool executable depending the user entry or try to find it depending the OS
+ * Get the path of the Javadoc tool executable depending on the user entry or try to find it depending on the OS
* or the <code>java.home</code> system property or the <code>JAVA_HOME</code> environment variable.
*
* @return the path of the Javadoc tool
@@ -3586,7 +3586,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
/**
* Convenience method to add an argument to the <code>command line</code>
- * if the the value is not null or empty.
+ * if the value is not null or empty.
* <p/>
* Moreover, the value could be comma separated.
*
@@ -3601,7 +3601,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
/**
* Convenience method to add an argument to the <code>command line</code>
- * if the the value is not null or empty.
+ * if the value is not null or empty.
* <p/>
* Moreover, the value could be comma separated.
*
@@ -3635,7 +3635,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
/**
* Convenience method to add an argument to the <code>command line</code>
- * if the the value is not null or empty.
+ * if the value is not null or empty.
* <p/>
* Moreover, the value could be comma separated.
*
@@ -3673,7 +3673,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
/**
* Convenience method to add an argument to the <code>command line</code>
- * if the the value is not null or empty.
+ * if the value is not null or empty.
* <p/>
* Moreover, the value could be comma separated.
*
@@ -3774,7 +3774,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
* If {@code detectLinks}, try to add javadoc apidocs according Maven conventions for all dependencies given
* in the project.
* <br/>
- * According the Javadoc documentation, all defined links should have <code>${link}/package-list</code> fetchable.
+ * According to the Javadoc documentation, all defined links should have <code>${link}/package-list</code> fetchable.
* <br/>
* <b>Note</b>: when a link is not fetchable:
* <ul>
@@ -4165,8 +4165,8 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
}
/**
- * Generate a file called <code>argfile</code> (or <code>files</code>, depending the JDK) to hold files and add
- * the <code>@argfile</code> (or <code>@file</code>, depending the JDK) in the command line.
+ * Generate a file called <code>argfile</code> (or <code>files</code>, depending on the JDK) to hold files and add
+ * the <code>@argfile</code> (or <code>@file</code>, depending on the JDK) in the command line.
*
* @param cmd not null
* @param javadocOutputDirectory not null
@@ -4392,7 +4392,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
if (aggregatedProject != null && !"pom".equals(aggregatedProject.getPackaging())) {
ResolvePathResult result = null;
- // Prefer jar over outputDirectory, since it may may contain an automatic module name
+ // Prefer jar over outputDirectory, since it may contain an automatic module name
File artifactFile = getClassesFile(aggregatedProject);
if (artifactFile != null) {
ResolvePathRequest<File> request = ResolvePathRequest.ofFile(artifactFile);
@@ -5402,7 +5402,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
throw new MavenReportException(e.getMessage(), e);
}
} finally {
- // just create the directory to prevent repeated invocations..
+ // just create the directory to prevent repeated invocations.
if (!location.exists()) {
getLog().warn("Creating fake javadoc directory to prevent repeated invocations: " + location);
location.mkdirs();
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 4d272382..c54ae061 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -180,9 +180,9 @@ public class JavadocUtil {
* Determine whether a file should be excluded from the provided list of paths, based on whether it exists and is
* already present in the list.
*
- * @param f The files.
- * @param pruned The list of pruned files..
- * @return true if the file could be pruned false otherwise.
+ * @param f the files
+ * @param pruned the list of pruned files
+ * @return true if the file could be pruned, false otherwise
*/
public static boolean shouldPruneFile(String f, List<String> pruned) {
if (f != null) {
@@ -573,7 +573,7 @@ public class JavadocUtil {
/**
* Parse a memory string which be used in the JVM arguments <code>-Xms</code> or <code>-Xmx</code>. <br>
- * Here are some supported memory string depending the JDK used:
+ * Here are some supported memory string depending on the JDK used:
* <table><caption>Memory argument support per JDK</caption>
* <tr>
* <th>JDK</th>
@@ -639,7 +639,7 @@ public class JavadocUtil {
/**
* Validate if a charset is supported on this platform.
*
- * @param charsetName the charsetName to be check.
+ * @param charsetName the charsetName to check
* @return <code>true</code> if the given charset is supported by the JVM, <code>false</code> otherwise.
*/
protected static boolean validateEncoding(String charsetName) {
@@ -874,7 +874,7 @@ public class JavadocUtil {
}
/**
- * Split the given path with colon and semi-colon, to support Solaris and Windows path. Examples:
+ * Split the given path with colon and semicolon, to support Unix and Windows paths. Examples:
*
* <pre>
* splitPath( "/home:/tmp" ) = ["/home", "/tmp"]
@@ -1132,7 +1132,7 @@ public class JavadocUtil {
private String lookahead = null;
/**
- * Flag to indicate whether or not we are running on a platform with a DOS style filesystem
+ * Flag to indicate whether we are running on a platform with a DOS style filesystem
*/
private boolean dosStyleFilesystem;
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java b/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java
index 7517d0fb..6658a7e2 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java
@@ -43,7 +43,7 @@ public class StaleHelper {
/**
* Compute the encoding of the stale javadoc
*
- * @return the the encoding of the stale data
+ * @return the encoding of the stale data
*/
private static Charset getDataCharset() {
if (JavaVersion.JAVA_SPECIFICATION_VERSION.isAtLeast("9")