From fdf5d921a36cd41dbee43b6b89e96d22d8895cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sun, 13 Jan 2019 19:18:30 +0100 Subject: [PATCH] renamed variables for better understanding --- .../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 90cf8da7e5..0a3660b338 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 unmanaged = new LinkedHashMap<>(); + Map 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 ); } }