aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/runtime/FancyTerminalEventHandler.java
diff options
context:
space:
mode:
authorGravatar Philipp Wollermann <philwo@google.com>2017-09-04 22:23:30 +0200
committerGravatar Yun Peng <pcloudy@google.com>2017-09-05 09:54:51 +0200
commitfd4f5ac67942c0a29e75903d04c403edb6ce4d7d (patch)
tree2bd3836daf989d70927e59c08c91c983e6ea828f /src/main/java/com/google/devtools/build/lib/runtime/FancyTerminalEventHandler.java
parent97abb524bacc6d8527744657642f79c25c843c59 (diff)
Rewrite all code to use the new Java 8 java.time classes.
This removes our dependency on third_party/joda_time, which can be removed in the next commit. Change-Id: Ibda131d34d0abdc2d675db4bfbd2e99480c055ee PiperOrigin-RevId: 167515260
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/runtime/FancyTerminalEventHandler.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/runtime/FancyTerminalEventHandler.java16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/FancyTerminalEventHandler.java b/src/main/java/com/google/devtools/build/lib/runtime/FancyTerminalEventHandler.java
index fa74355b31..5996d3c6d0 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/FancyTerminalEventHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/FancyTerminalEventHandler.java
@@ -26,14 +26,14 @@ import com.google.devtools.build.lib.util.io.LineCountingAnsiTerminalWriter;
import com.google.devtools.build.lib.util.io.LineWrappingAnsiTerminalWriter;
import com.google.devtools.build.lib.util.io.OutErr;
import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
import java.util.Calendar;
import java.util.Iterator;
import java.util.concurrent.ThreadLocalRandom;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.joda.time.Duration;
-import org.joda.time.Instant;
/**
* An event handler for ANSI terminals which uses control characters to
@@ -135,8 +135,9 @@ public class FancyTerminalEventHandler extends BlazeCommandEventHandler {
if (!eventMask.contains(event.getKind())) {
return;
}
- if (trySpecial && !EventKind.ERRORS_AND_WARNINGS_AND_OUTPUT.contains(event.getKind())
- && skipUntil.isAfterNow()) {
+ if (trySpecial
+ && !EventKind.ERRORS_AND_WARNINGS_AND_OUTPUT.contains(event.getKind())
+ && skipUntil.isAfter(Instant.now())) {
// Short-circuit here to avoid wiping out previous terminal contents.
return;
}
@@ -151,7 +152,7 @@ public class FancyTerminalEventHandler extends BlazeCommandEventHandler {
case START:
{
String message = event.getMessage();
- Pair<String,String> progressPair = matchProgress(message);
+ Pair<String, String> progressPair = matchProgress(message);
if (progressPair != null) {
progress(progressPair.getFirst(), progressPair.getSecond());
if (trySpecial && ThreadLocalRandom.current().nextInt(0, 20) == 0) {
@@ -161,8 +162,9 @@ public class FancyTerminalEventHandler extends BlazeCommandEventHandler {
previousLineErased = maybeOverwritePreviousMessage();
progress(progressPair.getFirst(), message);
// Skip unimportant messages for a bit so that this message gets some exposure.
- skipUntil = Instant.now().plus(
- Duration.millis(ThreadLocalRandom.current().nextInt(3000, 8000)));
+ skipUntil =
+ Instant.now()
+ .plus(Duration.ofMillis(ThreadLocalRandom.current().nextInt(3000, 8000)));
}
}
} else {