Rename method on SettingsDependent

- Rename loadSettings to reload
- Make ProtocolLibService only implement SettingsDependent, not Relaodable alongside
This commit is contained in:
ljacqu
2016-07-09 09:24:25 +02:00
parent dff09935e6
commit aa6fe3e874
14 changed files with 24 additions and 28 deletions
@@ -137,7 +137,7 @@ public class CaptchaManagerTest {
assertThat(manager.isCaptchaRequired(player), equalTo(true));
assertHasCount(manager, player, 1);
// end assumptions
manager.loadSettings(settings);
manager.reload(settings);
boolean result = manager.isCaptchaRequired(player);
// then
@@ -114,7 +114,7 @@ public class TempbanManagerTest {
assertThat(manager.shouldTempban(address), equalTo(true));
assertHasCount(manager, address, 1);
// end assumptions
manager.loadSettings(settings);
manager.reload(settings);
boolean result = manager.shouldTempban(address);
// then
@@ -33,7 +33,7 @@ public class PostConstructTestClass implements SettingsDependent {
}
@Override
public void loadSettings(NewSetting settings) {
public void reload(NewSetting settings) {
if (settings != null) {
wasReloaded = true;
}
@@ -127,7 +127,7 @@ public class ListenerServiceTest {
given(settings.getProperty(RegistrationSettings.FORCE)).willReturn(false);
EntityEvent event = mock(EntityEvent.class);
given(event.getEntity()).willReturn(player);
listenerService.loadSettings(settings);
listenerService.reload(settings);
// when
boolean result = listenerService.shouldCancelEvent(event);
@@ -259,7 +259,7 @@ public class MessagesIntegrationTest {
TestHelper.PROJECT_ROOT + "output/messages_test2.yml"));
// when
messages.loadSettings(settings);
messages.reload(settings);
// then
assertThat(messages.retrieveSingle(key), equalTo("test2 - wrong password"));