You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/12/27 16:55:45 UTC
[maven-javadoc-plugin] 02/08: Move quoting to end
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch refactor
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 80d70da85394bedd8cb64d54d2bf449ff1fcfd8e
Author: rfscholte <rf...@apache.org>
AuthorDate: Thu Dec 27 10:09:12 2018 +0100
Move quoting to end
---
.../org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 10 ++++++++--
.../java/org/apache/maven/plugins/javadoc/JavadocUtil.java | 2 +-
2 files changed, 9 insertions(+), 3 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 d76d9b2..811af85 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -4500,7 +4500,7 @@ public abstract class AbstractJavadocMojo
if ( currentFile.contains( currentSourcePath ) )
{
- String packagename = currentFile.substring( currentSourcePath.length() + 1 );
+ String packagename = currentFile.substring( currentSourcePath.length() );
/*
* Remove the miscellaneous files
@@ -4605,10 +4605,16 @@ public abstract class AbstractJavadocMojo
cmd.createArg().setValue( "@" + FILES_FILE_NAME );
}
+ List<String> quotedFiles = new ArrayList<>( files.size() );
+ for ( String file : files )
+ {
+ quotedFiles.add( JavadocUtil.quotedPathArgument( file ) );
+ }
+
try
{
FileUtils.fileWrite( argfileFile.getAbsolutePath(), null /* platform encoding */,
- StringUtils.join( files.iterator(), SystemUtils.LINE_SEPARATOR ) );
+ StringUtils.join( quotedFiles.iterator(), SystemUtils.LINE_SEPARATOR ) );
}
catch ( IOException e )
{
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 2e24e06..d57a5b0 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -470,7 +470,7 @@ public class JavadocUtil
{
for ( String includedFile : getIncludedFiles( sourceDirectory, fileList, excludePackages ) )
{
- files.add( quotedPathArgument( new File( sourceDirectory, includedFile ).getAbsolutePath() ) );
+ files.add( new File( sourceDirectory, includedFile ).getAbsolutePath() );
}
}