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:46 UTC
[maven-javadoc-plugin] 03/08: Remove contains-check,
it is a subfolder by definition
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 4b069bc287adc01af00bfc07c98a28c8871cdba5
Author: rfscholte <rf...@apache.org>
AuthorDate: Thu Dec 27 12:01:39 2018 +0100
Remove contains-check, it is a subfolder by definition
---
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 82 ++++++++++------------
1 file changed, 38 insertions(+), 44 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 811af85..62c2db3 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -4422,32 +4422,29 @@ public abstract class AbstractJavadocMojo
{
currentFile = currentFile.replace( '\\', '/' );
- if ( currentFile.contains( currentSourcePath ) )
+ if ( !currentSourcePath.endsWith( "/" ) )
{
- if ( !currentSourcePath.endsWith( "/" ) )
- {
- currentSourcePath += "/";
- }
- String packagename = currentFile.substring( currentSourcePath.length() + 1 );
+ currentSourcePath += "/";
+ }
+ String packagename = currentFile.substring( currentSourcePath.length() );
- /*
- * Remove the miscellaneous files
- * http://docs.oracle.com/javase/1.4.2/docs/tooldocs/solaris/javadoc.html#unprocessed
- */
- if ( packagename.contains( "doc-files" ) )
- {
- continue;
- }
+ /*
+ * Remove the miscellaneous files
+ * http://docs.oracle.com/javase/1.4.2/docs/tooldocs/solaris/javadoc.html#unprocessed
+ */
+ if ( packagename.contains( "doc-files" ) )
+ {
+ continue;
+ }
- if ( packagename.lastIndexOf( "/" ) != -1 )
- {
- packagename = packagename.substring( 0, packagename.lastIndexOf( "/" ) );
- packagename = packagename.replace( '/', '.' );
+ if ( packagename.lastIndexOf( "/" ) != -1 )
+ {
+ packagename = packagename.substring( 0, packagename.lastIndexOf( "/" ) );
+ packagename = packagename.replace( '/', '.' );
- if ( exportAllPackages || exportedPackages.contains( packagename ) )
- {
- returnList.add( packagename );
- }
+ if ( exportAllPackages || exportedPackages.contains( packagename ) )
+ {
+ returnList.add( packagename );
}
}
}
@@ -4498,34 +4495,31 @@ public abstract class AbstractJavadocMojo
currentSourcePath += "/";
}
- if ( currentFile.contains( currentSourcePath ) )
- {
- String packagename = currentFile.substring( currentSourcePath.length() );
+ String packagename = currentFile.substring( currentSourcePath.length() );
- /*
- * Remove the miscellaneous files
- * http://docs.oracle.com/javase/1.4.2/docs/tooldocs/solaris/javadoc.html#unprocessed
- */
- if ( packagename.contains( "doc-files" ) )
- {
- continue;
- }
+ /*
+ * Remove the miscellaneous files
+ * http://docs.oracle.com/javase/1.4.2/docs/tooldocs/solaris/javadoc.html#unprocessed
+ */
+ if ( packagename.contains( "doc-files" ) )
+ {
+ continue;
+ }
- if ( onlyPackageName && packagename.lastIndexOf( "/" ) != -1 )
- {
- packagename = packagename.substring( 0, packagename.lastIndexOf( "/" ) );
- packagename = packagename.replace( '/', '.' );
+ if ( onlyPackageName && packagename.lastIndexOf( "/" ) != -1 )
+ {
+ packagename = packagename.substring( 0, packagename.lastIndexOf( "/" ) );
+ packagename = packagename.replace( '/', '.' );
- if ( !returnList.contains( packagename ) )
- {
- returnList.add( packagename );
- }
- }
- if ( !onlyPackageName && packagename.lastIndexOf( "/" ) == -1 )
+ if ( !returnList.contains( packagename ) )
{
- returnList.add( currentFile );
+ returnList.add( packagename );
}
}
+ if ( !onlyPackageName && packagename.lastIndexOf( "/" ) == -1 )
+ {
+ returnList.add( currentFile );
+ }
}
}