diff --git a/mirai-core/src/main/java/net/mamoe/mirai/task/MiralTaskExceptionHandler.java b/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskExceptionHandler.java similarity index 58% rename from mirai-core/src/main/java/net/mamoe/mirai/task/MiralTaskExceptionHandler.java rename to mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskExceptionHandler.java index e54679d76..d9f513010 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/task/MiralTaskExceptionHandler.java +++ b/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskExceptionHandler.java @@ -1,10 +1,10 @@ package net.mamoe.mirai.task; @FunctionalInterface -public interface MiralTaskExceptionHandler { +public interface MiraiTaskExceptionHandler { void onHandle(Throwable e); - static MiralTaskExceptionHandler byDefault(){ + static MiraiTaskExceptionHandler byDefault(){ return Throwable::printStackTrace; } } diff --git a/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskManager.java b/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskManager.java index d5539417c..39d59663f 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskManager.java +++ b/mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskManager.java @@ -1,7 +1,6 @@ package net.mamoe.mirai.task; -import lombok.Getter; import net.mamoe.mirai.MiraiServer; import net.mamoe.mirai.event.events.server.ServerDisableEvent; @@ -36,10 +35,10 @@ public class MiraiTaskManager { */ public void execute(Runnable runnable){ - this.execute(runnable,MiralTaskExceptionHandler.byDefault()); + this.execute(runnable, MiraiTaskExceptionHandler.byDefault()); } - public void execute(Runnable runnable, MiralTaskExceptionHandler handler){ + public void execute(Runnable runnable, MiraiTaskExceptionHandler handler){ this.pool.execute(() -> { try{ @@ -52,10 +51,10 @@ public class MiraiTaskManager { public Future submit(Callable callable) { - return this.submit(callable, MiralTaskExceptionHandler.byDefault()); + return this.submit(callable, MiraiTaskExceptionHandler.byDefault()); } - public Future submit(Callable callable, MiralTaskExceptionHandler handler) { + public Future submit(Callable callable, MiraiTaskExceptionHandler handler) { return this.pool.submit(() -> { try { return callable.call(); @@ -70,10 +69,10 @@ public class MiraiTaskManager { 异步任务 */ public void ansycTask(Callable callable, Consumer callback){ - this.ansycTask(callable,callback,MiralTaskExceptionHandler.byDefault()); + this.ansycTask(callable,callback, MiraiTaskExceptionHandler.byDefault()); } - public void ansycTask(Callable callable, Consumer callback, MiralTaskExceptionHandler handler){ + public void ansycTask(Callable callable, Consumer callback, MiraiTaskExceptionHandler handler){ this.pool.execute(() -> { try { callback.accept(callable.call()); @@ -88,25 +87,25 @@ public class MiraiTaskManager { */ public void repeatingTask(Runnable runnable, long interval){ - this.repeatingTask(runnable,interval, MiralTaskExceptionHandler.byDefault()); + this.repeatingTask(runnable,interval, MiraiTaskExceptionHandler.byDefault()); } - public void repeatingTask(Runnable runnable, long interval, MiralTaskExceptionHandler handler){ + public void repeatingTask(Runnable runnable, long interval, MiraiTaskExceptionHandler handler){ this.repeatingTask(runnable,interval,a -> true,handler); } public void repeatingTask(Runnable runnable, long interval, int times){ - this.repeatingTask(runnable,interval,times,MiralTaskExceptionHandler.byDefault()); + this.repeatingTask(runnable,interval,times, MiraiTaskExceptionHandler.byDefault()); } - public void repeatingTask(Runnable runnable, long interval, int times, MiralTaskExceptionHandler handler){ + public void repeatingTask(Runnable runnable, long interval, int times, MiraiTaskExceptionHandler handler){ AtomicInteger integer = new AtomicInteger(times); this.repeatingTask( runnable,interval, a -> integer.getAndDecrement() > 0, handler ); } - public void repeatingTask(D runnable, long interval, Predicate shouldContinue, MiralTaskExceptionHandler handler){ + public void repeatingTask(D runnable, long interval, Predicate shouldContinue, MiraiTaskExceptionHandler handler){ new Thread(() -> { do { this.pool.execute(() -> {