Guava migration - Migrate Functions

forge-gui-desktop/src/main/java/forge/GuiDesktop.java

@@ -15,6 +15,7 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Function;
 
 import javax.swing.ImageIcon;
 import javax.swing.JFileChooser;
@@ -22,8 +23,6 @@ import javax.swing.SwingUtilities;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.base.Function;
-
 import forge.download.GuiDownloader;
 import forge.error.BugReportDialog;
 import forge.gamemodes.match.HostedMatch;

forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java

@@ -7,14 +7,13 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.FutureTask;
+import java.util.function.Function;
 
 import javax.swing.JList;
 import javax.swing.WindowConstants;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.base.Function;
-
 import forge.card.CardStateName;
 import forge.card.ICardFace;
 import forge.game.card.Card;

forge-gui-desktop/src/main/java/forge/gui/ListChooser.java

@@ -25,6 +25,7 @@ import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Function;
 
 import javax.swing.AbstractListModel;
 import javax.swing.DefaultListCellRenderer;
@@ -36,7 +37,6 @@ import javax.swing.WindowConstants;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 

forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemTableColumn.java

@@ -19,11 +19,10 @@ package forge.itemmanager.views;
 
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.function.Function;
 
 import javax.swing.table.TableColumn;
 
-import com.google.common.base.Function;
-
 import forge.item.InventoryItem;
 import forge.itemmanager.ColumnDef;
 import forge.itemmanager.ItemColumn;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java

@@ -22,11 +22,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.function.Function;
 import java.util.function.Predicate;
 
 import javax.swing.KeyStroke;
 
-import com.google.common.base.Function;
 import com.google.common.base.Supplier;
 
 import forge.card.CardRules;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java

@@ -22,8 +22,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.function.Function;
 
-import com.google.common.base.Function;
 import com.google.common.base.Supplier;
 
 import forge.deck.Deck;

forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java

@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 
 import javax.swing.JMenu;
 import javax.swing.JOptionPane;
@@ -38,7 +39,6 @@ import javax.swing.KeyStroke;
 import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.PopupMenuListener;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;

forge-gui-desktop/src/main/java/forge/screens/match/controllers/CField.java

@@ -20,8 +20,7 @@ package forge.screens.match.controllers;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-
-import com.google.common.base.Function;
+import java.util.function.Function;
 
 import forge.game.player.PlayerView;
 import forge.game.zone.ZoneType;

forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java

@@ -6,6 +6,7 @@ import java.awt.Graphics;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Function;
 
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
@@ -13,8 +14,6 @@ import javax.swing.SwingConstants;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
-import com.google.common.base.Function;
-
 import forge.card.mana.ManaAtom;
 import forge.game.player.PlayerView;
 import forge.localinstance.skin.FSkinProp;