Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Alessandro Coli
2019-11-23 09:44:59 +01:00
2 changed files with 13 additions and 20 deletions

View File

@@ -1,31 +1,24 @@
package forge.toolbox.special;
import java.awt.Component;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import forge.card.mana.ManaAtom;
import forge.trackable.TrackableProperty;
import net.miginfocom.swing.MigLayout;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import com.google.common.base.Function;
import forge.assets.FSkinProp;
import forge.card.mana.ManaAtom;
import forge.game.player.PlayerView;
import forge.toolbox.FLabel;
import forge.toolbox.FMouseAdapter;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinFont;
import forge.toolbox.FSkin.SkinnedPanel;
import forge.trackable.TrackableProperty;
import net.miginfocom.swing.MigLayout;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.List;
public class PlayerDetailsPanel extends JPanel {
private static final long serialVersionUID = -6531759554646891983L;
@@ -213,7 +206,7 @@ public class PlayerDetailsPanel extends JPanel {
}
public void setToolTip(final String... args) {
super.setToolTipText(String.format(tooltip, (Object) args));
super.setToolTipText(String.format(tooltip, args));
}
@Override