svn commit: r1591792 - in /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin: changes/ChangesReportGenerator.java issues/AbstractIssuesReportGenerator.java

[mi...@apache.org]

Author: michaelo
Date: Thu May  1 22:08:00 2014
New Revision: 1591792

URL: http://svn.apache.org/r1591792
Log:
[MCHANGES-338] Remove redundant anchors set on headings
with subtask [MCHANGES-269] Move anchor location in changes.xml to header

Modified:
    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/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=1591792&r1=1591791&r2=1591792&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 Thu May  1 22:08:00 2014
@@ -29,6 +29,8 @@ import java.util.ResourceBundle;
 import org.apache.commons.lang.StringUtils;
 
 import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkEventAttributeSet;
+import org.apache.maven.doxia.sink.SinkEventAttributes;
 import org.apache.maven.doxia.util.HtmlTools;
 import org.apache.maven.plugin.issues.AbstractIssuesReportGenerator;
 import org.apache.maven.plugins.changes.model.Action;
@@ -449,8 +451,9 @@ public class ChangesReportGenerator exte
     {
         sink.section2();
 
-        sinkSectionTitle2Anchor( sink, bundle.getString( "report.changes.label.releasehistory" ),
-                                 bundle.getString( "report.changes.label.releasehistory" ) );
+        sink.sectionTitle2();
+        sink.text( bundle.getString( "report.changes.label.releasehistory" ) );
+        sink.sectionTitle2_();
 
         sink.table();
 
@@ -525,8 +528,12 @@ public class ChangesReportGenerator exte
 
         final String date = ( release.getDateRelease() == null ) ? "" : " \u2013 " + release.getDateRelease();
 
-        sinkSectionTitle2Anchor( sink, bundle.getString( "report.changes.label.release" ) + " "
-                + release.getVersion() + date, release.getVersion() );
+        SinkEventAttributes attrs = new SinkEventAttributeSet();
+        attrs.addAttribute( SinkEventAttributes.ID, HtmlTools.encodeId( release.getVersion() ) );
+        sink.sectionTitle( Sink.SECTION_LEVEL_2, attrs );
+        sink.text( bundle.getString( "report.changes.label.release" ) + " "
+            + release.getVersion() + date );
+        sink.sectionTitle_( Sink.SECTION_LEVEL_2 );
 
         if ( isReleaseEmpty( release ) )
         {

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=1591792&r1=1591791&r2=1591792&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 Thu May  1 22:08:00 2014
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.issues;
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.sink.SinkEventAttributeSet;
 import org.apache.maven.doxia.sink.SinkEventAttributes;
-import org.apache.maven.doxia.util.HtmlTools;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.util.ResourceBundle;
@@ -94,7 +93,11 @@ public abstract class AbstractIssuesRepo
 
         sink.section1();
 
-        sinkSectionTitle1Anchor( sink, title, title );
+        sink.sectionTitle1();
+
+        sink.text( title );
+
+        sink.sectionTitle1_();
     }
 
     protected void sinkCell( Sink sink, String text )
@@ -160,28 +163,6 @@ public abstract class AbstractIssuesRepo
         sink.link_();
     }
 
-    protected void sinkSectionTitle1Anchor( Sink sink, String text, String anchor )
-    {
-        sink.sectionTitle1();
-
-        sink.text( text );
-
-        sink.sectionTitle1_();
-
-        sink.anchor( HtmlTools.encodeId( anchor ) );
-        sink.anchor_();
-    }
-
-    protected void sinkSectionTitle2Anchor( Sink sink, String text, String anchor )
-    {
-        sink.sectionTitle2();
-        sink.text( text );
-        sink.sectionTitle2_();
-
-        sink.anchor( HtmlTools.encodeId( anchor ) );
-        sink.anchor_();
-    }
-
     protected void sinkShowTypeIcon( Sink sink, String type )
     {
         String image = "";