svn commit: r345117 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java

[jdcasey]

Author: jdcasey
Date: Wed Nov 16 12:50:37 2005
New Revision: 345117

URL: http://svn.apache.org/viewcvs?rev=345117&view=rev
Log:
PR: MNG-1588
Submitted By: Jerome Lacoste
Reviewed By: John Casey

Applied, with small changes to the comments. Thanks, Jerome.

Modified:
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java?rev=345117&r1=345116&r2=345117&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
 Wed Nov 16 12:50:37 2005
@@ -88,36 +88,12 @@
     private List reactorProjects;
 
     /**
-     * Creates a Map of artifacts within the reactor using the 
groupId:artifactId:version as key
-     *
-     * @return a HashMap of all artifacts available in the reactor
-     */
-    protected Map getMappedReactorArtifacts()
-    {
-        Map mappedReactorArtifacts = new HashMap();
-
-        for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
-        {
-            MavenProject reactorProject = (MavenProject) i.next();
-
-            String key = reactorProject.getGroupId() + ":" + 
reactorProject.getArtifactId() + ":"
-                + reactorProject.getVersion();
-
-            mappedReactorArtifacts.put( key, reactorProject.getArtifact() );
-        }
-
-        return mappedReactorArtifacts;
-    }
-
-    /**
      * Retrieves all artifact dependencies within the reactor
      *
      * @return A HashSet of artifacts
      */
     protected Set getDependencies()
     {
-        Map reactorArtifacts = getMappedReactorArtifacts();
-
         Map dependencies = new HashMap();
 
         for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
@@ -128,9 +104,10 @@
             {
                 Artifact artifact = (Artifact) j.next();
 
+                // TODO: [jc; 16-nov-05] Why doesn't this use artifact.getId()?
                 String key = artifact.getGroupId() + ":" + 
artifact.getArtifactId() + ":" + artifact.getVersion();
 
-                if ( !reactorArtifacts.containsKey( key ) && 
!dependencies.containsKey( key ) )
+                if ( !dependencies.containsKey( key ) )
                 {
                     dependencies.put( key, artifact );
                 }