From 0f61049502b40b74b6f009443ddecc4eea7b3609 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Wed, 18 Jul 2018 14:45:14 +0200 Subject: [PATCH] Moved commands/island/teams to commands/island/team --- .../bskyblock/commands/IslandCommand.java | 2 +- .../{teams => team}/IslandTeamCommand.java | 2 +- .../IslandTeamInviteAcceptCommand.java | 2 +- .../IslandTeamInviteCommand.java | 2 +- .../IslandTeamInviteRejectCommand.java | 2 +- .../IslandTeamKickCommand.java | 2 +- .../IslandTeamLeaveCommand.java | 2 +- .../IslandTeamPromoteCommand.java | 2 +- .../IslandTeamSetownerCommand.java | 2 +- .../IslandTeamInviteCommandTest.java | 16 +++++++-------- .../IslandTeamKickCommandTest.java | 20 +++++++++---------- .../IslandTeamLeaveCommandTest.java | 12 +++++------ 12 files changed, 33 insertions(+), 33 deletions(-) rename src/main/java/us/tastybento/bskyblock/commands/island/{teams => team}/IslandTeamCommand.java (98%) rename src/main/java/us/tastybento/bskyblock/commands/island/{teams => team}/IslandTeamInviteAcceptCommand.java (98%) rename src/main/java/us/tastybento/bskyblock/commands/island/{teams => team}/IslandTeamInviteCommand.java (99%) rename src/main/java/us/tastybento/bskyblock/commands/island/{teams => team}/IslandTeamInviteRejectCommand.java (97%) rename src/main/java/us/tastybento/bskyblock/commands/island/{teams => team}/IslandTeamKickCommand.java (98%) rename src/main/java/us/tastybento/bskyblock/commands/island/{teams => team}/IslandTeamLeaveCommand.java (97%) rename src/main/java/us/tastybento/bskyblock/commands/island/{teams => team}/IslandTeamPromoteCommand.java (98%) rename src/main/java/us/tastybento/bskyblock/commands/island/{teams => team}/IslandTeamSetownerCommand.java (98%) rename src/test/java/us/tastybento/bskyblock/commands/island/{teams => team}/IslandTeamInviteCommandTest.java (85%) rename src/test/java/us/tastybento/bskyblock/commands/island/{teams => team}/IslandTeamKickCommandTest.java (85%) rename src/test/java/us/tastybento/bskyblock/commands/island/{teams => team}/IslandTeamLeaveCommandTest.java (88%) diff --git a/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java b/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java index c91590ca8..07b1218fc 100755 --- a/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java @@ -18,7 +18,7 @@ import us.tastybento.bskyblock.commands.island.IslandSethomeCommand; import us.tastybento.bskyblock.commands.island.IslandSetnameCommand; import us.tastybento.bskyblock.commands.island.IslandSettingsCommand; import us.tastybento.bskyblock.commands.island.IslandUnbanCommand; -import us.tastybento.bskyblock.commands.island.teams.IslandTeamCommand; +import us.tastybento.bskyblock.commands.island.team.IslandTeamCommand; public class IslandCommand extends CompositeCommand { diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamCommand.java similarity index 98% rename from src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamCommand.java rename to src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamCommand.java index a30abfe19..f679f1020 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamCommand.java @@ -1,4 +1,4 @@ -package us.tastybento.bskyblock.commands.island.teams; +package us.tastybento.bskyblock.commands.island.team; import java.util.List; import java.util.Set; diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteAcceptCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamInviteAcceptCommand.java similarity index 98% rename from src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteAcceptCommand.java rename to src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamInviteAcceptCommand.java index a94351011..e49aea46f 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteAcceptCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamInviteAcceptCommand.java @@ -1,4 +1,4 @@ -package us.tastybento.bskyblock.commands.island.teams; +package us.tastybento.bskyblock.commands.island.team; import java.util.List; import java.util.UUID; diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamInviteCommand.java similarity index 99% rename from src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteCommand.java rename to src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamInviteCommand.java index 99f090ddb..906ef3986 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamInviteCommand.java @@ -1,4 +1,4 @@ -package us.tastybento.bskyblock.commands.island.teams; +package us.tastybento.bskyblock.commands.island.team; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteRejectCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamInviteRejectCommand.java similarity index 97% rename from src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteRejectCommand.java rename to src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamInviteRejectCommand.java index 37b37de3b..034017653 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteRejectCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamInviteRejectCommand.java @@ -1,4 +1,4 @@ -package us.tastybento.bskyblock.commands.island.teams; +package us.tastybento.bskyblock.commands.island.team; import java.util.List; import java.util.UUID; diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamKickCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamKickCommand.java similarity index 98% rename from src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamKickCommand.java rename to src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamKickCommand.java index 89a8e5ce7..de43e7848 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamKickCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamKickCommand.java @@ -1,4 +1,4 @@ -package us.tastybento.bskyblock.commands.island.teams; +package us.tastybento.bskyblock.commands.island.team; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamLeaveCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamLeaveCommand.java similarity index 97% rename from src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamLeaveCommand.java rename to src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamLeaveCommand.java index 599c9df74..779829cec 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamLeaveCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamLeaveCommand.java @@ -1,4 +1,4 @@ -package us.tastybento.bskyblock.commands.island.teams; +package us.tastybento.bskyblock.commands.island.team; import java.util.List; import java.util.UUID; diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamPromoteCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamPromoteCommand.java similarity index 98% rename from src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamPromoteCommand.java rename to src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamPromoteCommand.java index 36464de11..627f59413 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamPromoteCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamPromoteCommand.java @@ -1,4 +1,4 @@ -package us.tastybento.bskyblock.commands.island.teams; +package us.tastybento.bskyblock.commands.island.team; import java.util.List; diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamSetownerCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamSetownerCommand.java similarity index 98% rename from src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamSetownerCommand.java rename to src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamSetownerCommand.java index 7fd8bb870..77210c0cc 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamSetownerCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/team/IslandTeamSetownerCommand.java @@ -1,4 +1,4 @@ -package us.tastybento.bskyblock.commands.island.teams; +package us.tastybento.bskyblock.commands.island.team; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteCommandTest.java b/src/test/java/us/tastybento/bskyblock/commands/island/team/IslandTeamInviteCommandTest.java similarity index 85% rename from src/test/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteCommandTest.java rename to src/test/java/us/tastybento/bskyblock/commands/island/team/IslandTeamInviteCommandTest.java index aad67fea9..0095d82c1 100644 --- a/src/test/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamInviteCommandTest.java +++ b/src/test/java/us/tastybento/bskyblock/commands/island/team/IslandTeamInviteCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package us.tastybento.bskyblock.commands.island.teams; +package us.tastybento.bskyblock.commands.island.team; import static org.junit.Assert.assertFalse; import static org.mockito.Mockito.mock; @@ -119,7 +119,7 @@ public class IslandTeamInviteCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamInviteCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamInviteCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteNoIsland() { @@ -130,7 +130,7 @@ public class IslandTeamInviteCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamInviteCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamInviteCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteNotTeamLeader() { @@ -141,7 +141,7 @@ public class IslandTeamInviteCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamInviteCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamInviteCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteNoTarget() { @@ -151,7 +151,7 @@ public class IslandTeamInviteCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamInviteCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamInviteCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteUnknownPlayer() { @@ -164,7 +164,7 @@ public class IslandTeamInviteCommandTest { /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamInviteCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamInviteCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteOfflinePlayer() { @@ -179,7 +179,7 @@ public class IslandTeamInviteCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamInviteCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamInviteCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteSamePlayer() { @@ -195,7 +195,7 @@ public class IslandTeamInviteCommandTest { /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamInviteCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamInviteCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteDifferentPlayerInTeam() { diff --git a/src/test/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamKickCommandTest.java b/src/test/java/us/tastybento/bskyblock/commands/island/team/IslandTeamKickCommandTest.java similarity index 85% rename from src/test/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamKickCommandTest.java rename to src/test/java/us/tastybento/bskyblock/commands/island/team/IslandTeamKickCommandTest.java index a47d86ecc..427a3469f 100644 --- a/src/test/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamKickCommandTest.java +++ b/src/test/java/us/tastybento/bskyblock/commands/island/team/IslandTeamKickCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package us.tastybento.bskyblock.commands.island.teams; +package us.tastybento.bskyblock.commands.island.team; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -125,7 +125,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteNoTeam() { @@ -136,7 +136,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteNotTeamLeader() { @@ -147,7 +147,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteNoTarget() { @@ -157,7 +157,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteUnknownPlayer() { @@ -169,7 +169,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteSamePlayer() { @@ -182,7 +182,7 @@ public class IslandTeamKickCommandTest { /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteDifferentPlayerNotInTeam() { @@ -195,7 +195,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteNoConfirmation() { @@ -215,7 +215,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteWithConfirmation() { @@ -235,7 +235,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteTestResets() { diff --git a/src/test/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamLeaveCommandTest.java b/src/test/java/us/tastybento/bskyblock/commands/island/team/IslandTeamLeaveCommandTest.java similarity index 88% rename from src/test/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamLeaveCommandTest.java rename to src/test/java/us/tastybento/bskyblock/commands/island/team/IslandTeamLeaveCommandTest.java index b4b3b5887..a087c4d93 100644 --- a/src/test/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamLeaveCommandTest.java +++ b/src/test/java/us/tastybento/bskyblock/commands/island/team/IslandTeamLeaveCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package us.tastybento.bskyblock.commands.island.teams; +package us.tastybento.bskyblock.commands.island.team; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -106,7 +106,7 @@ public class IslandTeamLeaveCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamLeaveCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamLeaveCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteNoTeam() { @@ -117,7 +117,7 @@ public class IslandTeamLeaveCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamLeaveCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamLeaveCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteInTeamLeader() { @@ -127,7 +127,7 @@ public class IslandTeamLeaveCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamLeaveCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamLeaveCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteNoConfirmation() { @@ -144,7 +144,7 @@ public class IslandTeamLeaveCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamLeaveCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamLeaveCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteWithConfirmation() { @@ -163,7 +163,7 @@ public class IslandTeamLeaveCommandTest { } /** - * Test method for {@link us.tastybento.bskyblock.commands.island.teams.IslandTeamLeaveCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamLeaveCommand#execute(us.tastybento.bskyblock.api.user.User, java.util.List)}. */ @Test public void testExecuteTestResets() {