Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renamed variables for better understanding

This commit is contained in:
Hervé Boutemy 2019-01-13 19:18:30 +01:00
parent 375cd7b7ae
commit fdf5d921a3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
View File

@ -80,7 +80,7 @@ else if ( !defaultPlugins.isEmpty() )
} }
/** /**
* The domain-specific model merger for the Maven POM * The domain-specific model merger for lifecycle bindings
*/ */
protected static class LifecycleBindingsMerger protected static class LifecycleBindingsMerger
extends MavenModelMerger extends MavenModelMerger
@ -119,7 +119,7 @@ protected void mergePluginContainer_Plugins( PluginContainer target, PluginConta
merged.put( key, element ); merged.put( key, element );
} }
Map<Object, Plugin> unmanaged = new LinkedHashMap<>(); Map<Object, Plugin> added = new LinkedHashMap<>();
for ( Plugin element : src ) for ( Plugin element : src )
{ {
@ -132,11 +132,11 @@ protected void mergePluginContainer_Plugins( PluginContainer target, PluginConta
else else
{ {
merged.put( key, element ); merged.put( key, element );
unmanaged.put( key, element ); added.put( key, element );
} }
} }
if ( !unmanaged.isEmpty() ) if ( !added.isEmpty() )
{ {
PluginManagement pluginMgmt = (PluginManagement) context.get( PLUGIN_MANAGEMENT ); PluginManagement pluginMgmt = (PluginManagement) context.get( PLUGIN_MANAGEMENT );
if ( pluginMgmt != null ) if ( pluginMgmt != null )
@ -144,11 +144,11 @@ protected void mergePluginContainer_Plugins( PluginContainer target, PluginConta
for ( Plugin managedPlugin : pluginMgmt.getPlugins() ) for ( Plugin managedPlugin : pluginMgmt.getPlugins() )
{ {
Object key = getPluginKey( managedPlugin ); Object key = getPluginKey( managedPlugin );
Plugin unmanagedPlugin = unmanaged.get( key ); Plugin addedPlugin = added.get( key );
if ( unmanagedPlugin != null ) if ( addedPlugin != null )
{ {
Plugin plugin = managedPlugin.clone(); Plugin plugin = managedPlugin.clone();
mergePlugin( plugin, unmanagedPlugin, sourceDominant, Collections.emptyMap() ); mergePlugin( plugin, addedPlugin, sourceDominant, Collections.emptyMap() );
merged.put( key, plugin ); merged.put( key, plugin );
} }
} }