commit 1509cc8f07228a87184ee032b6a8d624b7d4e189
author Ulf Adams <ulfjack@google.com> Thu Feb 09 13:25:38 2017 +0000
committer Kristina Chodorow <kchodorow@google.com> Thu Feb 09 15:12:02 2017 +0000
tree d71124b9ff67e06e4718317446141c6f7fe1c3b1
parent 9ecac94044ee7f0d79d0bfc1c6f818b192cf740e

Replace PackageProvider with TargetProvider where possible

I was trying to simplify GenQuery, and found this during an audit of the
code; it's not sufficient to make any larger changes, but it may help
eventuall.

--
PiperOrigin-RevId: 147023626
MOS_MIGRATED_REVID=147023626

src/main/java/com/google/devtools/build/lib/query2/BlazeQueryEnvironment.java

diff --git a/src/main/java/com/google/devtools/build/lib/query2/BlazeQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/BlazeQueryEnvironment.java
index cfd92cf..eb39b01 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/BlazeQueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/BlazeQueryEnvironment.java
@@ -31,7 +31,6 @@
 import com.google.devtools.build.lib.packages.Package;
 import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.packages.Target;
-import com.google.devtools.build.lib.pkgcache.PackageProvider;
 import com.google.devtools.build.lib.pkgcache.TargetEdgeObserver;
 import com.google.devtools.build.lib.pkgcache.TargetPatternEvaluator;
 import com.google.devtools.build.lib.pkgcache.TargetProvider;
@@ -99,7 +98,7 @@
    * @param settings a set of enabled settings
    */
   BlazeQueryEnvironment(TransitivePackageLoader transitivePackageLoader,
-      PackageProvider packageProvider,
+      TargetProvider targetProvider,
       TargetPatternEvaluator targetPatternEvaluator,
       boolean keepGoing,
       boolean strictScope,
@@ -113,10 +112,10 @@
         keepGoing, strictScope, labelFilter, eventHandler, settings, extraFunctions, evalListener);
     this.targetPatternEvaluator = targetPatternEvaluator;
     this.transitivePackageLoader = transitivePackageLoader;
-    this.targetProvider = packageProvider;
+    this.targetProvider = targetProvider;
     this.errorObserver = new ErrorPrintingTargetEdgeErrorObserver(this.eventHandler);
     this.loadingPhaseThreads = loadingPhaseThreads;
-    this.labelVisitor = new LabelVisitor(packageProvider, dependencyFilter);
+    this.labelVisitor = new LabelVisitor(targetProvider, dependencyFilter);
   }
 
   @Override