From 7ea23a1ba143308ea674b4ad7e258c78feaf7f62 Mon Sep 17 00:00:00 2001 From: North Date: Sat, 20 Oct 2012 17:22:23 +0300 Subject: [PATCH] Added CardRepository initialization --- Mage.Client/src/main/java/mage/client/MageFrame.java | 2 ++ .../mage/client/deckeditor/collection/viewer/TestMageBook.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index d2952767faf..e70dc45caa4 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -93,6 +93,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.prefs.Preferences; +import mage.cards.repository.CardScanner; /** * @author BetaSteward_at_googlemail.com @@ -974,6 +975,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { }); SwingUtilities.invokeLater(new Runnable() { public void run() { + CardScanner.scan(); for (String arg : args) { if (arg.startsWith(liteModeArg)) { liteMode = true; diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/TestMageBook.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/TestMageBook.java index 1307c175c10..91d75c815b4 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/TestMageBook.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/TestMageBook.java @@ -3,6 +3,7 @@ package mage.client.deckeditor.collection.viewer; import mage.client.plugins.impl.Plugins; import javax.swing.*; +import mage.cards.repository.CardScanner; import org.mage.card.arcane.ManaSymbols; /** @@ -12,6 +13,7 @@ public class TestMageBook extends JFrame { public static void main(String[] args) { Plugins.getInstance().loadPlugins(); ManaSymbols.loadImages(); + CardScanner.scan(); JFrame frame = new TestMageBook(); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.add(new MageBook(null));