[maven-javadoc-plugin] branch MJAVADOC-568 updated: [MJAVADOC-568] clean up

[rf...@apache.org]

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

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


The following commit(s) were added to refs/heads/MJAVADOC-568 by this push:
     new 4aaeb35  [MJAVADOC-568] clean up
4aaeb35 is described below

commit 4aaeb3565aad15c1eeee18a82b2f195b6944326c
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Feb 15 11:05:23 2019 +0100

    [MJAVADOC-568] clean up
---
 .../java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 7 +++----
 src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java    | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

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 43942ff..270783a 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -2243,10 +2243,10 @@ public abstract class AbstractJavadocMojo
     }
 
     /**
-     * Method to get the source paths. If no source path is specified in the parameter, the compile source roots
-     * of the project will be used.
+     * Method to get the source paths per reactorProject. If no source path is specified in the parameter, the compile
+     * source roots of the project will be used.
      *
-     * @return a Collection of the project absolute source paths as <code>String</code>
+     * @return a Map of the project absolute source paths per projects key (G:A)
      * @throws MavenReportException {@link MavenReportException}
      * @see JavadocUtil#pruneDirs(MavenProject, Collection)
      */
@@ -5100,7 +5100,6 @@ public abstract class AbstractJavadocMojo
                 ResolvePathsResult<File> result = locationManager.resolvePaths( request );
                 
                 Set<File> modulePathElements = new HashSet<>( result.getModulepathElements().keySet() )  ;
-                modulePathElements.addAll( getProjectBuildOutputDirs( getProject() ) ); // ???
                 
                 Set<File> directDependencyArtifactFiles = new HashSet<>( project.getDependencyArtifacts().size() );
                 for ( Artifact depArt : project.getDependencyArtifacts() )
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 8c4f4f9..7eb9f92 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -81,6 +81,7 @@ import java.nio.charset.IllegalCharsetNameException;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
@@ -180,8 +181,7 @@ public class JavadocUtil
     {
         if ( f != null )
         {
-            File file = new File( f );
-            if ( file.isFile() && ( isEmpty( pruned ) || !pruned.contains( f ) ) )
+            if ( Files.isRegularFile( Paths.get( f ) ) && !pruned.contains( f ) )
             {
                 return false;
             }