commit be55e1181fd49ef78c24255f66f8d26882730af1
author gregce <gregce@google.com> Tue Jan 30 11:04:53 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Tue Jan 30 11:06:58 2018 -0800
tree 606dadfa48c2f3b0065da45d20c382f8ddc1f590
parent 34c9b65a873dd9b79bafe3202571e6de81af1b50

Rename Transition to ConfigurationTransition.

PiperOrigin-RevId: 183859414

src/main/java/com/google/devtools/build/lib/analysis/Dependency.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Dependency.java b/src/main/java/com/google/devtools/build/lib/analysis/Dependency.java
index 318d4f5..5ed5883 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/Dependency.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/Dependency.java
@@ -16,7 +16,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
-import com.google.devtools.build.lib.analysis.config.transitions.Transition;
+import com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransition;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.AspectDescriptor;
 import java.util.Map;
@@ -103,7 +103,7 @@
    * Creates a new {@link Dependency} with the given transition and aspects.
    */
   public static Dependency withTransitionAndAspects(
-      Label label, Transition transition, AspectCollection aspects) {
+      Label label, ConfigurationTransition transition, AspectCollection aspects) {
     return new ConfigurationTransitionDependency(label, transition, aspects);
   }
 
@@ -141,7 +141,7 @@
    *
    * @throws IllegalStateException if {@link #hasExplicitConfiguration} returns true.
    */
-  public abstract Transition getTransition();
+  public abstract ConfigurationTransition getTransition();
 
   /**
    * Returns the set of aspects which should be evaluated and combined with the configured target
@@ -179,7 +179,7 @@
     }
 
     @Override
-    public Transition getTransition() {
+    public ConfigurationTransition getTransition() {
       throw new IllegalStateException(
           "This dependency has an explicit configuration, not a transition.");
     }
@@ -243,7 +243,7 @@
     }
 
     @Override
-    public Transition getTransition() {
+    public ConfigurationTransition getTransition() {
       throw new IllegalStateException(
           "This dependency has an explicit configuration, not a transition.");
     }
@@ -287,11 +287,11 @@
    * Implementation of a dependency with a given configuration transition.
    */
   private static final class ConfigurationTransitionDependency extends Dependency {
-    private final Transition transition;
+    private final ConfigurationTransition transition;
     private final AspectCollection aspects;
 
     public ConfigurationTransitionDependency(
-        Label label, Transition transition, AspectCollection aspects) {
+        Label label, ConfigurationTransition transition, AspectCollection aspects) {
       super(label);
       this.transition = Preconditions.checkNotNull(transition);
       this.aspects = Preconditions.checkNotNull(aspects);
@@ -309,7 +309,7 @@
     }
 
     @Override
-    public Transition getTransition() {
+    public ConfigurationTransition getTransition() {
       return transition;
     }