Author: dennisl
Date: Sun Jul 20 10:07:01 2008
New Revision: 678286
URL: http://svn.apache.org/viewvc?rev=678286&view=rev
Log:
[MPIR-129] Duplicate entries of the same artifact in Licenses section of
Dependencies report
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=678286&r1=678285&r2=678286&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
Sun Jul 20 10:07:01 2008
@@ -37,6 +37,8 @@
import java.util.Locale;
import java.util.Map;
import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -104,18 +106,18 @@
private final RepositoryUtils repoUtils;
/**
- * Will be filled with license name / list of projects.
+ * Will be filled with license name / set of projects.
*/
private Map licenseMap = new HashMap()
{
/** [EMAIL PROTECTED] */
public Object put( Object key, Object value )
{
- // handle multiple values as a list
- List valueList = (List) get( key );
+ // handle multiple values as a set to avoid duplicates
+ SortedSet valueList = (SortedSet) get( key );
if ( valueList == null )
{
- valueList = new ArrayList();
+ valueList = new TreeSet();
}
valueList.add( value );
return super.put( key, valueList );
@@ -1140,8 +1142,7 @@
sink.text( ": " );
sink.bold_();
- List projects = (List) licenseMap.get( licenseName );
- Collections.sort( projects );
+ SortedSet projects = (SortedSet) licenseMap.get( licenseName );
for ( Iterator iterator = projects.iterator(); iterator.hasNext();
)
{
