From eb376b8eb37c742b70f088d7268933c91d5ec7ea Mon Sep 17 00:00:00 2001 From: Ryan1729 Date: Sun, 6 Oct 2019 00:55:29 -0600 Subject: [PATCH] pull all still needed `WordUtils.wrap` calls into one method --- .../forge/screens/home/quest/VSubmenuQuestData.java | 11 ++++++----- .../src/forge/screens/quest/NewQuestScreen.java | 13 +------------ 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestData.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestData.java index 65454ac06ce..b283bd01459 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestData.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestData.java @@ -17,7 +17,6 @@ import forge.screens.home.EMenuGroup; import forge.screens.home.IVSubmenu; import forge.screens.home.VHomeUI; import forge.toolbox.*; -import forge.util.storage.IStorage; import forge.util.Localizer; import net.miginfocom.swing.MigLayout; import org.apache.commons.lang3.text.WordUtils; @@ -243,17 +242,15 @@ public enum VSubmenuQuestData implements IVSubmenu { cboAllowUnlocks.setSelected(true); final Map preconDescriptions = new HashMap<>(); - final IStorage preconDecks = QuestController.getPrecons(); - for (final PreconDeck preconDeck : preconDecks) { + for (final PreconDeck preconDeck : QuestController.getPrecons()) { if (QuestController.getPreconDeals(preconDeck).getMinWins() > 0) { continue; } final String name = preconDeck.getName(); cbxPreconDeck.addItem(name); String description = preconDeck.getDescription(); - description = "" + WordUtils.wrap(description, 40, "
", false) + ""; - preconDescriptions.put(name, description); + preconDescriptions.put(name, wordWrapAsHTML(description)); } // The cbx needs strictly typed renderer @@ -363,6 +360,10 @@ public enum VSubmenuQuestData implements IVSubmenu { pnlOptions.add(btnEmbark, "w 300px!, h 30px!, ax center, span 2, gap 0 0 15px 30px"); } + private static String wordWrapAsHTML(String str) { + return "" + WordUtils.wrap(str, 40, "
", false, " ") + ""; + } + /* (non-Javadoc) * @see forge.view.home.IViewSubmenu#populate() */ diff --git a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java index fa5d33c5ba1..eecf8fc8ed4 100644 --- a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java @@ -47,15 +47,10 @@ import forge.util.FileUtil; import forge.util.ThreadUtil; import forge.util.Utils; import forge.util.gui.SOptionPane; -import forge.util.storage.IStorage; - -import org.apache.commons.lang3.text.WordUtils; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -282,18 +277,12 @@ public class NewQuestScreen extends FScreen { cbAllowUnlocks.setSelected(true); - final Map preconDescriptions = new HashMap<>(); - IStorage preconDecks = QuestController.getPrecons(); - - for (PreconDeck preconDeck : preconDecks) { + for (PreconDeck preconDeck : QuestController.getPrecons()) { if (QuestController.getPreconDeals(preconDeck).getMinWins() > 0) { continue; } String name = preconDeck.getName(); cbxPreconDeck.addItem(name); - String description = preconDeck.getDescription(); - description = "" + WordUtils.wrap(description, 40, "
", false) + ""; - preconDescriptions.put(name, description); } // disable the very powerful sets -- they can be unlocked later for a high price