From ce5851ab5aa5cb536cacac11a0443313a1b4606c Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Mon, 5 Sep 2011 15:38:07 +0000
Subject: [PATCH] Won't show errors if a card has no setinfo.

---
 src/main/java/forge/card/CardDb.java          | 19 ++++---------------
 src/main/java/forge/card/CardRarity.java      |  3 ++-
 src/main/java/forge/card/CardRules.java       |  4 ++++
 .../cardFactory/PreloadingCardFactory.java    |  7 +------
 4 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/main/java/forge/card/CardDb.java b/src/main/java/forge/card/CardDb.java
index 25fc6d52264..c3cde519b04 100644
--- a/src/main/java/forge/card/CardDb.java
+++ b/src/main/java/forge/card/CardDb.java
@@ -39,8 +39,6 @@ public final class CardDb {
             }
         }
     }
-    private static List<String> skippedCards = new ArrayList<String>();
-    public static List<String> getSkippedCards() { return skippedCards; }
 
     // Here oracle cards
     private final Map<String, CardRules> cards = new Hashtable<String, CardRules>();
@@ -63,17 +61,13 @@ public final class CardDb {
 
     private CardDb(final Iterator<CardRules> parser) {
         while (parser.hasNext()) {
-            CardRules nextCard = parser.next();
-            boolean wasAdded = addNewCard(nextCard);
-            if (!wasAdded) {
-                skippedCards.add(nextCard.getName());
-            }
+            addNewCard(parser.next());
         }
         // TODO: consider using Collections.unmodifiableList wherever possible
     }
 
-    public boolean addNewCard(final CardRules card) {
-        if (null == card) { return true; } // consider that a success
+    public void addNewCard(final CardRules card) {
+        if (null == card) { return; } // consider that a success
         //System.out.println(card.getName());
         String cardName = card.getName().toLowerCase();
 
@@ -101,12 +95,7 @@ public final class CardDb {
                 cardCopies[i] = lastAdded;
             }
         }
-
-        if (null != lastAdded) {
-            uniqueCards.put(cardName, lastAdded);
-            return true;
-        }
-        return false;
+        uniqueCards.put(cardName, lastAdded);
     }
 
     // Single fetch
diff --git a/src/main/java/forge/card/CardRarity.java b/src/main/java/forge/card/CardRarity.java
index 80abc38c98d..13e7cedb482 100644
--- a/src/main/java/forge/card/CardRarity.java
+++ b/src/main/java/forge/card/CardRarity.java
@@ -13,7 +13,8 @@ public enum CardRarity {
     Uncommon("U"),
     Rare("R"),
     MythicRare("M"),
-    Special("S"); // Timeshifted
+    Special("S"), // Timeshifted
+    Unknown("?"); // In development
 
     private final String strValue;
     private CardRarity(final String sValue) {
diff --git a/src/main/java/forge/card/CardRules.java b/src/main/java/forge/card/CardRules.java
index 921be89ae55..26f993fa77e 100644
--- a/src/main/java/forge/card/CardRules.java
+++ b/src/main/java/forge/card/CardRules.java
@@ -86,6 +86,10 @@ public final class CardRules {
         } else if (cardType.isPlaneswalker()) {
             this.loyalty = ptLine;
         }
+
+        if (setsData.isEmpty()) {
+            setsData.put("???", new CardInSet(CardRarity.Unknown, 1));
+        }
         setsPrinted = setsData;
     }
 
diff --git a/src/main/java/forge/card/cardFactory/PreloadingCardFactory.java b/src/main/java/forge/card/cardFactory/PreloadingCardFactory.java
index c703aec2918..59a3f0ecdb7 100644
--- a/src/main/java/forge/card/cardFactory/PreloadingCardFactory.java
+++ b/src/main/java/forge/card/cardFactory/PreloadingCardFactory.java
@@ -81,12 +81,7 @@ public class PreloadingCardFactory extends AbstractCardFactory {
         // this fills in our map of card names to Card instances.
         read.run();
         CardDb.setup(listCardRules.iterator());
-        
-        List<String> skipped = CardDb.getSkippedCards();
-        if (!skipped.isEmpty()) {
-            String message = String.format("The following cards are lacking of correct SetInfo: %s", StringUtils.join(skipped, ", "));
-            ErrorViewer.showError(message);
-        }
+
     } // readCard()
 
 } //end class PreloadingCardFactory