diff options
author | 2017-12-21 12:40:20 -0800 | |
---|---|---|
committer | 2017-12-21 12:42:14 -0800 | |
commit | c7b2121757343bd117ecdc2513c945e2e3da6406 (patch) | |
tree | edd77a1271f23432bd080d02c11117c88a9b7fdf /src/main/java/com/google/devtools/build/lib/analysis/config | |
parent | 46356dfa59428b665aa280ba4cbca6e449f73c5b (diff) |
Remove final accessors of ConfigurationTransition.HOST.
Also lean interfaces from Attribute.ConfigurationTransition
to Attribute.Transition.
PiperOrigin-RevId: 179846158
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/config')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/config/FragmentCollection.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentCollection.java index 0853001052..cdadf22a85 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentCollection.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentCollection.java @@ -17,7 +17,7 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableCollection; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.packages.Attribute.ConfigurationTransition; +import com.google.devtools.build.lib.packages.Attribute; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; import com.google.devtools.build.lib.syntax.ClassObject; @@ -40,22 +40,22 @@ import javax.annotation.Nullable; + "(see <a href=\"../rules.md#fragments\">here</a>).") public class FragmentCollection implements ClassObject { private final RuleContext ruleContext; - private final ConfigurationTransition config; + private final Attribute.Transition transition; - public FragmentCollection(RuleContext ruleContext, ConfigurationTransition config) { + public FragmentCollection(RuleContext ruleContext, Attribute.Transition transition) { this.ruleContext = ruleContext; - this.config = config; + this.transition = transition; } @Override @Nullable public Object getValue(String name) { - return ruleContext.getSkylarkFragment(name, config); + return ruleContext.getSkylarkFragment(name, transition); } @Override public ImmutableCollection<String> getKeys() { - return ruleContext.getSkylarkFragmentNames(config); + return ruleContext.getSkylarkFragmentNames(transition); } @Override @@ -64,19 +64,19 @@ public class FragmentCollection implements ClassObject { return String.format( "There is no configuration fragment named '%s' in %s configuration. " + "Available fragments: %s", - name, getConfigurationName(config), printKeys()); + name, getConfigurationName(transition), printKeys()); } private String printKeys() { return String.format("'%s'", Joiner.on("', '").join(getKeys())); } - public static String getConfigurationName(ConfigurationTransition config) { - return (config == ConfigurationTransition.HOST) ? "host" : "target"; + public static String getConfigurationName(Attribute.Transition config) { + return config.isHostTransition() ? "host" : "target"; } @Override public String toString() { - return getConfigurationName(config) + ": [ " + printKeys() + "]"; + return getConfigurationName(transition) + ": [ " + printKeys() + "]"; } } |