svn commit: r1749086 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java

[sc...@apache.org]

Author: schulte
Date: Sat Jun 18 19:16:37 2016
New Revision: 1749086

URL: http://svn.apache.org/viewvc?rev=1749086&view=rev
Log:
[MJAVADOC-462] Upgrade of doxia to 1.7 and doxia-sitetools to 1.7.1.


Modified:
    maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=1749086&r1=1749085&r2=1749086&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java Sat Jun 18 19:16:37 2016
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
-import org.apache.maven.doxia.sink.render.RenderingContext;
+import org.apache.maven.doxia.siterenderer.RenderingContext;
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -35,7 +35,6 @@ import org.apache.maven.plugins.annotati
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.reporting.MavenReport;
 import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.doxia.sink.Sink;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
@@ -98,6 +97,7 @@ public class JavadocReport
     // ----------------------------------------------------------------------
 
     /** {@inheritDoc} */
+    @Override
     public String getName( Locale locale )
     {
         if ( StringUtils.isEmpty( name ) )
@@ -109,6 +109,7 @@ public class JavadocReport
     }
 
     /** {@inheritDoc} */
+    @Override
     public String getDescription( Locale locale )
     {
         if ( StringUtils.isEmpty( description ) )
@@ -119,8 +120,9 @@ public class JavadocReport
         return description;
     }
 
+    @Override
     /** {@inheritDoc} */
-    public void generate( Sink sink, Locale locale )
+    public void generate( org.codehaus.doxia.sink.Sink sink, Locale locale )
         throws MavenReportException
     {
         outputDirectory = getReportOutputDirectory();
@@ -148,12 +150,14 @@ public class JavadocReport
     }
 
     /** {@inheritDoc} */
+    @Override
     public String getOutputName()
     {
         return destDir + "/index";
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean isExternalReport()
     {
         return true;
@@ -252,12 +256,14 @@ public class JavadocReport
     }
 
     /** {@inheritDoc} */
+    @Override
     public String getCategoryName()
     {
         return CATEGORY_PROJECT_REPORTS;
     }
 
     /** {@inheritDoc} */
+    @Override
     public File getReportOutputDirectory()
     {
         if ( reportOutputDirectory == null )
@@ -273,6 +279,7 @@ public class JavadocReport
      *
      * @param reportOutputDirectory the directory file to be set
      */
+    @Override
     public void setReportOutputDirectory( File reportOutputDirectory )
     {
         updateReportOutputDirectory( reportOutputDirectory, destDir );
@@ -344,4 +351,5 @@ public class JavadocReport
     {
         return ResourceBundle.getBundle( "javadoc-report", locale, getClass().getClassLoader() );
     }
+
 }