Renamed UseItemHandler2 to UseItemHandler

EvanKnowles · Dec 10, 2018 · 26e9c59 · EvanKnowles · Dec 10, 2018 · 26e9c59
1 parent 6cfaa4b
commit 26e9c59
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/web/src/main/java/za/co/knonchalant/telegram/bots/SecretFightClubBotAPIBuilder.java b/web/src/main/java/za/co/knonchalant/telegram/bots/SecretFightClubBotAPIBuilder.java
@@ -31,7 +31,7 @@ public Bots buildFightClubBot() {
 
         addHandler(new RegisterHandler(botName, botAPI));
         addHandler(new RollHandler(botName, botAPI));
-        addHandler(new UseItemHandler2(botName, botAPI));
+        addHandler(new UseItemHandler(botName, botAPI));
         addHandler(new RankingsHandler(botName, botAPI));
         addHandler(new OptionsHandler(botName, botAPI));
         addHandler(new AbuseHandler(botName, botAPI));

diff --git a/...c/main/java/za/co/knonchalant/telegram/handlers/fightclub/SubmitItemSelectionHandler.java b/...c/main/java/za/co/knonchalant/telegram/handlers/fightclub/SubmitItemSelectionHandler.java
@@ -44,7 +44,7 @@ private Item determineItemToUse(IUpdate update, FighterDAO fighterDAO) {
 
         List<Item> carried = fighterDAO.getAllUncarriedItemsFrom(update.getChatId());
         for (Item item : carried) {
-            String thisItemDescription = UseItemHandler2.makeItemButtonText(item);
+            String thisItemDescription = UseItemHandler.makeItemButtonText(item);
             if (thisItemDescription.trim().equals(desiredItemDescription)) {
                 return item;
             }

diff --git a/...m/handlers/fightclub/UseItemHandler2.java → ...am/handlers/fightclub/UseItemHandler.java b/...m/handlers/fightclub/UseItemHandler2.java → ...am/handlers/fightclub/UseItemHandler.java
@@ -21,9 +21,9 @@
 /**
  * Created by evan on 2016/04/08.
  */
-public class UseItemHandler2 extends ActiveFighterMessageHandler implements IResponseMessageHandler<ItemDetails> {
+public class UseItemHandler extends ActiveFighterMessageHandler implements IResponseMessageHandler<ItemDetails> {
 
-  public UseItemHandler2(String botName, IBotAPI bot) {
+  public UseItemHandler(String botName, IBotAPI bot) {
         super(botName, "use", bot, true);
     }
 

diff --git a/web/src/main/java/za/co/knonchalant/telegram/handlers/fightclub/UseItemSelectionHandler.java b/web/src/main/java/za/co/knonchalant/telegram/handlers/fightclub/UseItemSelectionHandler.java
@@ -1,7 +1,5 @@
 package za.co.knonchalant.telegram.handlers.fightclub;
 
-import com.pengrad.telegrambot.model.request.InlineKeyboardButton;
-import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup;
 import com.pengrad.telegrambot.model.request.ParseMode;
 import com.pengrad.telegrambot.model.request.ReplyKeyboardMarkup;
 import za.co.knonchalant.candogram.domain.PendingResponse;
@@ -73,7 +71,7 @@ protected Item determineItemToUse(IUpdate update, FighterDAO fighterDAO, Fighter
 
         List<Item> carried = fighterDAO.getItemsCarriedBy(fighter.getId());
         for (Item item : carried) {
-            String thisItemDescription = UseItemHandler2.makeItemButtonText(item);
+            String thisItemDescription = UseItemHandler.makeItemButtonText(item);
             if (thisItemDescription.trim().equals(desiredItemDescription)) {
                 return item;
             }