From 9f9adc39dd6204eedbeef25a4d381ff5acb104d4 Mon Sep 17 00:00:00 2001 From: carm Date: Sat, 25 Jun 2022 05:05:26 +0800 Subject: [PATCH] =?UTF-8?q?chore(code):=20=E7=AE=80=E5=8C=96=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cc/carm/lib/easylistener/EasyListener.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/cc/carm/lib/easylistener/EasyListener.java b/src/main/java/cc/carm/lib/easylistener/EasyListener.java index 45a971d..2ff9b79 100644 --- a/src/main/java/cc/carm/lib/easylistener/EasyListener.java +++ b/src/main/java/cc/carm/lib/easylistener/EasyListener.java @@ -136,7 +136,9 @@ public class EasyListener implements Listener { @Nullable EventPriority priority, @Nullable Predicate eventPredicate, @Nullable Consumer afterCancelled) { - requireType(Cancellable.class, eventClass, "Event class " + eventClass.getName() + " is not cancellable"); + if (!Cancellable.class.isAssignableFrom(eventClass)) { + throw new IllegalArgumentException("Event class " + eventClass.getName() + " is not cancellable"); + } final Predicate predicate = Optional.ofNullable(eventPredicate).orElse(t -> true); return handle(eventClass, priority, true, (event) -> { @@ -274,13 +276,6 @@ public class EasyListener implements Listener { }; } - protected void requireType(@NotNull Class target, @NotNull Class value, - @Nullable String message) throws IllegalArgumentException { - if (target.isAssignableFrom(value)) return; - if (message == null) throw new IllegalArgumentException(); - else throw new IllegalArgumentException(message); - } - protected void register(@NotNull Class eventClass, @NotNull RegisteredListener listener) { getEventListeners(eventClass).register(listener); }