From f6ef3fdd89b3af9e7bc820f63caea28280d56800 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Thu, 3 May 2012 05:47:51 +0400
Subject: [PATCH] Fixed CollectionViewer with layoyt config not set on startup.

---
 .../deckeditor/collection/viewer/CollectionViewerPanel.java  | 2 +-
 .../mage/client/deckeditor/collection/viewer/MageBook.java   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java
index d528e0d1268..95291ae2730 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java
@@ -43,7 +43,7 @@ import java.awt.event.ActionListener;
  */
 public final class CollectionViewerPanel extends JPanel {
 
-    private static String LAYOYT_CONFIG_KEY = "collectionViewerLayoutConfig";
+    protected static String LAYOYT_CONFIG_KEY = "collectionViewerLayoutConfig";
 
     public CollectionViewerPanel() {
         initComponents();
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
index af6dbf95fb8..5c56a5de72d 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
@@ -31,6 +31,7 @@ package mage.client.deckeditor.collection.viewer;
 import mage.cards.Card;
 import mage.cards.CardDimensions;
 import mage.cards.MageCard;
+import mage.client.MageFrame;
 import mage.client.cards.BigCard;
 import mage.client.cards.CardsStorage;
 import mage.client.components.HoverButton;
@@ -70,7 +71,8 @@ public class MageBook extends JComponent {
         super();
         this.bigCard = bigCard;
         this.setsToDisplay = ConstructedFormats.getSetsByFormat(ConstructedFormats.getDefault());
-        this.conf = new _3x3Configuration();
+        boolean selected3x3 = MageFrame.getPreferences().get(CollectionViewerPanel.LAYOYT_CONFIG_KEY, MageBook.LAYOUT_3x3).equals(MageBook.LAYOUT_3x3);
+        this.conf = selected3x3 ? new _3x3Configuration() : new _4x4Configuration();
         initComponents();
     }
 
@@ -321,7 +323,6 @@ public class MageBook extends JComponent {
     public void updateSize(String size) {
         if (size.equals(LAYOUT_3x3)) {
             this.conf = new _3x3Configuration();
-
         } else if (size.equals(LAYOUT_4x4)) {
             this.conf = new _4x4Configuration();
         } else {