Skip to content

Commit c5b101b

Browse files
Use new thread builders
1 parent 8c07590 commit c5b101b

File tree

3 files changed

+15
-19
lines changed

3 files changed

+15
-19
lines changed

src/main/java/net/pistonmaster/soulfire/client/gui/libs/MessageLogPanel.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
import javax.swing.text.AttributeSet;
4242
import javax.swing.text.BadLocationException;
4343
import javax.swing.text.DefaultCaret;
44+
import javax.swing.text.Document;
4445
import javax.swing.text.DocumentFilter;
4546
import javax.swing.text.SimpleAttributeSet;
4647
import javax.swing.text.StyleConstants;
47-
import javax.swing.text.StyledDocument;
4848
import lombok.Setter;
4949
import lombok.extern.slf4j.Slf4j;
5050
import net.pistonmaster.soulfire.server.util.XtermPalette256;
@@ -76,7 +76,7 @@ public class MessageLogPanel extends JPanel {
7676
private final NoopDocumentFilter noopDocumentFilter = new NoopDocumentFilter();
7777
private final List<String> toInsert = Collections.synchronizedList(new ArrayList<>());
7878
private final JTextPane textComponent;
79-
private final StyledDocument document;
79+
private final Document document;
8080
private final ParserFactory factory =
8181
new DefaultParserFactory.Builder()
8282
.environment(Environment._7_BIT)
@@ -103,7 +103,7 @@ public MessageLogPanel(int numLines) {
103103

104104
var caret = (DefaultCaret) textComponent.getCaret();
105105
caret.setUpdatePolicy(DefaultCaret.NEVER_UPDATE);
106-
document = textComponent.getStyledDocument();
106+
document = textComponent.getDocument();
107107
document.addDocumentListener(new LimitLinesDocumentListener(numLines, true));
108108
((AbstractDocument) document).setDocumentFilter(noopDocumentFilter);
109109

@@ -122,12 +122,7 @@ public MessageLogPanel(int numLines) {
122122

123123
var executorService =
124124
Executors.newSingleThreadScheduledExecutor(
125-
(r) -> {
126-
var thread = new Thread(r);
127-
thread.setName("MessageLogPanel");
128-
thread.setDaemon(true);
129-
return thread;
130-
});
125+
r -> Thread.ofPlatform().name("MessageLogPanel").daemon().unstarted(r));
131126
executorService.scheduleWithFixedDelay(
132127
this::updateTextComponent, 100, 100, TimeUnit.MILLISECONDS);
133128
}

src/main/java/net/pistonmaster/soulfire/server/protocol/ExecutorManager.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,20 @@ public ExecutorService newCachedExecutorService(BotConnection botConnection, Str
7575

7676
private ThreadFactory getThreadFactory(BotConnection botConnection, String threadName) {
7777
return runnable -> {
78-
var thread =
79-
new Thread(
80-
() -> {
81-
BOT_CONNECTION_THREAD_LOCAL.set(botConnection);
82-
runnable.run();
83-
BOT_CONNECTION_THREAD_LOCAL.remove();
84-
});
8578
var usedThreadName = threadName;
8679
if (runnable instanceof NamedRunnable named) {
8780
usedThreadName = named.name();
8881
}
89-
thread.setName(threadPrefix + "-" + usedThreadName);
9082

91-
return thread;
83+
return Thread.ofPlatform()
84+
.name(threadPrefix + "-" + usedThreadName)
85+
.daemon()
86+
.unstarted(
87+
() -> {
88+
BOT_CONNECTION_THREAD_LOCAL.set(botConnection);
89+
runnable.run();
90+
BOT_CONNECTION_THREAD_LOCAL.remove();
91+
});
9292
};
9393
}
9494

src/main/java/net/pistonmaster/soulfire/server/protocol/netty/SFNettyHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ public class SFNettyHelper {
7373
private SFNettyHelper() {}
7474

7575
public static EventLoopGroup createEventLoopGroup(int threads, String name) {
76-
ThreadFactory threadFactory = r -> new Thread(r, "SoulFire-" + name);
76+
ThreadFactory threadFactory =
77+
r -> Thread.ofPlatform().name(name).daemon().priority(Thread.MAX_PRIORITY).unstarted(r);
7778
EventLoopGroup group =
7879
switch (TransportHelper.determineTransportMethod()) {
7980
case IO_URING -> new IOUringEventLoopGroup(threads, threadFactory);

0 commit comments

Comments
 (0)