commit a41a5032f8f256f42e4aa6293d6edd7177bc5fb7
author Janak Ramakrishnan <janakr@google.com> Fri Feb 06 21:27:27 2015 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Fri Feb 06 21:27:27 2015 +0000
tree b928e3b7bc6297e4de767f35d9c38994d3690df3
parent 168ba9b60d821bd6f6af61ca86127bc8d594b264

Remove unnecessary wrapper in return value of BlazeQueryEnvironment#getTarget(Label).

--
MOS_MIGRATED_REVID=85744195

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 d6c2992..7fabdc7 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
@@ -270,11 +270,11 @@
     return result;
   }
 
-  public Node<Target> getTarget(Label label) throws TargetNotFoundException, QueryException {
+  public Target getTarget(Label label) throws TargetNotFoundException, QueryException {
     // Can't use strictScope here because we are expecting a target back.
     validateScope(label, true);
     try {
-      return getNode(getTargetOrThrow(label));
+      return getNode(getTargetOrThrow(label)).getLabel();
     } catch (NoSuchThingException e) {
       throw new TargetNotFoundException(e);
     } catch (InterruptedException e) {
@@ -544,7 +544,7 @@
         if (value != null) {
           for (Label label : attrType.getLabels(value)) {
             try {
-              result.add(getTarget(label).getLabel());
+              result.add(getTarget(label));
             } catch (TargetNotFoundException e) {
               reportBuildFileError(caller, errorMsgPrefix + e.getMessage());
             }