Skip to content

Commit df956a6

Browse files
committed
Use Map.Entry for captured log messages
1 parent db3f8ed commit df956a6

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

log-utils/src/main/java/net/minecraftforge/util/logging/AbstractLogger.java

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
import org.jetbrains.annotations.Nullable;
55

66
import java.io.PrintStream;
7+
import java.util.AbstractMap;
78
import java.util.ArrayList;
89
import java.util.Iterator;
910
import java.util.List;
11+
import java.util.Map;
1012
import java.util.function.BiConsumer;
1113
import java.util.function.Consumer;
1214

@@ -92,17 +94,7 @@ private static String getIndentation(byte indent) {
9294

9395
/* CAPTURING */
9496

95-
private @Nullable List<CapturedMessage> captured;
96-
97-
private static final class CapturedMessage {
98-
private final Level level;
99-
private final String message;
100-
101-
private CapturedMessage(Level level, String message) {
102-
this.level = level;
103-
this.message = message;
104-
}
105-
}
97+
private @Nullable List<Map.Entry<Level, String>> captured;
10698

10799
@Override
108100
public final boolean isCapturing() {
@@ -117,7 +109,7 @@ public final void capture() {
117109

118110
final void tryCapture(Consumer<? super String> logger, Level level, String message) {
119111
if (captured != null)
120-
captured.add(new CapturedMessage(level, message));
112+
captured.add(new AbstractMap.SimpleImmutableEntry<>(level, message));
121113
else
122114
logger.accept(message);
123115
}
@@ -136,11 +128,11 @@ public final void release() {
136128
public final void release(BiConsumer<Level, String> consumer) {
137129
if (captured == null) return;
138130

139-
Iterator<CapturedMessage> itor = captured.iterator();
131+
Iterator<Map.Entry<Level, String>> itor = captured.iterator();
140132
captured = null;
141133
while (itor.hasNext()) {
142-
CapturedMessage capture = itor.next();
143-
consumer.accept(capture.level, capture.message);
134+
Map.Entry<Level, String> capture = itor.next();
135+
consumer.accept(capture.getKey(), capture.getValue());
144136
}
145137
}
146138

0 commit comments

Comments
 (0)