From 050a70b7dbbfd1ec6af14854ffad92847480492c Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Tue, 2 Jan 2018 19:38:08 +0400 Subject: [PATCH] UI: fixed #4329 - errors on card selection in linux (debian) --- .../card/arcane/ManaSymbolsCellRenderer.java | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbolsCellRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbolsCellRenderer.java index 1de0abceb11..46a0e3f1c2c 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbolsCellRenderer.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbolsCellRenderer.java @@ -35,28 +35,30 @@ public final class ManaSymbolsCellRenderer extends DefaultTableCellRenderer { String manaCost = (String)value; manaPanel.removeAll(); manaPanel.setLayout(new BoxLayout(manaPanel, BoxLayout.X_AXIS)); - StringTokenizer tok = new StringTokenizer(manaCost, " "); - while (tok.hasMoreTokens()) { - String symbol = tok.nextToken(); + if(manaCost != null){ + StringTokenizer tok = new StringTokenizer(manaCost, " "); + while (tok.hasMoreTokens()) { + String symbol = tok.nextToken(); - JLabel symbolLabel = new JLabel(); - //symbolLabel.setBorder(new LineBorder(new Color(150, 150, 150))); // debug - symbolLabel.setBorder(new EmptyBorder(0, symbolHorizontalMargin,0, 0)); + JLabel symbolLabel = new JLabel(); + //symbolLabel.setBorder(new LineBorder(new Color(150, 150, 150))); // debug + symbolLabel.setBorder(new EmptyBorder(0, symbolHorizontalMargin,0, 0)); - BufferedImage image = ManaSymbols.getSizedManaSymbol(symbol, symbolWidth); - if (image != null){ - // icon - symbolLabel.setIcon(new ImageIcon(image)); - }else - { - // text - symbolLabel.setText("{" + symbol + "}"); - symbolLabel.setOpaque(baseLabel.isOpaque()); - symbolLabel.setForeground(baseLabel.getForeground()); - symbolLabel.setBackground(baseLabel.getBackground()); + BufferedImage image = ManaSymbols.getSizedManaSymbol(symbol, symbolWidth); + if (image != null){ + // icon + symbolLabel.setIcon(new ImageIcon(image)); + }else + { + // text + symbolLabel.setText("{" + symbol + "}"); + symbolLabel.setOpaque(baseLabel.isOpaque()); + symbolLabel.setForeground(baseLabel.getForeground()); + symbolLabel.setBackground(baseLabel.getBackground()); + } + + manaPanel.add(symbolLabel); } - - manaPanel.add(symbolLabel); } return manaPanel;