From 8d0be8960e49e09c0cbcc8173ce538edfa3cb208 Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Fri, 14 Oct 2016 13:56:46 +0000 Subject: Rename field to clarify function. -- MOS_MIGRATED_REVID=136152771 --- .../lib/analysis/ConfiguredRuleClassProvider.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java index 2d3119c4ac..7f67e8dcc3 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java @@ -56,7 +56,6 @@ import com.google.devtools.build.lib.syntax.Environment.Phase; import com.google.devtools.build.lib.syntax.Mutability; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.common.options.OptionsClassProvider; - import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -66,7 +65,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; - import javax.annotation.Nullable; /** @@ -189,7 +187,8 @@ public class ConfiguredRuleClassProvider implements RuleClassProvider { private Label preludeLabel; private String runfilesPrefix; private String toolsRepository; - private final List configurationFragments = new ArrayList<>(); + private final List configurationFragmentFactories = + new ArrayList<>(); private final List buildInfoFactories = new ArrayList<>(); private final List> configurationOptions = new ArrayList<>(); @@ -278,7 +277,7 @@ public class ConfiguredRuleClassProvider implements RuleClassProvider { } public Builder addConfigurationFragment(ConfigurationFragmentFactory factory) { - configurationFragments.add(factory); + configurationFragmentFactories.add(factory); return this; } @@ -403,7 +402,7 @@ public class ConfiguredRuleClassProvider implements RuleClassProvider { defaultWorkspaceFileSuffix.toString(), ImmutableList.copyOf(buildInfoFactories), ImmutableList.copyOf(configurationOptions), - ImmutableList.copyOf(configurationFragments), + ImmutableList.copyOf(configurationFragmentFactories), configurationCollectionFactory, universalFragment, prerequisiteValidator, @@ -495,10 +494,8 @@ public class ConfiguredRuleClassProvider implements RuleClassProvider { */ private final ImmutableList> configurationOptions; - /** - * The set of configuration fragment factories. - */ - private final ImmutableList configurationFragments; + /** The set of configuration fragment factories. */ + private final ImmutableList configurationFragmentFactories; /** * The factory that creates the configuration collection. @@ -548,7 +545,7 @@ public class ConfiguredRuleClassProvider implements RuleClassProvider { this.defaultWorkspaceFileSuffix = defaultWorkspaceFileSuffix; this.buildInfoFactories = buildInfoFactories; this.configurationOptions = configurationOptions; - this.configurationFragments = configurationFragments; + this.configurationFragmentFactories = configurationFragments; this.configurationCollectionFactory = configurationCollectionFactory; this.universalFragment = universalFragment; this.prerequisiteValidator = prerequisiteValidator; @@ -601,7 +598,7 @@ public class ConfiguredRuleClassProvider implements RuleClassProvider { * Returns the set of configuration fragments provided by this module. */ public ImmutableList getConfigurationFragments() { - return configurationFragments; + return configurationFragmentFactories; } /** -- cgit v1.2.3