From 758b6294e5b36268044fd6be4ddfc5f97e32c64a Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Sat, 8 Jun 2013 15:11:33 +0000
Subject: [PATCH] a right overload of message is wrapped into a
 wait-till-edt-executes loop carddb will include MMA in stats if the latter
 are collected

---
 src/main/java/forge/card/CardDb.java   |  4 ++--
 src/main/java/forge/gui/GuiDialog.java | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/forge/card/CardDb.java b/src/main/java/forge/card/CardDb.java
index f7e6b79e0a3..b97ba770f24 100644
--- a/src/main/java/forge/card/CardDb.java
+++ b/src/main/java/forge/card/CardDb.java
@@ -71,7 +71,7 @@ public final class CardDb implements ICardDatabase {
         synchronized (CardDb.class) {
             if (CardDb.commonCards == null) { // It's broken under 1.4 and below, on 1.5+ works again!
                 CardSorter cs = new CardSorter(rules);
-                commonCards = new CardDb(cs.regularCards, editions, false /*true*/);
+                commonCards = new CardDb(cs.regularCards, editions, false);
                 variantCards = new CardDb(cs.variantsCards, editions, false);
             }
         }
@@ -99,7 +99,7 @@ public final class CardDb implements ICardDatabase {
         this.rulesByName = rules;
         List<String> missingCards = new ArrayList<String>();
         for(CardEdition e : editions) {
-            boolean worthLogging = logMissingCards && ( e.getType() == Type.CORE || e.getType() == Type.EXPANSION );
+            boolean worthLogging = logMissingCards && ( e.getType() == Type.CORE || e.getType() == Type.EXPANSION || e.getType() == Type.REPRINT );
             if(worthLogging)
                 System.out.print(e.getName() + " (" + e.getCards().length + " cards)");
             String lastCardName = null;
diff --git a/src/main/java/forge/gui/GuiDialog.java b/src/main/java/forge/gui/GuiDialog.java
index 6ea6fba11f6..26cfcab084f 100644
--- a/src/main/java/forge/gui/GuiDialog.java
+++ b/src/main/java/forge/gui/GuiDialog.java
@@ -67,17 +67,17 @@ public class GuiDialog {
      *            a {@link java.lang.String} object.
      */
     public static void message(final String message) {
-        FThreads.invokeInEdtAndWait( new Runnable() {
-            @Override
-            public void run() {
+
                 message(message, UIManager.getString("OptionPane.messageDialogTitle"));
-            }
-        });
     }
 
-    public static void message(final String message, String title) {
-        
-        JOptionPane.showMessageDialog(null, message, title, JOptionPane.PLAIN_MESSAGE);
+    public static void message(final String message, final String title) {
+        FThreads.invokeInEdtAndWait(new Runnable() {
+            @Override
+            public void run() {
+                JOptionPane.showMessageDialog(null, message, title, JOptionPane.PLAIN_MESSAGE);
+            }
+        });
     }
 
     /**