You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2019/01/13 18:18:32 UTC
[maven] branch master updated: renamed variables for better
understanding
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new fdf5d92 renamed variables for better understanding
fdf5d92 is described below
commit fdf5d921a36cd41dbee43b6b89e96d22d8895cdb
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Jan 13 19:18:30 2019 +0100
renamed variables for better understanding
---
.../model/plugin/DefaultLifecycleBindingsInjector.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
index 90cf8da..0a3660b 100644
--- a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
@@ -80,7 +80,7 @@ public class DefaultLifecycleBindingsInjector
}
/**
- * The domain-specific model merger for the Maven POM
+ * The domain-specific model merger for lifecycle bindings
*/
protected static class LifecycleBindingsMerger
extends MavenModelMerger
@@ -119,7 +119,7 @@ public class DefaultLifecycleBindingsInjector
merged.put( key, element );
}
- Map<Object, Plugin> unmanaged = new LinkedHashMap<>();
+ Map<Object, Plugin> added = new LinkedHashMap<>();
for ( Plugin element : src )
{
@@ -132,11 +132,11 @@ public class DefaultLifecycleBindingsInjector
else
{
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 );
if ( pluginMgmt != null )
@@ -144,11 +144,11 @@ public class DefaultLifecycleBindingsInjector
for ( Plugin managedPlugin : pluginMgmt.getPlugins() )
{
Object key = getPluginKey( managedPlugin );
- Plugin unmanagedPlugin = unmanaged.get( key );
- if ( unmanagedPlugin != null )
+ Plugin addedPlugin = added.get( key );
+ if ( addedPlugin != null )
{
Plugin plugin = managedPlugin.clone();
- mergePlugin( plugin, unmanagedPlugin, sourceDominant, Collections.emptyMap() );
+ mergePlugin( plugin, addedPlugin, sourceDominant, Collections.emptyMap() );
merged.put( key, plugin );
}
}