Author: dennisl Date: Fri Jan 7 22:25:41 2011 New Revision: 1056544 URL: http://svn.apache.org/viewvc?rev=1056544&view=rev Log: o Refactoring: Feed the report generator a list of releases, the rest is handled in the mojo.
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java?rev=1056544&r1=1056543&r2=1056544&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java Fri Jan 7 22:25:41 2011 @@ -300,8 +300,12 @@ public class ChangesMojo } - ChangesReportGenerator report = new ChangesReportGenerator( new ChangesXML( xmlPath, getLog() ) ); - + ChangesXML changesXml = new ChangesXML( xmlPath, getLog() ); + ChangesReportGenerator report = new ChangesReportGenerator( changesXml.getReleaseList() ); + + report.setAuthor( changesXml.getAuthor() ); + report.setTitle( changesXml.getTitle() ); + report.setEscapeHTML ( escapeHTML ); // Create a case insensitive version of issueLinkTemplatePerSystem Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java?rev=1056544&r1=1056543&r2=1056544&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java Fri Jan 7 22:25:41 2011 @@ -19,7 +19,6 @@ package org.apache.maven.plugin.changes; * under the License. */ -import java.io.File; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; @@ -31,7 +30,6 @@ import org.apache.commons.lang.StringUti import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.util.HtmlTools; import org.apache.maven.plugin.issues.AbstractIssuesReportGenerator; -import org.apache.maven.plugin.logging.Log; import org.apache.maven.plugins.changes.model.Action; import org.apache.maven.plugins.changes.model.DueTo; import org.apache.maven.plugins.changes.model.FixedIssue; @@ -90,12 +88,10 @@ public class ChangesReportGenerator exte issueLinksPerSystem = new HashMap(); } - public ChangesReportGenerator( ChangesXML changesXML ) + public ChangesReportGenerator( List releaseList ) { this(); - author = changesXML.getAuthor(); - releaseList = changesXML.getReleaseList(); - title = changesXML.getTitle(); + this.releaseList = releaseList; } /** Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java?rev=1056544&r1=1056543&r2=1056544&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java Fri Jan 7 22:25:41 2011 @@ -23,6 +23,26 @@ public abstract class AbstractIssuesRepo { } + public String getAuthor() + { + return author; + } + + public void setAuthor( String author ) + { + this.author = author; + } + + public String getTitle() + { + return title; + } + + public void setTitle( String title ) + { + this.title = title; + } + protected void sinkBeginReport( Sink sink, ResourceBundle bundle ) { sink.head();