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:51 UTC
[maven-javadoc-plugin] 08/08: Use File.separators instead of
realigning the separators.
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 eb22f8cb8790b12724031ca96bc23efbd687d34c
Author: rfscholte <rf...@apache.org>
AuthorDate: Thu Dec 27 17:37:49 2018 +0100
Use File.separators instead of realigning the separators.
---
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 55 +++++-----------------
1 file changed, 13 insertions(+), 42 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 19e0b58..b3f344c 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -4364,32 +4364,21 @@ public abstract class AbstractJavadocMojo
for ( Entry<Path, Collection<String>> currentPathEntry : sourcePaths.entrySet() )
{
- String currentSourcePath = currentPathEntry.getKey().toString().replace( '\\', '/' );
-
for ( String currentFile : currentPathEntry.getValue() )
{
- currentFile = currentFile.replace( '\\', '/' );
-
- if ( !currentSourcePath.endsWith( "/" ) )
- {
- currentSourcePath += "/";
- }
-
- String packagename = currentFile;
-
/*
* Remove the miscellaneous files
* http://docs.oracle.com/javase/1.4.2/docs/tooldocs/solaris/javadoc.html#unprocessed
*/
- if ( packagename.contains( "doc-files" ) )
+ if ( currentFile.contains( "doc-files" ) )
{
continue;
}
- if ( packagename.lastIndexOf( "/" ) != -1 )
+ int lastIndexOfSeparator = currentFile.lastIndexOf( "/" );
+ if ( lastIndexOfSeparator != -1 )
{
- packagename = packagename.substring( 0, packagename.lastIndexOf( "/" ) );
- packagename = packagename.replace( '/', '.' );
+ String packagename = currentFile.substring( 0, lastIndexOfSeparator ).replace( '/', '.' );
if ( !returnList.contains( packagename ) )
{
@@ -4457,31 +4446,22 @@ public abstract class AbstractJavadocMojo
for ( Map.Entry<Path, Collection<String>> currentPathEntry : getFiles( artifactSourcePaths ).entrySet() )
{
- String currentSourcePath = currentPathEntry.getKey().toString().replace( '\\', '/' );
-
for ( String currentFile : currentPathEntry.getValue() )
{
- currentFile = currentFile.replace( '\\', '/' );
-
- if ( !currentSourcePath.endsWith( "/" ) )
- {
- currentSourcePath += "/";
- }
- String packagename = currentSourcePath;
-
/*
* Remove the miscellaneous files
* http://docs.oracle.com/javase/1.4.2/docs/tooldocs/solaris/javadoc.html#unprocessed
*/
- if ( packagename.contains( "doc-files" ) )
+ if ( currentFile.contains( "doc-files" ) )
{
continue;
}
- if ( packagename.lastIndexOf( "/" ) != -1 )
+ int lastIndexOfSeparator = currentFile.lastIndexOf( File.separatorChar );
+ if ( lastIndexOfSeparator != -1 )
{
- packagename = packagename.substring( 0, packagename.lastIndexOf( "/" ) );
- packagename = packagename.replace( '/', '.' );
+ String packagename =
+ currentFile.substring( 0, lastIndexOfSeparator ).replace( File.separatorChar, '.' );
if ( exportAllPackages || exportedPackages.contains( packagename ) )
{
@@ -4511,31 +4491,22 @@ public abstract class AbstractJavadocMojo
for ( Entry<Path, Collection<String>> currentPathEntry : sourcePaths.entrySet() )
{
- String currentSourcePath = currentPathEntry.getKey().toString().replace( '\\', '/' );
+ Path currentSourcePath = currentPathEntry.getKey();
for ( String currentFile : currentPathEntry.getValue() )
{
- currentFile = currentFile.replace( '\\', '/' );
-
- if ( !currentSourcePath.endsWith( "/" ) )
- {
- currentSourcePath += "/";
- }
-
- String packagename = currentSourcePath;
-
/*
* Remove the miscellaneous files
* http://docs.oracle.com/javase/1.4.2/docs/tooldocs/solaris/javadoc.html#unprocessed
*/
- if ( packagename.contains( "doc-files" ) )
+ if ( currentFile.contains( "doc-files" ) )
{
continue;
}
- if ( packagename.lastIndexOf( "/" ) == -1 )
+ if ( currentFile.indexOf( File.separatorChar ) == -1 )
{
- returnList.add( currentFile );
+ returnList.add( currentSourcePath.resolve( currentFile ).toAbsolutePath().toString() );
}
}
}