From 320ed9d942c19124b942f9845730f9f6287ac066 Mon Sep 17 00:00:00 2001
From: Nikita Skvortsov <nikita.skvortsov@jetbrains.com>
Date: Tue, 8 May 2018 18:12:54 +0300
Subject: [PATCH] rename parameter, improve formatting

---
 .../gradle/tooling/util/ArtifactsCollectionResolver.java     | 5 ++++-
 .../tooling/util/resolve/DependencyResultsTransformer.java   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/ArtifactsCollectionResolver.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/ArtifactsCollectionResolver.java
index a96f2342afc7..a6705a9dea6f 100644
--- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/ArtifactsCollectionResolver.java
+++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/ArtifactsCollectionResolver.java
@@ -64,7 +64,8 @@ public class ArtifactsCollectionResolver extends DependencyResolverImpl implemen
   }
 
   @Override
-  public ExternalDepsResolutionResult resolveDependencies(@Nullable Configuration configuration, @Nullable String scope) {
+  public ExternalDepsResolutionResult resolveDependencies(@Nullable Configuration configuration,
+                                                          @Nullable String scope) {
     if (configuration == null) {
       return ExternalDepsResolutionResult.EMPTY;
     }
@@ -86,6 +87,8 @@ public class ArtifactsCollectionResolver extends DependencyResolverImpl implemen
 
     ScopedExternalDependenciesFactory factory = new ScopedExternalDependenciesFactory(myProject, scope);
 
+
+
     externalDeps.addAll(factory.processResolvedArtifacts(resolvedArtifacts, sourcesAndJavadocs));
     externalDeps.addAll(factory.processUnresolvedDeps(unresolvedDependencies));
 
diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/DependencyResultsTransformer.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/DependencyResultsTransformer.java
index 63617a24b98d..99b6eddb208c 100644
--- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/DependencyResultsTransformer.java
+++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/DependencyResultsTransformer.java
@@ -38,14 +38,14 @@ class DependencyResultsTransformer {
   DependencyResultsTransformer(@NotNull final Project project,
                                @NotNull final SourceSetCachedFinder sourceSetFinder,
                                @NotNull final Multimap<ModuleVersionIdentifier, ResolvedArtifact> artifactMap,
-                               @NotNull final Map<ComponentIdentifier, ComponentArtifactsResult> componentResultsMap,
+                               @NotNull final Map<ComponentIdentifier, ComponentArtifactsResult> auxiliaryArtifactsMap,
                                @NotNull final Multimap<ModuleComponentIdentifier, ProjectDependency> configurationProjectDependencies,
                                @Nullable final String scope) {
     myProject = project;
     mySourceSetFinder = sourceSetFinder;
 
     myArtifactMap = artifactMap;
-    myAuxiliaryArtifactsMap = componentResultsMap;
+    myAuxiliaryArtifactsMap = auxiliaryArtifactsMap;
     myConfigurationProjectDependencies = configurationProjectDependencies;
     myScope = scope;
   }