From a99be05446f9f2269927153c4e8414dea3d1dd5a Mon Sep 17 00:00:00 2001 From: magenoxx Date: Sun, 30 Jan 2011 19:01:26 +0300 Subject: [PATCH] Fixed tooltip bug appeared after adding displaying counters. Updated card plugin. Hid New Draft button for release as drafting is not ready yet. --- Mage.Client/plugins/mage-card-plugin.jar | Bin 308434 -> 308571 bytes .../java/mage/client/table/TablesPanel.java | 2 + Mage.Common/src/mage/utils/DeckBuilder.java | 1 + .../plugins/card/info/CardInfoPaneImpl.java | 41 ++++++++++-------- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Mage.Client/plugins/mage-card-plugin.jar b/Mage.Client/plugins/mage-card-plugin.jar index 269545512b08c3685e3ee0ffc21796fe5026bef7..b595fc1386e36bd09e2adb48412775306d2af5cd 100644 GIT binary patch delta 8932 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 diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java index 7828702ce14..f8b2e21b25c 100644 --- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java @@ -227,6 +227,8 @@ public class TablesPanel extends javax.swing.JPanel implements Observer { btnNewDraftActionPerformed(evt); } }); + //FIXME: removed on released 0.6 version + btnNewDraft.setVisible(false); javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); jPanel1.setLayout(jPanel1Layout); diff --git a/Mage.Common/src/mage/utils/DeckBuilder.java b/Mage.Common/src/mage/utils/DeckBuilder.java index 922fc797542..a6f61004290 100644 --- a/Mage.Common/src/mage/utils/DeckBuilder.java +++ b/Mage.Common/src/mage/utils/DeckBuilder.java @@ -249,6 +249,7 @@ public class DeckBuilder { maxSingleCount = Math.max(maxSingleCount, typeCount); } } + maxSingleCount = Math.min(maxSingleCount, SINGLE_PENALTY.length - 1); return 2 * converted + 3 * (10 - SINGLE_PENALTY[maxSingleCount]/*-DOUBLE_PENALTY[doubleCount]*/); } diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java index 444a1c73052..4d6c4c5c025 100644 --- a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java +++ b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java @@ -33,15 +33,15 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane { } public void setCard(final CardView card) { - if (card == null) return; + if (card == null) return; if (isCurrentCard(card)) return; - currentCard = card; + currentCard = card; ThreadUtils.threadPool.submit(new Runnable() { public void run() { - if (!card.equals(currentCard)) return; + if (!card.equals(currentCard)) return; - String manaCost = ""; + String manaCost = ""; for (String m : card.getManaCost()) { manaCost += m; } @@ -55,24 +55,29 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane { List rules = card.getRules(); List rulings = new ArrayList(rules); - if (card instanceof PermanentView) { - int count = ((PermanentView)card).getCounters().size(); - if (count > 0) { - StringBuilder sb = new StringBuilder(); - int index = 0; - for (CounterView counter: ((PermanentView)card).getCounters()) { - if (counter.getCount() > 0) { - if (index == 0) { - sb.append("Counters: "); - } else { - sb.append(", "); + try { + if (card instanceof PermanentView) { + List counters = ((PermanentView)card).getCounters(); + int count = counters != null ? counters.size() : 0; + if (count > 0) { + StringBuilder sb = new StringBuilder(); + int index = 0; + for (CounterView counter: ((PermanentView)card).getCounters()) { + if (counter.getCount() > 0) { + if (index == 0) { + sb.append("Counters: "); + } else { + sb.append(", "); + } + sb.append(counter.getCount() + "x" + counter.getName() + ""); + index++; } - sb.append(counter.getCount() + "x" + counter.getName() + ""); - index++; } + rulings.add(sb.toString()); } - rulings.add(sb.toString()); } + } catch (Exception e) { + e.printStackTrace(); } boolean smallImages = true;