bmarwell commented on a change in pull request #77:
URL:
https://github.com/apache/maven-javadoc-plugin/pull/77#discussion_r634706343
##########
File path:
src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
##########
@@ -1457,21 +1457,21 @@
* stylesheetfile</a>.
*/
@Parameter( property = "stylesheetfile" )
- private String stylesheetfile;
-
- /**
- * Specifies the path of an additional HTML stylesheet file relative to
the {@link #javadocDirectory}
- * Example:
- * <pre>
- * <addStylesheets>
- * <resources/addstylesheet.css</addStylesheet>
- * </addStylesheets>
- * </pre>
+ private String stylesheetfile;
+
+ /**
+ * Specifies the path of an additional HTML stylesheet file relative to
the {@link #javadocDirectory}
+ * Example:
+ * <pre>
+ * <addStylesheets>
+ * <resources/addstylesheet.css</addStylesheet>
+ * </addStylesheets>
+ * </pre>
* @since 3.3.0
- */
- @Parameter
- private String[] addStylesheets;
-
+ */
+ @Parameter
+ private String[] addStylesheets;
+
Review comment:
Mixed windows linebreaks converted to unix by IDE.
##########
File path:
src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
##########
@@ -3119,34 +3119,34 @@ private void addAddStyleSheets( List<String> arguments
) throws MavenReportExcep
}
}
-
- private Optional<File> getAddStylesheet( final File
javadocOutputDirectory, final String stylesheet )
- throws MavenReportException
- {
- if ( StringUtils.isEmpty( stylesheet ) )
- {
- return Optional.empty();
- }
-
- File addstylesheetfile = new File( getJavadocDirectory(), stylesheet );
- if ( addstylesheetfile.exists() )
- {
- Optional<File> stylesheetfile = getStylesheetFile(
javadocOutputDirectory );
- if ( stylesheetfile.isPresent() )
- {
- if ( stylesheetfile.get().getName().equals(
addstylesheetfile.getName() ) )
- {
- throw new MavenReportException( "additional stylesheet
must have a different name "
- + "than
stylesheetfile: " + stylesheetfile.get().getName() );
- }
- }
-
- return Optional.of( addstylesheetfile );
- }
-
- throw new MavenReportException( "additional stylesheet file does not
exist: "
- +
addstylesheetfile.getAbsolutePath() );
- }
+
+ private Optional<File> getAddStylesheet( final File
javadocOutputDirectory, final String stylesheet )
+ throws MavenReportException
+ {
+ if ( StringUtils.isEmpty( stylesheet ) )
+ {
+ return Optional.empty();
+ }
+
+ File addstylesheetfile = new File( getJavadocDirectory(), stylesheet );
+ if ( addstylesheetfile.exists() )
+ {
+ Optional<File> stylesheetfile = getStylesheetFile(
javadocOutputDirectory );
+ if ( stylesheetfile.isPresent() )
+ {
+ if ( stylesheetfile.get().getName().equals(
addstylesheetfile.getName() ) )
+ {
+ throw new MavenReportException( "additional stylesheet
must have a different name "
+ + "than
stylesheetfile: " + stylesheetfile.get().getName() );
+ }
+ }
+
+ return Optional.of( addstylesheetfile );
+ }
+
+ throw new MavenReportException( "additional stylesheet file does not
exist: "
+ +
addstylesheetfile.getAbsolutePath() );
+ }
Review comment:
Mixed windows linebreaks converted to unix by IDE.
##########
File path:
src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
##########
@@ -5643,7 +5643,7 @@ private void addStandardDocletOptions( File
javadocOutputDirectory,
JavadocUtil.quotedPathArgument(
stylesheetfile.get().getAbsolutePath() ) );
}
- addAddStyleSheets( arguments );
+ addAddStyleSheets( arguments );
Review comment:
Mixed windows linebreaks converted to unix by IDE.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]