reformatted event classes, added nullability annotations, made classes final.

This commit is contained in:
Sxtanna 2020-07-21 11:56:57 -04:00
parent ee78fc1775
commit bdf8a1bcc1
3 changed files with 120 additions and 62 deletions

View File

@ -24,38 +24,57 @@ import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
public class ExpansionRegisterEvent extends Event implements Cancellable { public final class ExpansionRegisterEvent extends Event implements Cancellable
{
private static final HandlerList HANDLERS = new HandlerList(); @NotNull
private final PlaceholderExpansion expansion; private static final HandlerList HANDLERS = new HandlerList();
private boolean isCancelled;
public ExpansionRegisterEvent(PlaceholderExpansion expansion) { private boolean cancelled;
this.expansion = expansion; @NotNull
} private final PlaceholderExpansion expansion;
public static HandlerList getHandlerList() { public ExpansionRegisterEvent(@NotNull final PlaceholderExpansion expansion)
return HANDLERS; {
} this.expansion = expansion;
}
@Override
public HandlerList getHandlers() {
return HANDLERS;
}
public PlaceholderExpansion getExpansion() { @NotNull
return expansion; public PlaceholderExpansion getExpansion()
} {
return expansion;
}
@Override
public boolean isCancelled() {
return isCancelled;
}
@Override @Override
public void setCancelled(boolean b) { public boolean isCancelled()
this.isCancelled = b; {
} return cancelled;
}
@Override
public void setCancelled(boolean cancelled)
{
this.cancelled = cancelled;
}
@NotNull
@Override
public HandlerList getHandlers()
{
return HANDLERS;
}
@NotNull
public static HandlerList getHandlerList()
{
return HANDLERS;
}
} }

View File

@ -23,26 +23,43 @@ package me.clip.placeholderapi.events;
import me.clip.placeholderapi.expansion.PlaceholderExpansion; import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
public class ExpansionUnregisterEvent extends Event { public final class ExpansionUnregisterEvent extends Event
{
private static final HandlerList HANDLERS = new HandlerList(); @NotNull
private final PlaceholderExpansion expansion; private static final HandlerList HANDLERS = new HandlerList();
public ExpansionUnregisterEvent(PlaceholderExpansion expansion) {
this.expansion = expansion;
}
public static HandlerList getHandlerList() { @NotNull
return HANDLERS; private final PlaceholderExpansion expansion;
}
@Override public ExpansionUnregisterEvent(@NotNull final PlaceholderExpansion expansion)
public HandlerList getHandlers() { {
return HANDLERS; this.expansion = expansion;
} }
@NotNull
public PlaceholderExpansion getExpansion()
{
return expansion;
}
@NotNull
@Override
public HandlerList getHandlers()
{
return HANDLERS;
}
@NotNull
public static HandlerList getHandlerList()
{
return HANDLERS;
}
public PlaceholderExpansion getExpansion() {
return expansion;
}
} }

View File

@ -23,33 +23,55 @@ package me.clip.placeholderapi.events;
import me.clip.placeholderapi.PlaceholderHook; import me.clip.placeholderapi.PlaceholderHook;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
/**
* @deprecated This event is no longer used.
*/
@Deprecated @Deprecated
public class PlaceholderHookUnloadEvent extends Event { public final class PlaceholderHookUnloadEvent extends Event
{
private static final HandlerList HANDLERS = new HandlerList(); @NotNull
private final String plugin; private static final HandlerList HANDLERS = new HandlerList();
private final PlaceholderHook hook;
public PlaceholderHookUnloadEvent(String plugin, PlaceholderHook placeholderHook) {
this.plugin = plugin;
this.hook = placeholderHook;
}
public static HandlerList getHandlerList() { @NotNull
return HANDLERS; private final String plugin;
} @NotNull
private final PlaceholderHook placeholderHook;
@Override public PlaceholderHookUnloadEvent(@NotNull final String plugin, @NotNull final PlaceholderHook placeholderHook)
public HandlerList getHandlers() { {
return HANDLERS; this.plugin = plugin;
} this.placeholderHook = placeholderHook;
}
public String getHookName() { @NotNull
return plugin; public String getHookName()
} {
return plugin;
}
@NotNull
public PlaceholderHook getHook()
{
return placeholderHook;
}
@NotNull
@Override
public HandlerList getHandlers()
{
return HANDLERS;
}
@NotNull
public static HandlerList getHandlerList()
{
return HANDLERS;
}
public PlaceholderHook getHook() {
return hook;
}
} }