From e74732602833ba58b299428dcb834c9e7770b17b Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 3 Nov 2014 17:21:57 +0100
Subject: [PATCH] Added logger message to card DB exception.

---
 .../src/main/java/mage/client/deckeditor/CardSelector.java  | 6 +++++-
 Mage/src/mage/cards/repository/CardCriteria.java            | 2 +-
 Mage/src/mage/cards/repository/CardRepository.java          | 2 ++
 Mage/src/mage/cards/repository/CardScanner.java             | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
index f54c1fcd9d4..bd7c4c6977b 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
@@ -311,7 +311,11 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
         }
         if (this.tbPlaneswalkers.isSelected()) {
             criteria.types(CardType.PLANESWALKER);
-        }
+        }        
+        // criteria.types(CardType.TRIBAL);
+        // criteria.types(CardType.CONSPIRACY);
+        
+        
 
         if (this.cbExpansionSet.isVisible()) {
             String expansionSelection = this.cbExpansionSet.getSelectedItem().toString();
diff --git a/Mage/src/mage/cards/repository/CardCriteria.java b/Mage/src/mage/cards/repository/CardCriteria.java
index ccf251e87a0..3f33e19da69 100644
--- a/Mage/src/mage/cards/repository/CardCriteria.java
+++ b/Mage/src/mage/cards/repository/CardCriteria.java
@@ -219,7 +219,7 @@ public class CardCriteria {
         }
 
 
-        if (types.size() != 9) { //if all types selected - no selection needed
+        if (types.size() != 7) { //if all types selected - no selection needed (Tribal and Conspiracy not selectable yet)
             for (CardType type : types) {
                 where.like("types", new SelectArg('%' + type.name() + '%'));
             }
diff --git a/Mage/src/mage/cards/repository/CardRepository.java b/Mage/src/mage/cards/repository/CardRepository.java
index 2da73fb9740..669e1ba3a28 100644
--- a/Mage/src/mage/cards/repository/CardRepository.java
+++ b/Mage/src/mage/cards/repository/CardRepository.java
@@ -44,6 +44,7 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.Callable;
 import mage.constants.CardType;
+import org.apache.log4j.Logger;
 
 /**
  *
@@ -94,6 +95,7 @@ public enum CardRepository {
                             }
                         }
                     } catch (SQLException ex) {
+                        Logger.getLogger(CardRepository.class).error("Error adding cards to DB: " + ex.getCause());
                     }
                     return null;
                 }
diff --git a/Mage/src/mage/cards/repository/CardScanner.java b/Mage/src/mage/cards/repository/CardScanner.java
index 0cce67bf8a2..23634c1349f 100644
--- a/Mage/src/mage/cards/repository/CardScanner.java
+++ b/Mage/src/mage/cards/repository/CardScanner.java
@@ -50,8 +50,8 @@ public class CardScanner {
         }
         scanned = true;
 
-        List<CardInfo> cardsToAdd = new ArrayList<CardInfo>();
-        List<String> packages = new ArrayList<String>();
+        List<CardInfo> cardsToAdd = new ArrayList<>();
+        List<String> packages = new ArrayList<>();
 
         for (ExpansionSet set : Sets.getInstance().values()) {
             packages.add(set.getPackageName());