external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing exception that happens when loading a deck with cards not found in our database.

Browse Source
This commit is contained in:
Maxmtg
2011-09-04 17:40:26 +00:00
parent 3756976bf5
commit b4d3894b35
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/forge/card/CardDb.java
View File

@@ -69,7 +69,7 @@ public final class CardDb {
public void addNewCard(final CardRules card) { public void addNewCard(final CardRules card) {
if (null == card) { return; } if (null == card) { return; }
//System.out.println(card.getName()); //System.out.println(card.getName());
String cardName = card.getName(); String cardName = card.getName().toLowerCase();
// 1. register among oracle uniques // 1. register among oracle uniques
cards.put(cardName, card); cards.put(cardName, card);
@@ -102,9 +102,9 @@ public final class CardDb {
public CardPrinted getCard(final String name) { public CardPrinted getCard(final String name) {
// Sometimes they read from decks things like "CardName|Set" - but we can handle it // Sometimes they read from decks things like "CardName|Set" - but we can handle it
int pipePos = name.indexOf('|'); int pipePos = name.indexOf('|');
String cardName = name; String cardName = name.toLowerCase();
if (pipePos >= 0) { if (pipePos >= 0) {
cardName = name.substring(0, pipePos); cardName = name.substring(0, pipePos).toLowerCase();
String setName = name.substring(pipePos + 1); String setName = name.substring(pipePos + 1);
// only if set is not blank try to load it // only if set is not blank try to load it
if (StringUtils.isNotBlank(setName)) { if (StringUtils.isNotBlank(setName)) {
@@ -120,13 +120,13 @@ public final class CardDb {
public CardPrinted getCard(final String name, final String set) { return getCard(name, set, 0); } public CardPrinted getCard(final String name, final String set) { return getCard(name, set, 0); }
public CardPrinted getCard(final String name, final String set, final int artIndex) { public CardPrinted getCard(final String name, final String set, final int artIndex) {
// 1. get set // 1. get set
Map<String, CardPrinted[]> cardsFromset = allCardsBySet.get(set); Map<String, CardPrinted[]> cardsFromset = allCardsBySet.get(set.toUpperCase());
if (null == cardsFromset) { if (null == cardsFromset) {
String err = String.format("Asked for card '%s' from set '%s': that set was not found. :(", name, set); String err = String.format("Asked for card '%s' from set '%s': that set was not found. :(", name, set);
throw new NoSuchElementException(err); throw new NoSuchElementException(err);
} }
// 2. Find the card itself // 2. Find the card itself
CardPrinted[] cardCopies = cardsFromset.get(name); CardPrinted[] cardCopies = cardsFromset.get(name.toLowerCase());
if (null == cardCopies) { if (null == cardCopies) {
String err = String.format("Asked for card '%s' from '%s': set found, but the card wasn't. :(", name, set); String err = String.format("Asked for card '%s' from '%s': set found, but the card wasn't. :(", name, set);
throw new NoSuchElementException(err); throw new NoSuchElementException(err);

14
src/main/java/forge/deck/DeckManager.java
View File

@@ -4,6 +4,7 @@ package forge.deck;
import forge.Constant; import forge.Constant;
import forge.card.CardPrinted; import forge.card.CardPrinted;
import forge.error.ErrorViewer; import forge.error.ErrorViewer;
import forge.gui.GuiUtils;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
@@ -11,6 +12,8 @@ import java.util.Map.Entry;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.swing.JOptionPane;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import static java.lang.Integer.parseInt; import static java.lang.Integer.parseInt;
@@ -219,8 +222,15 @@ public class DeckManager {
files = deckDir.listFiles(DCKFileFilter); files = deckDir.listFiles(DCKFileFilter);
for (File file : files) { for (File file : files) {
Deck newDeck = readDeck(file);
deckMap.put(newDeck.getName(), newDeck); try {
Deck newDeck = readDeck(file);
deckMap.put(newDeck.getName(), newDeck);
} catch ( NoSuchElementException ex ) {
String message = String.format("Your deck '%s' failed to load beacuse %s", file.getName(), ex.getMessage());
JOptionPane.showMessageDialog(null, message, "One of your decks failed to load", JOptionPane.ERROR_MESSAGE);
}
} }
files = deckDir.listFiles(BDKFileFilter); files = deckDir.listFiles(BDKFileFilter);