You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2011/01/07 07:38:21 UTC
svn commit: r1056203 - in
/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes:
ChangesMojo.java ChangesReportGenerator.java
Author: dennisl
Date: Fri Jan 7 06:38:20 2011
New Revision: 1056203
URL: http://svn.apache.org/viewvc?rev=1056203&view=rev
Log:
o Refactoring: Do not feed the raw changes.xml file to the report generator - give it the facade instead.
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
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=1056203&r1=1056202&r2=1056203&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 06:38:20 2011
@@ -300,7 +300,7 @@ public class ChangesMojo
}
- ChangesReportGenerator report = new ChangesReportGenerator( xmlPath, getLog() );
+ ChangesReportGenerator report = new ChangesReportGenerator( new ChangesXML( xmlPath, getLog() ) );
report.setEscapeHTML ( escapeHTML );
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=1056203&r1=1056202&r2=1056203&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 06:38:20 2011
@@ -59,8 +59,6 @@ public class ChangesReportGenerator exte
private static final String NO_TEAMLIST = "none";
- private ChangesXML report;
-
/**
* The issue management system to use, for actions that do not specify a
* system.
@@ -82,17 +80,22 @@ public class ChangesReportGenerator exte
*/
private boolean escapeHTML;
+ /**
+ * @since 2.4
+ */
+ private List releaseList;
+
public ChangesReportGenerator()
{
issueLinksPerSystem = new HashMap();
}
- public ChangesReportGenerator( File xmlPath, Log log )
+ public ChangesReportGenerator( ChangesXML changesXML )
{
this();
- report = new ChangesXML( xmlPath, log );
- author = report.getAuthor();
- title = report.getTitle();
+ author = changesXML.getAuthor();
+ releaseList = changesXML.getReleaseList();
+ title = changesXML.getTitle();
}
/**
@@ -212,9 +215,9 @@ public class ChangesReportGenerator exte
{
sinkBeginReport( sink, bundle );
- constructReleaseHistory( sink, bundle );
+ constructReleaseHistory( sink, bundle, releaseList );
- constructReleases( sink, bundle );
+ constructReleases( sink, bundle, releaseList );
sinkEndReport( sink );
}
@@ -460,15 +463,13 @@ public class ChangesReportGenerator exte
}
}
- private void constructReleaseHistory( Sink sink, ResourceBundle bundle )
+ private void constructReleaseHistory( Sink sink, ResourceBundle bundle, List releaseList )
{
sink.section2();
sinkSectionTitle2Anchor( sink, bundle.getString( "report.changes.label.releasehistory" ),
bundle.getString( "report.changes.label.releasehistory" ) );
- List releaseList = report.getReleaseList();
-
sink.table();
sink.tableRow();
@@ -510,9 +511,8 @@ public class ChangesReportGenerator exte
sink.section2_();
}
- private void constructReleases( Sink sink, ResourceBundle bundle )
+ private void constructReleases( Sink sink, ResourceBundle bundle, List releaseList )
{
- List releaseList = report.getReleaseList();
for ( int idx = 0; idx < releaseList.size(); idx++ )
{