From 24470a4abfc7cb1542661e5c04ff04a4479facae Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 13 Oct 2016 11:40:17 +0200 Subject: [PATCH] Some minor changes. --- Mage.Client/serverlist.txt | 3 +-- .../src/main/java/mage/client/cards/DragCardGrid.java | 7 +++++-- .../main/java/mage/cards/repository/RepositoryUtil.java | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Mage.Client/serverlist.txt b/Mage.Client/serverlist.txt index 074dc0be88e..e4c7e0a490c 100644 --- a/Mage.Client/serverlist.txt +++ b/Mage.Client/serverlist.txt @@ -1,7 +1,6 @@ XMage.de 1 (Europe/Germany) fast :xmage.de:17171 woogerworks (North America/USA) :xmage.woogerworks.com:17171 -XMage Testserver (Europe/France) 1.4.8v0 :176.31.186.181:17171 -XMage BR (South America/Brazil) :ec2-54-233-67-0.sa-east-1.compute.amazonaws.com:17171 +woogerworks replacment (North America/USA) :158.69.192.238:17171 XMage.tahiti :xmage.tahiti.one:443 Seedds Server (Asia) :115.29.203.80:17171 localhost -> connect to your local server (must be started):localhost:17171 diff --git a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java index 373ce217b4e..5142df5596f 100644 --- a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java @@ -825,8 +825,11 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg // Load separate creatures setting separateCreatures = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_DECK_EDITOR_LAST_SEPARATE_CREATURES, "false").equals("true"); - cardSort = Sort.valueOf(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_DECK_EDITOR_LAST_SORT, Sort.NONE.toString())); - + try { + cardSort = Sort.valueOf(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_DECK_EDITOR_LAST_SORT, Sort.NONE.toString())); + } catch (IllegalArgumentException ex) { + cardSort = Sort.NONE; + } // Sort popup { sortPopup = new JPopupMenu(); diff --git a/Mage/src/main/java/mage/cards/repository/RepositoryUtil.java b/Mage/src/main/java/mage/cards/repository/RepositoryUtil.java index 2afeb50ceee..b535e380ff1 100644 --- a/Mage/src/main/java/mage/cards/repository/RepositoryUtil.java +++ b/Mage/src/main/java/mage/cards/repository/RepositoryUtil.java @@ -53,6 +53,7 @@ public class RepositoryUtil { } public static long getDatabaseVersion(ConnectionSource connectionSource, String entityName) throws SQLException { + TableUtils.createTableIfNotExists(connectionSource, DatabaseVersion.class); Dao dbVersionDao = DaoManager.createDao(connectionSource, DatabaseVersion.class); QueryBuilder queryBuilder = dbVersionDao.queryBuilder(); @@ -61,9 +62,8 @@ public class RepositoryUtil { if (dbVersions.isEmpty()) { return 0; } else { - return dbVersions.get(0). getVersion(); + return dbVersions.get(0).getVersion(); } } - }