Rename tab complete method

Signed-off-by: Austin Payne <[email protected]>
Amperial · Feb 13, 2016 · 4ec8c2f · 4ec8c2f
1 parent 2503a64
commit 4ec8c2f
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 23 deletions.
diff --git a/src/main/java/ninja/amp/fallout/character/Special.java b/src/main/java/ninja/amp/fallout/character/Special.java
@@ -125,14 +125,13 @@ public int getTotal() {
 
     @Override
     public String toString() {
-        return new StringBuilder()
-                .append("S:").append(traits.get(Trait.STRENGTH))
-                .append(" P:").append(traits.get(Trait.PERCEPTION))
-                .append(" E:").append(traits.get(Trait.ENDURANCE))
-                .append(" C:").append(traits.get(Trait.CHARISMA))
-                .append(" I:").append(traits.get(Trait.INTELLIGENCE))
-                .append(" A:").append(traits.get(Trait.AGILITY))
-                .append(" L:").append(traits.get(Trait.LUCK)).toString();
+        return "S:" + traits.get(Trait.STRENGTH) +
+                " P:" + traits.get(Trait.PERCEPTION) +
+                " E:" + traits.get(Trait.ENDURANCE) +
+                " C:" + traits.get(Trait.CHARISMA) +
+                " I:" + traits.get(Trait.INTELLIGENCE) +
+                " A:" + traits.get(Trait.AGILITY) +
+                " L:" + traits.get(Trait.LUCK);
     }
 
 }
diff --git a/src/main/java/ninja/amp/fallout/command/CommandController.java b/src/main/java/ninja/amp/fallout/command/CommandController.java
@@ -81,7 +81,7 @@ public List<String> onTabComplete(CommandSender sender, org.bukkit.command.Comma
                     }
                 }
                 if ((!(command instanceof Command) || args.length - commandAmount <= command.getMaxArgsLength()) && args.length > commandAmount) {
-                    return command.getTabCompleteList(Arrays.asList(args).subList(commandAmount, args.length));
+                    return command.tabComplete(Arrays.asList(args).subList(commandAmount, args.length));
                 }
             }
         }

