diff options
author | 2017-10-26 00:55:59 +0200 | |
---|---|---|
committer | 2017-10-26 10:59:33 +0200 | |
commit | 93a376363cb69b9f6d29f5e386d0428330f512b8 (patch) | |
tree | bd82c9daf57ab9ace7b62c8029e05eba56bfdfef /src/main/java/com/google/devtools/build | |
parent | b47a62ed03a529319ec79806672ee57ea6819b30 (diff) |
Rename FakeSubincludeTarget to more appropriate name FakeLoadTarget (thanks @ccalvarin)
RELNOTES: None.
PiperOrigin-RevId: 173463794
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/BlazeQueryEnvironment.java | 2 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/FakeLoadTarget.java (renamed from src/main/java/com/google/devtools/build/lib/query2/FakeSubincludeTarget.java) | 10 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java | 2 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java | 4 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/output/XmlOutputFormatter.java | 4 |
5 files changed, 11 insertions, 11 deletions
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 fe267b94f2..3a1063b222 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 @@ -441,7 +441,7 @@ public class BlazeQueryEnvironment extends AbstractBlazeQueryEnvironment<Target> } private Node<Target> getSubincludeTarget(final Label label, Package pkg) { - return getNode(new FakeSubincludeTarget(label, pkg)); + return getNode(new FakeLoadTarget(label, pkg)); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/query2/FakeSubincludeTarget.java b/src/main/java/com/google/devtools/build/lib/query2/FakeLoadTarget.java index 2a221d1062..25317180df 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/FakeSubincludeTarget.java +++ b/src/main/java/com/google/devtools/build/lib/query2/FakeLoadTarget.java @@ -27,14 +27,14 @@ import java.util.Objects; import java.util.Set; /** - * A fake Target - Use only so that "blaze query" can report subincluded files as Targets. + * A fake Target - Use only so that "blaze query" can report Load files as Targets. */ -public class FakeSubincludeTarget implements Target { +public class FakeLoadTarget implements Target { private final Label label; private final Package pkg; - FakeSubincludeTarget(Label label, Package pkg) { + FakeLoadTarget(Label label, Package pkg) { this.label = Preconditions.checkNotNull(label); this.pkg = Preconditions.checkNotNull(pkg); } @@ -101,10 +101,10 @@ public class FakeSubincludeTarget implements Target { @Override public boolean equals(Object obj) { - if (!(obj instanceof FakeSubincludeTarget)) { + if (!(obj instanceof FakeLoadTarget)) { return false; } - FakeSubincludeTarget other = (FakeSubincludeTarget) obj; + FakeLoadTarget other = (FakeLoadTarget) obj; return label.equals(other.label) && pkg.equals(other.pkg); } diff --git a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java index e1e03444e8..ce06ac5b43 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java @@ -782,7 +782,7 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target> } private static Target getSubincludeTarget(Label label, Package pkg) { - return new FakeSubincludeTarget(label, pkg); + return new FakeLoadTarget(label, pkg); } @ThreadSafe diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java index 7d8f38c570..2e2810cfe3 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java +++ b/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java @@ -38,7 +38,7 @@ import com.google.devtools.build.lib.packages.PackageGroup; import com.google.devtools.build.lib.packages.ProtoUtils; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.Target; -import com.google.devtools.build.lib.query2.FakeSubincludeTarget; +import com.google.devtools.build.lib.query2.FakeLoadTarget; import com.google.devtools.build.lib.query2.engine.OutputFormatterCallback; import com.google.devtools.build.lib.query2.engine.QueryEnvironment; import com.google.devtools.build.lib.query2.engine.SynchronizedDelegatingOutputFormatterCallback; @@ -298,7 +298,7 @@ public class ProtoOutputFormatter extends AbstractUnorderedFormatter { targetPb.setType(SOURCE_FILE); targetPb.setSourceFile(input); - } else if (target instanceof FakeSubincludeTarget) { + } else if (target instanceof FakeLoadTarget) { Label label = target.getLabel(); SourceFile.Builder input = SourceFile.newBuilder() .setName(label.toString()); diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/XmlOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/output/XmlOutputFormatter.java index 6784ed3917..9af2dd884e 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/output/XmlOutputFormatter.java +++ b/src/main/java/com/google/devtools/build/lib/query2/output/XmlOutputFormatter.java @@ -26,7 +26,7 @@ import com.google.devtools.build.lib.packages.OutputFile; import com.google.devtools.build.lib.packages.PackageGroup; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.Target; -import com.google.devtools.build.lib.query2.FakeSubincludeTarget; +import com.google.devtools.build.lib.query2.FakeLoadTarget; import com.google.devtools.build.lib.query2.engine.OutputFormatterCallback; import com.google.devtools.build.lib.query2.engine.QueryEnvironment; import com.google.devtools.build.lib.query2.engine.SynchronizedDelegatingOutputFormatterCallback; @@ -213,7 +213,7 @@ class XmlOutputFormatter extends AbstractUnorderedFormatter { envGroup.getDefaults()); defaults.setAttribute("name", "defaults"); elem.appendChild(defaults); - } else if (target instanceof FakeSubincludeTarget) { + } else if (target instanceof FakeLoadTarget) { elem = doc.createElement("source-file"); } else { throw new IllegalArgumentException(target.toString()); |