github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 11:09:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Workaround for issue #213, removing object from the stack that wasn't correctly removed.

Browse source
This commit is contained in:
LevelX2 2013-05-23 20:28:30 +02:00
parent b13f33fc6b
commit 6718332f6a
1 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Mage.Client/src/main/java/mage/client/cards/Cards.java
View file

@ -44,6 +44,7 @@ import javax.swing.border.Border;
import java.awt.*;
import java.util.*;
import java.util.Map.Entry;
import org.apache.log4j.Logger;
/**
*
@ -51,6 +52,8 @@ import java.util.Map.Entry;
*/
public class Cards extends javax.swing.JPanel {
private static final Logger logger = Logger.getLogger(Cards.class);
private Map<UUID, MageCard> cards = new LinkedHashMap<UUID, MageCard>();
private boolean dontDisplayTapped = false;
private static final int GAP_X = 5;
@ -97,6 +100,7 @@ public class Cards extends javax.swing.JPanel {
this.isVisibleIfEmpty = isVisibleIfEmpty;
}
@Override
public void setBorder(Border border) {
super.setBorder(border);
if (jScrollPane1 != null) {
@ -112,6 +116,7 @@ public class Cards extends javax.swing.JPanel {
public boolean loadCards(CardsView cardsView, BigCard bigCard, UUID gameId, java.util.List<UUID> order) {
boolean changed = false;
// remove objects no longer on the stack from display
for (Iterator<Entry<UUID, MageCard>> i = cards.entrySet().iterator(); i.hasNext();) {
Entry<UUID, MageCard> entry = i.next();
if (!cardsView.containsKey(entry.getKey())) {
@ -121,11 +126,31 @@ public class Cards extends javax.swing.JPanel {
}
}
// Workaround for bug leaving display of objects on the stack (issue #213 https://github.com/magefree/mage/issues/213)
if (cardsView.size() == 0 && countCards() > 0) {
// problem happens with transformable cards
logger.fatal("Card object on the cards panel was not removed");
for (Component comp: cardArea.getComponents()) {
if (comp instanceof Card) {
Card card = (Card)comp;
logger.fatal("Card name:" + card.getName() + " type:" + card.getType(null));
} else if (comp instanceof MageCard) {
MageCard mageCard = (MageCard)comp;
logger.fatal("MageCard name:" + mageCard.getName() + " toolTiptext:" + mageCard.getToolTipText());
} else {
logger.fatal("Unknown object:" + comp.getName() + " className:" + comp.getClass().getName());
}
cardArea.remove(comp);
}
}
// order objects for display
java.util.List<CardView> orderedList = new ArrayList<CardView>();
for (CardView card: cardsView.values()) {
orderedList.add(0, card);
}
// add objects to the panel
for (CardView card: orderedList) {
if (dontDisplayTapped) {
if (card instanceof PermanentView) {
@ -176,7 +201,9 @@ public class Cards extends javax.swing.JPanel {
private void addCard(CardView card, BigCard bigCard, UUID gameId) {
MageCard cardImg = Plugins.getInstance().getMageCard(card, bigCard, getCardDimension(), gameId, true);
if (zone != null) cardImg.setZone(zone);
if (zone != null) {
cardImg.setZone(zone);
}
cards.put(card.getId(), cardImg);
cardArea.add(cardImg);
}
@ -195,6 +222,14 @@ public class Cards extends javax.swing.JPanel {
}
}
private int countCards() {
int count = 0;
for (Component comp: cardArea.getComponents()) {
count++;
}
return count;
}
private void layoutCards(Dimension dimension, Map<UUID, MageCard> cards, java.util.List<UUID> order) {
if (Plugins.getInstance().isCardPluginLoaded()) {
int dx = GAP_X;