From f333cfbe6f2ad82956381457dc55cee981910b61 Mon Sep 17 00:00:00 2001
From: Florian CUNY <poslovitch@bentobox.world>
Date: Sun, 28 Apr 2019 11:15:26 +0200
Subject: [PATCH] Added [name] textvariable to admin setowner command
 'already-owner' message

---
 .../admin/team/AdminTeamSetownerCommand.java  |  9 +++---
 src/main/resources/locales/en-US.yml          |  3 +-
 .../team/AdminTeamSetownerCommandTest.java    | 31 ++++++++++---------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommand.java
index 0954da8ca..1cb2e075d 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommand.java
@@ -1,10 +1,6 @@
 package world.bentobox.bentobox.api.commands.admin.team;
 
-import java.util.List;
-import java.util.UUID;
-
 import org.bukkit.Bukkit;
-
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.events.IslandBaseEvent;
 import world.bentobox.bentobox.api.events.team.TeamEvent;
@@ -12,6 +8,9 @@ import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 
+import java.util.List;
+import java.util.UUID;
+
 public class AdminTeamSetownerCommand extends CompositeCommand {
 
     public AdminTeamSetownerCommand(CompositeCommand parent) {
@@ -43,7 +42,7 @@ public class AdminTeamSetownerCommand extends CompositeCommand {
             return false;
         }
         if (getIslands().getOwner(getWorld(), targetUUID).equals(targetUUID)) {
-            user.sendMessage("commands.admin.team.setowner.already-owner");
+            user.sendMessage("commands.admin.team.setowner.already-owner", TextVariables.NAME, args.get(0));
             return false;
         }
         // Make new owner
diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml
index 57d1717a1..9473aa881 100644
--- a/src/main/resources/locales/en-US.yml
+++ b/src/main/resources/locales/en-US.yml
@@ -78,7 +78,8 @@ commands:
       setowner:
         parameters: "<player>"
         description: "transfers island ownership to the player"
-        already-owner: "&cPlayer is already the owner of this island!"
+        already-owner: "&c[name] is already the owner of this island!"
+
     range:
       description: "Admin island range command"
       display:
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommandTest.java
index ce3fff4b7..fd58738c8 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommandTest.java
@@ -1,18 +1,5 @@
 package world.bentobox.bentobox.api.commands.admin.team;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
@@ -26,9 +13,9 @@ import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
-
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.managers.CommandsManager;
@@ -37,6 +24,19 @@ import world.bentobox.bentobox.managers.IslandsManager;
 import world.bentobox.bentobox.managers.LocalesManager;
 import world.bentobox.bentobox.managers.PlayersManager;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 /**
  * @author tastybento
  *
@@ -167,12 +167,13 @@ public class AdminTeamSetownerCommandTest {
         when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(is);
         String[] name = {"tastybento"};
         when(pm.getUUID(Mockito.any())).thenReturn(notUUID);
+        when(pm.getName(Mockito.any())).thenReturn(name[0]);
 
         when(im.getOwner(Mockito.any(), Mockito.eq(notUUID))).thenReturn(notUUID);
 
         AdminTeamSetownerCommand itl = new AdminTeamSetownerCommand(ac);
         assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name)));
-        Mockito.verify(user).sendMessage("commands.admin.team.setowner.already-owner");
+        Mockito.verify(user).sendMessage("commands.admin.team.setowner.already-owner", TextVariables.NAME, name[0]);
     }
 
     /**