From de69c9c5712a5f138ef5079cd850265d2f0d5ef6 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 2 Feb 2019 11:06:59 +0100 Subject: [PATCH] Removed deprecated FlagsManager#getFlagByID(String) This method was actually still used in some classes, so I had to fix them as well. --- .../bentobox/bentobox/managers/FlagsManager.java | 12 ------------ .../bentobox/bentobox/panels/SettingsPanel.java | 6 +----- .../flags/InvincibleVisitorsListenerTest.java | 2 +- .../bentobox/listeners/flags/PVPListenerTest.java | 2 +- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/managers/FlagsManager.java b/src/main/java/world/bentobox/bentobox/managers/FlagsManager.java index 906364360..896e354af 100644 --- a/src/main/java/world/bentobox/bentobox/managers/FlagsManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/FlagsManager.java @@ -83,18 +83,6 @@ public class FlagsManager { return flags; } - /** - * Get flag by ID - * @param id unique id for this flag - * @return Flag or null if not known - * @deprecated As of 1.1, use {@link #getFlag(String)} instead. - */ - @Deprecated - @Nullable - public Flag getFlagByID(@NonNull String id) { - return getFlag(id).orElse(null); - } - /** * Gets a Flag by providing an ID. * @param id Unique ID for this Flag. diff --git a/src/main/java/world/bentobox/bentobox/panels/SettingsPanel.java b/src/main/java/world/bentobox/bentobox/panels/SettingsPanel.java index 572ab255b..504cc7d37 100644 --- a/src/main/java/world/bentobox/bentobox/panels/SettingsPanel.java +++ b/src/main/java/world/bentobox/bentobox/panels/SettingsPanel.java @@ -42,11 +42,7 @@ public class SettingsPanel { // Get a list of flags of the correct type and sort by the translated names List flags = plugin.getFlagsManager().getFlags().stream().filter(f -> f.getType().equals(flagType)) - .sorted(Comparator.comparing(Flag::getID, (s1, s2) -> { - String s1Translation = user.getTranslation(plugin.getFlagsManager().getFlagByID(s1).getNameReference()); - String s2Translation = user.getTranslation(plugin.getFlagsManager().getFlagByID(s2).getNameReference()); - return s1Translation.compareTo(s2Translation); - })) + .sorted(Comparator.comparing(flag -> user.getTranslation(flag.getNameReference()))) .collect(Collectors.toList()); // Use paging diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/InvincibleVisitorsListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/InvincibleVisitorsListenerTest.java index b39fee39e..c7da2e8d9 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/InvincibleVisitorsListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/InvincibleVisitorsListenerTest.java @@ -101,7 +101,7 @@ public class InvincibleVisitorsListenerTest { PanelItem item = mock(PanelItem.class); when(item.getItem()).thenReturn(mock(ItemStack.class)); when(flag.toPanelItem(Mockito.any(), Mockito.eq(user))).thenReturn(item); - when(fm.getFlagByID(Mockito.anyString())).thenReturn(flag); + when(fm.getFlag(Mockito.anyString())).thenReturn(Optional.of(flag)); when(plugin.getFlagsManager()).thenReturn(fm); // Island Manager diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/PVPListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/PVPListenerTest.java index 4ca2176fb..74368aa13 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/PVPListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/PVPListenerTest.java @@ -149,7 +149,7 @@ public class PVPListenerTest { PanelItem item = mock(PanelItem.class); when(item.getItem()).thenReturn(mock(ItemStack.class)); when(flag.toPanelItem(Mockito.any(), Mockito.any())).thenReturn(item); - when(fm.getFlagByID(Mockito.anyString())).thenReturn(flag); + when(fm.getFlag(Mockito.anyString())).thenReturn(Optional.of(flag)); when(plugin.getFlagsManager()).thenReturn(fm); im = mock(IslandsManager.class);