You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2010/11/19 13:47:51 UTC
svn commit: r1036825 -
/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
Author: vsiveton
Date: Fri Nov 19 12:47:51 2010
New Revision: 1036825
URL: http://svn.apache.org/viewvc?rev=1036825&view=rev
Log:
MPIR-158: Artifact ###### has no file error.
o removed instanciation of DependencyNode
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java?rev=1036825&r1=1036824&r2=1036825&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java Fri Nov 19 12:47:51 2010
@@ -83,6 +83,7 @@ public class Dependencies
* @param dependencyTreeNode the DependencyNode.
* @param classesAnalyzer the JarClassesAnalysis.
*/
+ @SuppressWarnings( "unchecked" )
public Dependencies( MavenProject project, DependencyNode dependencyTreeNode,
JarClassesAnalysis classesAnalyzer )
{
@@ -93,15 +94,7 @@ public class Dependencies
/*
* Workaround to ensure proper File objects in the Artifacts from the ReportResolutionListener
*/
- Map<String, Artifact> projectMap = new HashMap<String, Artifact>();
- Iterator<Artifact> it = project.getArtifacts().iterator();
- while ( it.hasNext() )
- {
- Artifact artifact = it.next();
- projectMap.put( ArtifactUtils.versionlessKey( artifact ), artifact );
- }
-
- mapArtifactFiles( dependencyTreeNode, projectMap );
+ mapArtifactFiles( this.dependencyTreeNode );
}
/**
@@ -295,7 +288,7 @@ public class Dependencies
// Private methods
// ----------------------------------------------------------------------
- private void mapArtifactFiles( DependencyNode node, Map<String, Artifact> projectMap )
+ private void mapArtifactFiles( DependencyNode node )
{
List<DependencyNode> childs = node.getChildren();
if ( ( childs == null ) || childs.isEmpty() )
@@ -308,14 +301,13 @@ public class Dependencies
{
DependencyNode anode = it.next();
String key = ArtifactUtils.versionlessKey( anode.getArtifact() );
- Artifact projartifact = (Artifact) projectMap.get( key );
+ Artifact projartifact = (Artifact) project.getArtifactMap().get( key );
if ( projartifact != null )
{
- anode = new DependencyNode( ArtifactUtils.copyArtifact( projartifact ) );
anode.getArtifact().setFile( projartifact.getFile() );
}
- mapArtifactFiles( anode, projectMap );
+ mapArtifactFiles( anode );
}
}