Skip to content

Commit 0cb082f

Browse files
committed
Address comments
1 parent 77471e8 commit 0cb082f

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

worldedit-core/src/main/java/com/fastasyncworldedit/core/FaweCache.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.google.common.cache.CacheBuilder;
2020
import com.google.common.cache.CacheLoader;
2121
import com.google.common.cache.LoadingCache;
22-
import com.google.common.util.concurrent.ThreadFactoryBuilder;
2322
import com.sk89q.jnbt.ByteArrayTag;
2423
import com.sk89q.jnbt.ByteTag;
2524
import com.sk89q.jnbt.CompoundTag;
@@ -47,7 +46,6 @@
4746
import java.util.List;
4847
import java.util.Map;
4948
import java.util.Map.Entry;
50-
import java.util.concurrent.ArrayBlockingQueue;
5149
import java.util.concurrent.CancellationException;
5250
import java.util.concurrent.ExecutionException;
5351
import java.util.concurrent.Future;

worldedit-core/src/main/java/com/fastasyncworldedit/core/util/task/FaweBasicThread.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
import org.jetbrains.annotations.ApiStatus;
55

66
@ApiStatus.Internal
7-
public class FaweBasicThread extends Thread implements FaweThread {
7+
public final class FaweBasicThread extends Thread implements FaweThread {
88

99
private Extent currentExtent;
1010

11-
protected FaweBasicThread() {
12-
super();
11+
FaweBasicThread(Runnable runnable) {
12+
super(runnable);
1313
}
1414

15-
1615
@Override
1716
public void clearCurrentExtent() {
1817
this.currentExtent = null;

worldedit-core/src/main/java/com/fastasyncworldedit/core/util/task/FaweBasicThreadFactory.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
@ApiStatus.Internal
1414
public class FaweBasicThreadFactory implements ThreadFactory {
1515

16-
private final ThreadFactory parent = Executors.defaultThreadFactory();
1716
private final String nameFormat;
1817
private final AtomicLong count;
1918

@@ -24,11 +23,15 @@ public FaweBasicThreadFactory(@Nullable String nameFormat) {
2423

2524
@Override
2625
public Thread newThread(@Nonnull final Runnable runnable) {
27-
Thread thread = parent.newThread(runnable);
26+
Thread thread = new FaweBasicThread(runnable);
2827
if (nameFormat != null) {
2928
// requireNonNull is safe because we create `count` if (and only if) we have a nameFormat.
3029
thread.setName(String.format(Locale.ROOT, nameFormat, count.getAndIncrement()));
3130
}
31+
if (thread.isDaemon())
32+
thread.setDaemon(false);
33+
if (thread.getPriority() != Thread.NORM_PRIORITY)
34+
thread.setPriority(Thread.NORM_PRIORITY);
3235
return thread;
3336
}
3437

worldedit-core/src/main/java/com/fastasyncworldedit/core/util/task/FaweForkJoinThread.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import java.util.concurrent.ForkJoinWorkerThread;
88

99
@ApiStatus.Internal
10-
public class FaweForkJoinThread extends ForkJoinWorkerThread implements FaweThread {
10+
public final class FaweForkJoinThread extends ForkJoinWorkerThread implements FaweThread {
1111

1212
private Extent currentExtent;
1313

14-
protected FaweForkJoinThread(final ForkJoinPool pool) {
14+
FaweForkJoinThread(final ForkJoinPool pool) {
1515
super(null, pool, true);
1616
}
1717

worldedit-core/src/main/java/com/fastasyncworldedit/core/util/task/FaweThread.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.jetbrains.annotations.ApiStatus;
55

66
@ApiStatus.Internal
7-
public interface FaweThread {
7+
public sealed interface FaweThread permits FaweBasicThread, FaweForkJoinThread {
88

99
/**
1010
* Removes the extent currently associated with the calling thread.

0 commit comments

Comments
 (0)