svn commit: r1054387 - in /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes: ChangesMojo.java ChangesReportGenerator.java

[de...@apache.org]

Author: dennisl
Date: Sun Jan  2 11:42:44 2011
New Revision: 1054387

URL: http://svn.apache.org/viewvc?rev=1054387&view=rev
Log:
o Refactoring: move configuration of issue link template per system out of the report generator and into 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

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=1054387&r1=1054386&r2=1054387&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 Sun Jan  2 11:42:44 2011
@@ -25,6 +25,8 @@ import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
@@ -285,8 +287,29 @@ public class ChangesMojo
         
         report.setEscapeHTML ( escapeHTML );
 
+        // Set good default values for issue management systems here, but only
+        // if they have not been configured already by the user
+        addIssueLinkTemplate( ChangesReportGenerator.DEFAULT_ISSUE_SYSTEM_KEY, issueLinkTemplate );
+
+        // Show the current issueLinkTemplatePerSystem configuration
+        if ( getLog().isDebugEnabled() )
+        {
+            if ( issueLinkTemplatePerSystem == null )
+            {
+                getLog().debug( "No issueLinkTemplatePerSystem configuration was found" );
+            }
+            else
+            {
+                Iterator iterator = issueLinkTemplatePerSystem.entrySet().iterator();
+                while ( iterator.hasNext() )
+                {
+                    Map.Entry entry = (Map.Entry) iterator.next();
+                    getLog().debug( "issueLinkTemplatePerSystem[" + entry.getKey() + "] = " + entry.getValue() );
+                }
+            }
+        }
+
         report.setIssueLinksPerSystem( issueLinkTemplatePerSystem );
-        report.setIssueLink( issueLinkTemplate );
         
         report.setTeamlist ( teamlist );
 
@@ -305,6 +328,26 @@ public class ChangesMojo
         copyStaticResources();
     }
 
+    /**
+     * Add the issue link template for the given issue management system,
+     * but only if it has not already been configured.
+     *
+     * @param system The issue management system
+     * @param issueLinkTemplate The issue link template to use
+     * @since 2.4
+     */
+    private void addIssueLinkTemplate( String system, String issueLinkTemplate )
+    {
+        if ( issueLinkTemplatePerSystem == null )
+        {
+            issueLinkTemplatePerSystem = new HashMap();
+        }
+        if ( !issueLinkTemplatePerSystem.containsKey( system ) )
+        {
+            issueLinkTemplatePerSystem.put( system, issueLinkTemplate );
+        }
+    }
+
     public String getName( Locale locale )
     {
         return getBundle( locale ).getString( "report.changes.name" );

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=1054387&r1=1054386&r2=1054387&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 Sun Jan  2 11:42:44 2011
@@ -54,7 +54,7 @@ public class ChangesReportGenerator
      */
     private static final String ISSUE_TOKEN = "%ISSUE%";
 
-    private static final String DEFAULT_ISSUE_SYSTEM_KEY = "default";
+    static final String DEFAULT_ISSUE_SYSTEM_KEY = "default";
 
     private static final String NO_TEAMLIST = "none";
 
@@ -100,29 +100,6 @@ public class ChangesReportGenerator
         this.escapeHTML = escapeHTML;
     }
 
-    /**
-     * @deprecated
-     */
-    public void setIssueLink( String issueLink )
-    {
-        if ( this.issueLinksPerSystem == null )
-        {
-            this.issueLinksPerSystem = new HashMap();
-        }
-        if ( !this.issueLinksPerSystem.containsKey( DEFAULT_ISSUE_SYSTEM_KEY ) )
-        {
-            this.issueLinksPerSystem.put( DEFAULT_ISSUE_SYSTEM_KEY, issueLink );
-        }
-    }
-
-    /**
-     * @deprecated
-     */
-    public String getIssueLink()
-    {
-        return (String) issueLinksPerSystem.get( DEFAULT_ISSUE_SYSTEM_KEY );
-    }
-
     public void setTeamlist( final String teamlist )
     {
         this.teamlist = teamlist;