Clean up event bus
...now that the ExtendedEventHandler can serve the same purpose.
--
PiperOrigin-RevId: 148640618
MOS_MIGRATED_REVID=148640618
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseCompleteEvent.java
index 4f42c0f..315d243 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseCompleteEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseCompleteEvent.java
@@ -18,12 +18,13 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.cmdline.Label;
+import com.google.devtools.build.lib.events.ExtendedEventHandler;
import com.google.devtools.build.lib.packages.Target;
/**
* This event is fired after the loading phase is complete.
*/
-public final class LoadingPhaseCompleteEvent {
+public final class LoadingPhaseCompleteEvent implements ExtendedEventHandler.Postable {
private final ImmutableSet<Target> targets;
private final ImmutableSet<Target> filteredTargets;
private final PackageManager.PackageManagerStatistics pkgManagerStats;
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java
index cb1936e..3939751 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunner.java
@@ -15,7 +15,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
-import com.google.common.eventbus.EventBus;
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.cmdline.TargetParsingException;
import com.google.devtools.build.lib.events.Event;
@@ -50,7 +49,6 @@
/** Performs target pattern evaluation and test suite expansion (if requested). */
public abstract LoadingResult execute(
ExtendedEventHandler eventHandler,
- EventBus eventBus,
List<String> targetPatterns,
PathFragment relativeWorkingDirectory,
LoadingOptions options,
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/ParsingFailedEvent.java b/src/main/java/com/google/devtools/build/lib/pkgcache/ParsingFailedEvent.java
index 72009fd..64e7e02 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/ParsingFailedEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/ParsingFailedEvent.java
@@ -14,13 +14,15 @@
package com.google.devtools.build.lib.pkgcache;
+import com.google.devtools.build.lib.events.ExtendedEventHandler;
+
/**
* This event is fired when a target or target pattern fails to parse.
* In some cases (not all) this happens before targets are created,
* and thus in these cases there are no status lines.
* Therefore, the parse failure is reported separately.
*/
-public class ParsingFailedEvent {
+public class ParsingFailedEvent implements ExtendedEventHandler.Postable {
private final String targetPattern;
private final String message;
