diff options
author | 2016-02-24 12:39:09 +0000 | |
---|---|---|
committer | 2016-02-24 17:59:25 +0000 | |
commit | 29d861e4eca0f56d91755cfed86465eaf1a6ae32 (patch) | |
tree | ec8ed75c1d99badab2839277b6337a7373bc1ad9 | |
parent | 8c440b3feec81245a965f3f933b926b55254dadb (diff) |
Use ImmutableList for translations, and reformat Java{Binary,Library} a bit.
--
MOS_MIGRATED_REVID=115438295
5 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java index 067058ae19..b140349dbd 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java @@ -365,7 +365,7 @@ public class BazelJavaSemantics implements JavaSemantics { } @Override - public Collection<Artifact> translate(RuleContext ruleContext, JavaConfiguration javaConfig, + public ImmutableList<Artifact> translate(RuleContext ruleContext, JavaConfiguration javaConfig, List<Artifact> messages) { return ImmutableList.<Artifact>of(); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java index 27afae17d0..33519972ac 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java @@ -157,8 +157,8 @@ public class JavaBinary implements RuleConfiguredTargetFactory { JavaConfiguration javaConfig = ruleContext.getFragment(JavaConfiguration.class); if (attributes.hasMessages()) { - helper.addTranslations(semantics.translate(ruleContext, javaConfig, - attributes.getMessages())); + helper.setTranslations( + semantics.translate(ruleContext, javaConfig, attributes.getMessages())); } if (attributes.hasSourceFiles() || attributes.hasSourceJars() diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java index cedb442d23..6ad0e12328 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java @@ -625,7 +625,7 @@ public final class JavaCompilationHelper extends BaseJavaCompilationHelper { ruleContext.getTokenizedStringListAttr("javacopts"))); } - public void addTranslations(Collection<Artifact> translations) { + public void setTranslations(Collection<Artifact> translations) { Preconditions.checkArgument(!translationsFrozen); this.translations.addAll(translations); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java index 1a344cb4cb..bf75f662f7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java @@ -81,8 +81,8 @@ public class JavaLibrary implements RuleConfiguredTargetFactory { JavaTargetAttributes attributes = helper.getAttributes(); if (attributes.hasMessages()) { - helper.addTranslations(semantics.translate(ruleContext, javaConfig, - attributes.getMessages())); + helper.setTranslations( + semantics.translate(ruleContext, javaConfig, attributes.getMessages())); } ruleContext.checkSrcsSamePackage(true); diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java index 827e7026d8..96cff5445d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java @@ -327,7 +327,7 @@ public interface JavaSemantics { /** * Translates XMB messages to translations artifact suitable for Java targets. */ - Collection<Artifact> translate(RuleContext ruleContext, JavaConfiguration javaConfig, + ImmutableList<Artifact> translate(RuleContext ruleContext, JavaConfiguration javaConfig, List<Artifact> messages); /** |