From 95a87d0d8b26d9ca7d8d957dc23373b6a89e3d68 Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <aehlig@google.com>
Date: Fri, 30 Sep 2016 10:49:02 +0000
Subject: Add type annotation for the benefit of java 7

Fixes #1863

--
MOS_MIGRATED_REVID=134767527
---
 .../java/com/google/devtools/build/lib/analysis/ActionsProvider.java    | 2 +-
 .../com/google/devtools/build/lib/buildeventstream/AbortedEvent.java    | 2 +-
 .../com/google/devtools/build/lib/buildeventstream/ProgressEvent.java   | 2 +-
 .../com/google/devtools/build/lib/query2/output/OutputFormatter.java    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com/google/devtools/build')

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ActionsProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/ActionsProvider.java
index ea3e5d33f6..c0c6adb98a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ActionsProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ActionsProvider.java
@@ -41,7 +41,7 @@ public final class ActionsProvider{
         }
       }
     }
-    ImmutableMap<String, Object> fields = ImmutableMap.of("by_file", map);
+    ImmutableMap<String, Object> fields = ImmutableMap.<String, Object>of("by_file", map);
     return new SkylarkClassObject(ACTIONS_PROVIDER, fields);
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/AbortedEvent.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/AbortedEvent.java
index cee0b41b4a..3421b974ae 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventstream/AbortedEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/AbortedEvent.java
@@ -23,7 +23,7 @@ public class AbortedEvent extends GenericBuildEvent {
 
   public AbortedEvent(
       BuildEventId id, BuildEventStreamProtos.Aborted.AbortReason reason, String description) {
-    super(id, ImmutableList.of());
+    super(id, ImmutableList.<BuildEventId>of());
     this.reason = reason;
     this.description = description;
   }
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/ProgressEvent.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/ProgressEvent.java
index 97622614e9..c6792334f5 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventstream/ProgressEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/ProgressEvent.java
@@ -60,6 +60,6 @@ public final class ProgressEvent extends GenericBuildEvent {
    */
   public static BuildEvent finalProgressUpdate(int number) {
     BuildEventId id = BuildEventId.progressId(number);
-    return new ProgressEvent(id, ImmutableList.of());
+    return new ProgressEvent(id, ImmutableList.<BuildEventId>of());
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java
index 38ae978894..d7c6eb3bb5 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java
@@ -531,7 +531,7 @@ public abstract class OutputFormatter implements Serializable {
       // Graphs may contain cycles because there are errors in BUILD files.
 
       List<RankAndLabel> outputToOrder =
-          options.orderOutput == OrderOutput.FULL ? new ArrayList<>() : null;
+          options.orderOutput == OrderOutput.FULL ? new ArrayList<RankAndLabel>() : null;
       Digraph<Set<Node<Target>>> scGraph = result.getStrongComponentGraph();
       Set<Node<Set<Node<Target>>>> rankNodes = scGraph.getRoots();
       Set<Node<Set<Node<Target>>>> seen = new HashSet<>();
-- 
cgit v1.2.3