Directory, not folder

Author: michael-o

maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java

@@ -181,7 +181,7 @@ protected void init() {
      * 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()) {
@@ -206,7 +206,7 @@ && hasSources(currentFile)) {
      * 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
@@ -339,13 +339,13 @@ private void copyRequiredResources(String dir) {
      * 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);
             }

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;

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;