Automatic code cleanup.
PiperOrigin-RevId: 240112203
diff --git a/src/main/java/com/google/devtools/build/lib/events/Event.java b/src/main/java/com/google/devtools/build/lib/events/Event.java
index 8835d17..c4a80ce 100644
--- a/src/main/java/com/google/devtools/build/lib/events/Event.java
+++ b/src/main/java/com/google/devtools/build/lib/events/Event.java
@@ -205,20 +205,26 @@
return new Event(kind, location, messageBytes, null, null, null);
}
- /**
- * Reports an error.
- */
- public static Event error(@Nullable Location location, String message){
+ /** Reports an error. */
+ public static Event error(@Nullable Location location, String message) {
return new Event(EventKind.ERROR, location, message, null, null, null);
}
- /**
- * Reports a warning.
- */
+ /** Reports an error. */
+ public static Event error(String message) {
+ return error(null, message);
+ }
+
+ /** Reports a warning. */
public static Event warn(@Nullable Location location, String message) {
return new Event(EventKind.WARNING, location, message, null, null, null);
}
+ /** Reports a warning. */
+ public static Event warn(String message) {
+ return warn(null, message);
+ }
+
/**
* Reports atemporal statements about the build, i.e. they're true for the duration of execution.
*/
@@ -227,47 +233,27 @@
}
/**
- * Reports a temporal statement about the build.
- */
- public static Event progress(@Nullable Location location, String message) {
- return new Event(EventKind.PROGRESS, location, message, null, null, null);
- }
-
- /**
- * Reports a debug message.
- */
- public static Event debug(@Nullable Location location, String message) {
- return new Event(EventKind.DEBUG, location, message, null, null, null);
- }
-
- /**
- * Reports an error.
- */
- public static Event error(String message){
- return error(null, message);
- }
-
- /**
- * Reports a warning.
- */
- public static Event warn(String message) {
- return warn(null, message);
- }
-
- /**
* Reports atemporal statements about the build, i.e. they're true for the duration of execution.
*/
public static Event info(String message) {
return info(null, message);
}
- /**
- * Reports a temporal statement about the build.
- */
+ /** Reports a temporal statement about the build. */
+ public static Event progress(@Nullable Location location, String message) {
+ return new Event(EventKind.PROGRESS, location, message, null, null, null);
+ }
+
+ /** Reports a temporal statement about the build. */
public static Event progress(String message) {
return progress(null, message);
}
+ /** Reports a debug message. */
+ public static Event debug(@Nullable Location location, String message) {
+ return new Event(EventKind.DEBUG, location, message, null, null, null);
+ }
+
/**
* Reports a debug message.
*/
diff --git a/src/main/java/com/google/devtools/build/lib/events/Location.java b/src/main/java/com/google/devtools/build/lib/events/Location.java
index 552b0fb..30224dc 100644
--- a/src/main/java/com/google/devtools/build/lib/events/Location.java
+++ b/src/main/java/com/google/devtools/build/lib/events/Location.java
@@ -174,8 +174,9 @@
}
/**
- * A default implementation of toString() that formats the location in the
- * following ways based on the amount of information available:
+ * A default implementation of toString() that formats the location in the following ways based on
+ * the amount of information available:
+ *
* <pre>
* "foo.cc:23:2"
* "23:2"
@@ -187,25 +188,6 @@
return printWithPath(getPath());
}
- public String printWithPath(PathFragment path) {
- StringBuilder buf = new StringBuilder();
- if (path != null) {
- buf.append(path).append(':');
- }
- LineAndColumn start = getStartLineAndColumn();
- if (start == null) {
- if (getStartOffset() == 0 && getEndOffset() == 0) {
- buf.append("1"); // i.e. line 1 (special case: no information at all)
- } else {
- buf.append("char offsets ").
- append(getStartOffset()).append("--").append(getEndOffset());
- }
- } else {
- buf.append(start.getLine()).append(':').append(start.getColumn());
- }
- return buf.toString();
- }
-
/**
* A default implementation of toString() that formats the location in the following ways based on
* the amount of information available:
@@ -237,6 +219,24 @@
}
}
+ public String printWithPath(PathFragment path) {
+ StringBuilder buf = new StringBuilder();
+ if (path != null) {
+ buf.append(path).append(':');
+ }
+ LineAndColumn start = getStartLineAndColumn();
+ if (start == null) {
+ if (getStartOffset() == 0 && getEndOffset() == 0) {
+ buf.append("1"); // i.e. line 1 (special case: no information at all)
+ } else {
+ buf.append("char offsets ").append(getStartOffset()).append("--").append(getEndOffset());
+ }
+ } else {
+ buf.append(start.getLine()).append(':').append(start.getColumn());
+ }
+ return buf.toString();
+ }
+
/**
* Prints the object in a sort of reasonable way. This should never be used in user-visible
* places, only for debugging and testing.
diff --git a/src/main/java/com/google/devtools/build/lib/events/Reporter.java b/src/main/java/com/google/devtools/build/lib/events/Reporter.java
index f940016..376773f 100644
--- a/src/main/java/com/google/devtools/build/lib/events/Reporter.java
+++ b/src/main/java/com/google/devtools/build/lib/events/Reporter.java
@@ -61,17 +61,9 @@
this.eventBus = eventBus;
}
- public static OutErr outErrForReporter(EventHandler rep) {
- return OutErr.create(
- // We don't use BufferedOutputStream here, because in general the Blaze
- // code base assumes that the output streams are not buffered.
- new ReporterStream(rep, EventKind.STDOUT),
- new ReporterStream(rep, EventKind.STDERR));
- }
-
/**
- * A copy constructor, to make it convenient to replicate a reporter
- * config for temporary configuration changes.
+ * A copy constructor, to make it convenient to replicate a reporter config for temporary
+ * configuration changes.
*/
public Reporter(Reporter template) {
eventHandlers.addAll(template.eventHandlers);
@@ -86,9 +78,16 @@
}
}
+ public static OutErr outErrForReporter(EventHandler rep) {
+ return OutErr.create(
+ // We don't use BufferedOutputStream here, because in general the Blaze
+ // code base assumes that the output streams are not buffered.
+ new ReporterStream(rep, EventKind.STDOUT), new ReporterStream(rep, EventKind.STDERR));
+ }
+
/**
- * Returns an OutErr that sends all of its output to this Reporter.
- * Each write to the OutErr will cause an EventKind.STDOUT or EventKind.STDERR event.
+ * Returns an OutErr that sends all of its output to this Reporter. Each write to the OutErr will
+ * cause an EventKind.STDOUT or EventKind.STDERR event.
*/
public OutErr getOutErr() {
return outErrToReporter;
