From 3af0532623e1a25561b80328f17531fe01d820a2 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Fri, 27 Sep 2013 00:16:20 +0200
Subject: [PATCH] * MageBook - Won't be loaded by default if the client starts.

---
 .../collection/viewer/MageBook.java           |  1 +
 .../client/util/sets/ConstructedFormats.java  | 19 +++++++++++--------
 .../mage/cards/repository/CardCriteria.java   | 12 ++++++++++--
 .../mage/cards/repository/CardRepository.java |  1 -
 4 files changed, 22 insertions(+), 11 deletions(-)

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 aaf1ebf961f..c4847696d39 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
@@ -268,6 +268,7 @@ public class MageBook extends JComponent {
     private List<CardInfo> getCards(int page, String set) {
         CardCriteria criteria = new CardCriteria();
         criteria.setCodes(set).start((long) page * conf.CARDS_PER_PAGE).count((long) conf.CARDS_PER_PAGE + 1);
+        criteria.setOrderBy("cardNumber");
         List<CardInfo> cards = CardRepository.instance.findCards(criteria);
         if (cards.size() > conf.CARDS_PER_PAGE) {
             pageRight.setVisible(true);
diff --git a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java
index 281c04e0812..e26282a9716 100644
--- a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java
+++ b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java
@@ -7,6 +7,7 @@ import java.util.GregorianCalendar;
 import java.util.List;
 import mage.cards.repository.ExpansionInfo;
 import mage.cards.repository.ExpansionRepository;
+import mage.constants.SetType;
 
 /**
  * Utility class for constructed formats (expansions and other editions).
@@ -391,14 +392,16 @@ public class ConstructedFormats {
 
     private static void buildLists() {
         for (ExpansionInfo set : ExpansionRepository.instance.getAll()) {
-            if (set.getReleaseDate().after(standardDate)) {
-                standard.add(set.getCode());
-            }
-            if (set.getReleaseDate().after(extendedDate)) {
-                extended.add(set.getCode());
-            }
-            if (set.getReleaseDate().after(modernDate)) {
-                modern.add(set.getCode());
+            if (!set.getType().equals(SetType.REPRINT)) {
+                if (set.getReleaseDate().after(standardDate)) {
+                    standard.add(set.getCode());
+                }
+                if (set.getReleaseDate().after(extendedDate)) {
+                    extended.add(set.getCode());
+                }
+                if (set.getReleaseDate().after(modernDate)) {
+                    modern.add(set.getCode());
+                }
             }
         }
     }
diff --git a/Mage/src/mage/cards/repository/CardCriteria.java b/Mage/src/mage/cards/repository/CardCriteria.java
index eefb8f92259..0209020ae4c 100644
--- a/Mage/src/mage/cards/repository/CardCriteria.java
+++ b/Mage/src/mage/cards/repository/CardCriteria.java
@@ -59,6 +59,7 @@ public class CardCriteria {
     private boolean red;
     private boolean white;
     private boolean colorless;
+    private String sortBy;
     private Long start;
     private Long count;
 
@@ -169,6 +170,11 @@ public class CardCriteria {
         return this;
     }
 
+    public CardCriteria setOrderBy(String sortBy) {
+        this.sortBy = sortBy;
+        return this;
+    }
+
     public void buildQuery(QueryBuilder qb) throws SQLException {
         Where where = qb.where();
         where.eq("nightCard", false);
@@ -279,7 +285,9 @@ public class CardCriteria {
         if (count != null) {
             qb.limit(count);
         }
-
-        // qb.orderBy("cardNumber", true);
+        
+        if (sortBy != null) {
+            qb.orderBy(sortBy, true);
+        }
     }
 }
diff --git a/Mage/src/mage/cards/repository/CardRepository.java b/Mage/src/mage/cards/repository/CardRepository.java
index d95d45061ff..4980a0fa6d9 100644
--- a/Mage/src/mage/cards/repository/CardRepository.java
+++ b/Mage/src/mage/cards/repository/CardRepository.java
@@ -44,7 +44,6 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.Callable;
 import mage.constants.CardType;
-import org.apache.log4j.Logger;
 
 /**
  *