From 57d70c3d24bfefb81c673593b9990475a949368f Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 2 Feb 2019 10:51:59 +0100 Subject: [PATCH] Removed deprecated methods in AddonDescription and FlagListener --- .../bentobox/api/addons/AddonDescription.java | 23 +------------------ .../bentobox/api/flags/FlagListener.java | 12 ---------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/api/addons/AddonDescription.java b/src/main/java/world/bentobox/bentobox/api/addons/AddonDescription.java index f84b8da6d..79600b499 100644 --- a/src/main/java/world/bentobox/bentobox/api/addons/AddonDescription.java +++ b/src/main/java/world/bentobox/bentobox/api/addons/AddonDescription.java @@ -24,7 +24,7 @@ public final class AddonDescription { */ private final boolean metrics; - private AddonDescription(Builder builder) { + private AddonDescription(@NonNull Builder builder) { this.main = builder.main; this.name = builder.name; this.version = builder.version; @@ -94,17 +94,6 @@ public final class AddonDescription { private @NonNull List dependencies = new ArrayList<>(); private @NonNull List softDependencies = new ArrayList<>(); private boolean metrics = false; - - /** - * @deprecated As of 1.1, use {@link Builder#Builder(String, String, String)} instead. - */ - @Deprecated - public Builder(@NonNull String main, @NonNull String name) { - this.main = main; - this.name = name; - this.version = ""; - } - /** * @since 1.1 */ @@ -114,16 +103,6 @@ public final class AddonDescription { this.version = version; } - /** - * @deprecated As of 1.1, for removal. - */ - @Deprecated - @NonNull - public Builder version(@NonNull String version) { - this.version = version; - return this; - } - @NonNull public Builder description(@NonNull String description) { this.description = description; diff --git a/src/main/java/world/bentobox/bentobox/api/flags/FlagListener.java b/src/main/java/world/bentobox/bentobox/api/flags/FlagListener.java index bf6a1488e..c5dbaf41a 100644 --- a/src/main/java/world/bentobox/bentobox/api/flags/FlagListener.java +++ b/src/main/java/world/bentobox/bentobox/api/flags/FlagListener.java @@ -235,18 +235,6 @@ public abstract class FlagListener implements Listener { } - /** - * Get the flag for this ID - * @param id - the flag ID - * @return Flag denoted by the id - * @deprecated As of 1.1, replaced with {@link #getFlag(String)}. - */ - @Deprecated - @Nullable - protected Flag id(@NonNull String id) { - return getFlag(id).orElse(null); - } - /** * Get the flag for this ID * @param id the flag ID