diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/config/transitions')
5 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingPatchTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingPatchTransition.java index 635cab4b47..1fec601858 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingPatchTransition.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingPatchTransition.java @@ -49,7 +49,7 @@ public class ComposingPatchTransition implements PatchTransition { } @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { return Iterables.getOnlyElement(delegate.split(options)); } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingSplitTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingSplitTransition.java index 70c3bf8e70..69970c21c1 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingSplitTransition.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingSplitTransition.java @@ -118,7 +118,7 @@ public class ComposingSplitTransition implements SplitTransition { // TODO(gregce): move this somewhere more general. This isn't intrinsic to composed splits. static List<BuildOptions> apply(BuildOptions fromOptions, ConfigurationTransition transition) { if (transition instanceof PatchTransition) { - return ImmutableList.<BuildOptions>of(((PatchTransition) transition).apply(fromOptions)); + return ImmutableList.<BuildOptions>of(((PatchTransition) transition).patch(fromOptions)); } else if (transition instanceof SplitTransition) { SplitTransition split = (SplitTransition) transition; List<BuildOptions> splitOptions = split.split(fromOptions); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NoTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NoTransition.java index 793edafd3e..a05f6b5414 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NoTransition.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NoTransition.java @@ -24,7 +24,7 @@ public final class NoTransition implements PatchTransition { private NoTransition() {} @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { return options; } } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NullTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NullTransition.java index 0d7156b51e..a26d660d13 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NullTransition.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NullTransition.java @@ -25,7 +25,7 @@ public class NullTransition implements PatchTransition { } @Override - public BuildOptions apply(BuildOptions options) { + public BuildOptions patch(BuildOptions options) { throw new UnsupportedOperationException( "This is only referenced in a few places, so it's easier and more efficient to optimize " + "Blaze's transition logic in the presence of null transitions vs. actually call this " diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/PatchTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/PatchTransition.java index 451148ee60..1fdfa95fd3 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/PatchTransition.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/transitions/PatchTransition.java @@ -33,7 +33,7 @@ import com.google.devtools.build.lib.analysis.config.BuildOptions; * private MyTransition() {} * * {@literal @}Override - * public BuildOptions apply(BuildOptions options) { + * public BuildOptions patch(BuildOptions options) { * BuildOptions toOptions = options.clone(); * // Change some setting on toOptions * return toOptions; @@ -57,5 +57,5 @@ public interface PatchTransition extends ConfigurationTransition { * MODIFY THIS VARIABLE WITHOUT CLONING IT FIRST. * @return the options representing the desired post-transition configuration */ - BuildOptions apply(BuildOptions options); + BuildOptions patch(BuildOptions options); } |