mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 11:18:01 +00:00
Guava migration - Remove migration scaffold
This commit is contained in:
@@ -12,7 +12,7 @@ import javax.swing.JPopupMenu;
|
||||
import javax.swing.ScrollPaneConstants;
|
||||
import javax.swing.SwingConstants;
|
||||
|
||||
import forge.util.Iterables;
|
||||
import com.google.common.collect.Iterables;
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
|
||||
@@ -2,10 +2,10 @@ package forge.screens.bazaar;
|
||||
|
||||
import javax.swing.SwingUtilities;
|
||||
|
||||
import com.google.common.collect.Iterables;
|
||||
import forge.gamemodes.quest.bazaar.QuestBazaarManager;
|
||||
import forge.gui.framework.ICDoc;
|
||||
import forge.toolbox.FLabel;
|
||||
import forge.util.Iterables;
|
||||
|
||||
public enum CBazaarUI implements ICDoc {
|
||||
SINGLETON_INSTANCE;
|
||||
|
||||
@@ -5,12 +5,12 @@ import java.util.Vector;
|
||||
|
||||
import javax.swing.SwingUtilities;
|
||||
|
||||
import com.google.common.collect.Iterables;
|
||||
import forge.deck.DeckProxy;
|
||||
import forge.localinstance.properties.ForgePreferences;
|
||||
import forge.localinstance.properties.ForgePreferences.FPref;
|
||||
import forge.model.FModel;
|
||||
import forge.toolbox.FList;
|
||||
import forge.util.Iterables;
|
||||
|
||||
public class CLobby {
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ import javax.swing.*;
|
||||
import javax.swing.event.ListSelectionListener;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.Iterables;
|
||||
import com.google.common.collect.Lists;
|
||||
|
||||
import forge.ai.AIOption;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package forge.screens.match.controllers;
|
||||
|
||||
import forge.util.Iterables;
|
||||
import com.google.common.collect.Iterables;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import forge.game.GameEntityView;
|
||||
|
||||
@@ -2,6 +2,7 @@ package forge.screens.workshop.views;
|
||||
|
||||
import javax.swing.JPanel;
|
||||
|
||||
import com.google.common.collect.Iterables;
|
||||
import forge.gui.framework.DragCell;
|
||||
import forge.gui.framework.DragTab;
|
||||
import forge.gui.framework.EDocID;
|
||||
@@ -14,7 +15,6 @@ import forge.screens.match.controllers.CDetailPicture;
|
||||
import forge.screens.workshop.controllers.CCardScript;
|
||||
import forge.screens.workshop.controllers.CWorkshopCatalog;
|
||||
import forge.util.ItemPool;
|
||||
import forge.util.Iterables;
|
||||
import forge.util.Localizer;
|
||||
import net.miginfocom.swing.MigLayout;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package forge.gamesimulationtests.util;
|
||||
|
||||
import com.google.common.collect.Iterables;
|
||||
import com.google.common.collect.ListMultimap;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Multimap;
|
||||
@@ -47,7 +48,6 @@ import forge.item.PaperCard;
|
||||
import forge.player.HumanPlay;
|
||||
import forge.util.Aggregates;
|
||||
import forge.util.ITriggerEvent;
|
||||
import forge.util.Iterables;
|
||||
import forge.util.MyRandom;
|
||||
import forge.util.collect.FCollectionView;
|
||||
import org.apache.commons.lang3.tuple.ImmutablePair;
|
||||
|
||||
@@ -3,7 +3,7 @@ package forge.gamesimulationtests.util;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import forge.util.Iterables;
|
||||
import com.google.common.collect.Iterables;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
public abstract class SpecificationHandler<TYPE, SPECIFICATION extends Specification<TYPE>> {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package forge.item;
|
||||
|
||||
import com.google.common.collect.Iterables;
|
||||
import forge.GuiDesktop;
|
||||
import forge.card.CardRarity;
|
||||
import forge.card.CardRules;
|
||||
@@ -7,7 +8,6 @@ import forge.card.DeckHints;
|
||||
import forge.gui.GuiBase;
|
||||
import forge.localinstance.properties.ForgeConstants;
|
||||
import forge.util.FileUtil;
|
||||
import forge.util.Iterables;
|
||||
import junit.framework.Assert;
|
||||
import org.testng.annotations.BeforeTest;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
Reference in New Issue
Block a user