diff --git a/src/main/java/ninja/amp/fallout/command/CommandGroup.java b/src/main/java/ninja/amp/fallout/command/CommandGroup.java
@@ -256,7 +256,7 @@ public void execute(String command, CommandSender sender, List<String> args) {
      * @param args The args already entered
      * @return The tab completion list of the command group
      */
-    public List<String> getTabCompleteList(List<String> args) {
+    public List<String> tabComplete(List<String> args) {
         switch (args.size()) {
             case 1:
                 return tabCompletions(args.get(0), tabCompleteList);

diff --git a/src/main/java/ninja/amp/fallout/command/commands/HelpCommand.java b/src/main/java/ninja/amp/fallout/command/commands/HelpCommand.java
@@ -58,7 +58,7 @@ public void execute(String command, CommandSender sender, List<String> args) {
     }
 
     @Override
-    public List<String> getTabCompleteList(List<String> args) {
+    public List<String> tabComplete(List<String> args) {
         switch (args.size()) {
             case 1:
                 return tabCompletions(args.get(0), fallout.getCommandController().getPageList().getPageNumbersList());

diff --git a/src/main/java/ninja/amp/fallout/command/commands/Whois.java b/src/main/java/ninja/amp/fallout/command/commands/Whois.java
@@ -62,7 +62,7 @@ public void execute(String command, CommandSender sender, List<String> args) {
     }
 
     @Override
-    public List<String> getTabCompleteList(List<String> args) {
+    public List<String> tabComplete(List<String> args) {
         switch (args.size()) {
             case 1:
                 return tabCompletions(args.get(0), fallout.getCharacterManager().getCharacterList());

diff --git a/src/main/java/ninja/amp/fallout/command/commands/character/Possess.java b/src/main/java/ninja/amp/fallout/command/commands/character/Possess.java
@@ -76,7 +76,7 @@ public void execute(String command, CommandSender sender, List<String> args) {
     }
 
     @Override
-    public List<String> getTabCompleteList(List<String> args) {
+    public List<String> tabComplete(List<String> args) {
         switch (args.size()) {
             case 1:
                 return tabCompletions(args.get(0), fallout.getCharacterManager().getExistingCharacters());

diff --git a/src/main/java/ninja/amp/fallout/command/commands/character/Upgrade.java b/src/main/java/ninja/amp/fallout/command/commands/character/Upgrade.java
@@ -73,7 +73,7 @@ public void execute(String command, CommandSender sender, List<String> args) {
     }
 
     @Override
-    public List<String> getTabCompleteList(List<String> args) {
+    public List<String> tabComplete(List<String> args) {
         switch (args.size()) {
             case 1:
                 return tabCompletions(args.get(0), fallout.getCharacterManager().getCharacterList());

diff --git a/src/main/java/ninja/amp/fallout/command/commands/character/knowledge/Teach.java b/src/main/java/ninja/amp/fallout/command/commands/character/knowledge/Teach.java
@@ -78,7 +78,7 @@ public void execute(String command, CommandSender sender, List<String> args) {
     }
 
     @Override
-    public List<String> getTabCompleteList(List<String> args) {
+    public List<String> tabComplete(List<String> args) {
         switch (args.size()) {
             case 1:
                 return tabCompletions(args.get(0), fallout.getCharacterManager().getCharacterList());

diff --git a/src/main/java/ninja/amp/fallout/command/commands/character/knowledge/Unteach.java b/src/main/java/ninja/amp/fallout/command/commands/character/knowledge/Unteach.java
@@ -78,7 +78,7 @@ public void execute(String command, CommandSender sender, List<String> args) {
     }
 
     @Override
-    public List<String> getTabCompleteList(List<String> args) {
+    public List<String> tabComplete(List<String> args) {
         switch (args.size()) {
             case 1:
                 return tabCompletions(args.get(0), fallout.getCharacterManager().getCharacterList());

diff --git a/src/main/java/ninja/amp/fallout/command/commands/character/perk/ResetPerks.java b/src/main/java/ninja/amp/fallout/command/commands/character/perk/ResetPerks.java
@@ -86,7 +86,7 @@ public void execute(String command, CommandSender sender, List<String> args) {
     }
 
     @Override
-    public List<String> getTabCompleteList(List<String> args) {
+    public List<String> tabComplete(List<String> args) {
         switch (args.size()) {
             case 1:
                 return tabCompletions(args.get(0), fallout.getCharacterManager().getCharacterList());

diff --git a/src/main/java/ninja/amp/fallout/command/commands/character/profile/Profile.java b/src/main/java/ninja/amp/fallout/command/commands/character/profile/Profile.java
@@ -81,7 +81,7 @@ public void execute(String command, CommandSender sender, List<String> args) {
     }
 
     @Override
-    public List<String> getTabCompleteList(List<String> args) {
+    public List<String> tabComplete(List<String> args) {
         switch (args.size()) {
             case 1:
                 return tabCompletions(args.get(0), fallout.getCharacterManager().getCharacterList());

diff --git a/src/main/java/ninja/amp/fallout/command/commands/character/skill/ResetSkills.java b/src/main/java/ninja/amp/fallout/command/commands/character/skill/ResetSkills.java
@@ -83,7 +83,7 @@ public void execute(String command, CommandSender sender, List<String> args) {
     }
 
     @Override
-    public List<String> getTabCompleteList(List<String> args) {
+    public List<String> tabComplete(List<String> args) {
         switch (args.size()) {
             case 1:
                 return tabCompletions(args.get(0), fallout.getCharacterManager().getCharacterList());

diff --git a/src/main/java/ninja/amp/fallout/command/commands/roll/ArmorRoll.java b/src/main/java/ninja/amp/fallout/command/commands/roll/ArmorRoll.java
@@ -46,7 +46,7 @@ public void execute(String command, CommandSender sender, List<String> args) {
     }
 
     @Override
-    public List<String> getTabCompleteList(List<String> args) {
+    public List<String> tabComplete(List<String> args) {
         switch (args.size()) {
             case 1:
                 return tabCompletions(args.get(0), DamageType.getDamageTypeNames());

diff --git a/src/main/java/ninja/amp/fallout/command/commands/roll/GlobalRoll.java b/src/main/java/ninja/amp/fallout/command/commands/roll/GlobalRoll.java
@@ -82,7 +82,7 @@ public void execute(String command, Player sender, Character character, List<Str
     }
 
     @Override
-    public List<String> getTabCompleteList(List<String> args) {
+    public List<String> tabComplete(List<String> args) {
         switch (args.size()) {
             case 1:
                 return tabCompletions(args.get(0), tabCompleteList);

diff --git a/src/main/java/ninja/amp/fallout/command/commands/roll/LocalRoll.java b/src/main/java/ninja/amp/fallout/command/commands/roll/LocalRoll.java
@@ -83,7 +83,7 @@ public void execute(String command, Player sender, Character character, List<Str
     }
 
     @Override
-    public List<String> getTabCompleteList(List<String> args) {
+    public List<String> tabComplete(List<String> args) {
         switch (args.size()) {
             case 1:
                 return tabCompletions(args.get(0), tabCompleteList);

diff --git a/src/main/java/ninja/amp/fallout/command/commands/roll/PrivateRoll.java b/src/main/java/ninja/amp/fallout/command/commands/roll/PrivateRoll.java
@@ -82,7 +82,7 @@ public void execute(String command, Player sender, Character character, List<Str
     }
 
     @Override
-    public List<String> getTabCompleteList(List<String> args) {
+    public List<String> tabComplete(List<String> args) {
         switch (args.size()) {
             case 1:
                 return tabCompletions(args.get(0), tabCompleteList);
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                     }
                     if ((!(command instanceof Command) || args.length - commandAmount <= command.getMaxArgsLength()) && args.length > commandAmount) {
-                        return command.getTabCompleteList(Arrays.asList(args).subList(commandAmount, args.length));
+                        return command.tabComplete(Arrays.asList(args).subList(commandAmount, args.length));
                     }
                 }
             }
@@ Expand Down @@