ExperimentalEventHandler: remove unnecessary inheritance

The ExperimentalEventHandler uses no functionality of BlazeCommandEventHandler,
hence there really is no need whatsoever for ExperimentalEventHandler to be
a subclass of BlazeCommandEventHandler. So, remove this inheritance to clean
up our class hierarchy; instead let the ExperimentalEventHandler just implement
the EventHandler interface.

--
Change-Id: I504f727190a12882dd8b7c37811a821e3ba50400
Reviewed-on: https://bazel-review.googlesource.com/#/c/3926
MOS_MIGRATED_REVID=126282974

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java
index 7b3db13967..15923f427e 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java
@@ -26,6 +26,7 @@ import com.google.devtools.build.lib.buildtool.buildevent.BuildStartingEvent;
 import com.google.devtools.build.lib.buildtool.buildevent.ExecutionProgressReceiverAvailableEvent;
 import com.google.devtools.build.lib.buildtool.buildevent.TestFilteringCompleteEvent;
 import com.google.devtools.build.lib.events.Event;
+import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.events.EventKind;
 import com.google.devtools.build.lib.pkgcache.LoadingPhaseCompleteEvent;
 import com.google.devtools.build.lib.skyframe.LoadingPhaseStartedEvent;
@@ -48,10 +49,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.logging.Logger;
 
-/**
- * An experimental new output stream.
- */
-public class ExperimentalEventHandler extends BlazeCommandEventHandler {
+/** An experimental new output stream. */
+public class ExperimentalEventHandler implements EventHandler {
   private static Logger LOG = Logger.getLogger(ExperimentalEventHandler.class.getName());
   /** Latest refresh of the progress bar, if contents other than time changed */
   static final long MAXIMAL_UPDATE_DELAY_MILLIS = 200L;
@@ -73,6 +72,7 @@ public class ExperimentalEventHandler extends BlazeCommandEventHandler {
   private final boolean showProgress;
   private final boolean progressInTermTitle;
   private final boolean showTimestamp;
+  private final OutErr outErr;
   private long lastRefreshMillis;
   private long mustRefreshAfterMillis;
   private int numLinesProgressBar;
@@ -86,7 +86,7 @@ public class ExperimentalEventHandler extends BlazeCommandEventHandler {
 
   public ExperimentalEventHandler(
       OutErr outErr, BlazeCommandEventHandler.Options options, Clock clock) {
-    super(outErr, options);
+    this.outErr = outErr;
     this.cursorControl = options.useCursorControl();
     this.terminal = new AnsiTerminal(outErr.getErrorStream());
     this.terminalWidth = (options.terminalColumns > 0 ? options.terminalColumns : 80);