svn commit: r773019 - /maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java

[bentmann]

Author: bentmann
Date: Fri May  8 14:58:26 2009
New Revision: 773019

URL: http://svn.apache.org/viewvc?rev=773019&view=rev
Log:
o Continued work on model merging

Modified:
    
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java

Modified: 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java?rev=773019&r1=773018&r2=773019&view=diff
==============================================================================
--- 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
 Fri May  8 14:58:26 2009
@@ -468,26 +468,26 @@
             Map<Object, PluginExecution> merged =
                 new LinkedHashMap<Object, PluginExecution>( ( src.size() + 
tgt.size() ) * 2 );
 
-            for ( Iterator<PluginExecution> it = tgt.iterator(); it.hasNext(); 
)
+            // FIXME: This needs to consider the <inherited> flag. If this is 
not detected by a UT/IT, we might want to
+            // create one...
+
+            for ( Iterator<PluginExecution> it = src.iterator(); it.hasNext(); 
)
             {
                 PluginExecution element = it.next();
                 Object key = getPluginExecutionKey( element );
                 merged.put( key, element );
             }
 
-            for ( Iterator<PluginExecution> it = src.iterator(); it.hasNext(); 
)
+            for ( Iterator<PluginExecution> it = tgt.iterator(); it.hasNext(); 
)
             {
                 PluginExecution element = it.next();
                 Object key = getPluginExecutionKey( element );
                 PluginExecution existing = merged.get( key );
                 if ( existing != null )
                 {
-                    mergePluginExecution( existing, element, sourceDominant, 
context );
-                }
-                else
-                {
-                    merged.put( key, element );
+                    mergePluginExecution( element, existing, sourceDominant, 
context );
                 }
+                merged.put( key, element );
             }
 
             target.setExecutions( new ArrayList<PluginExecution>( 
merged.values() ) );