From e45efd0527a4402b442f93f2f975ade8087e5572 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Mon, 13 Dec 2010 00:26:39 +0300 Subject: [PATCH] DeckEditor: draft mode, removing card for cardpool and no possibility to return card back. --- Mage.Client/src/main/java/mage/client/cards/CardGrid.java | 2 +- .../main/java/mage/client/deckeditor/DeckEditorPanel.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java index ae8fb39d078..f15687451de 100644 --- a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java @@ -125,7 +125,7 @@ public class CardGrid extends javax.swing.JLayeredPane implements MouseListener resizeArea(); } - private void removeCard(UUID cardId) { + public void removeCard(UUID cardId) { for (Component comp: getComponents()) { if (comp instanceof Card) { if (((Card)comp).getCardId().equals(cardId)) { diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java index 2bd6faf9afb..74c9e2b6210 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java @@ -93,7 +93,10 @@ public class DeckEditorPanel extends javax.swing.JPanel { for (Card card: cardSelector.getCards()) { if (card.getId().equals((UUID)event.getSource())) { deck.getCards().add(createCard(card.getClass())); - break; + if (System.getProperty("draft") != null) { + cardSelector.getCardsList().removeCard(card.getId()); + } + break; } } refreshDeck(); @@ -106,6 +109,9 @@ public class DeckEditorPanel extends javax.swing.JPanel { new Listener () { @Override public void event(Event event) { + if (System.getProperty("draft") != null) { + return; + } if (event.getEventName().equals("double-click")) { for (Card card: deck.getCards()) { if (card.getId().equals((UUID)event.getSource())) {