From 71398d6d8342bdbfb54e1afc1eee4c8d1485bcfd Mon Sep 17 00:00:00 2001 From: ingmargoudt Date: Fri, 16 Sep 2016 08:58:02 +0200 Subject: [PATCH] added some missing session references --- .../main/java/mage/client/SessionHandler.java | 19 +++++++++++++++++++ .../main/java/mage/client/cards/CardGrid.java | 2 +- .../client/deckeditor/DeckEditorPanel.java | 2 +- .../client/dialog/RegisterUserDialog.java | 7 ++----- .../client/dialog/ResetPasswordDialog.java | 10 +++------- .../client/dialog/TableWaitingDialog.java | 2 +- .../client/tournament/TournamentPanel.java | 2 +- 7 files changed, 28 insertions(+), 16 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/SessionHandler.java b/Mage.Client/src/main/java/mage/client/SessionHandler.java index 962defbb7e6..b99b42e4607 100644 --- a/Mage.Client/src/main/java/mage/client/SessionHandler.java +++ b/Mage.Client/src/main/java/mage/client/SessionHandler.java @@ -313,4 +313,23 @@ public class SessionHandler { return session.sendPlayerManaType(gameId, playerId, data); } + public static TableView getTable(UUID roomId, UUID tableId) { + return session.getTable(roomId, tableId); + } + + public static void updateDeck(UUID tableId, DeckCardLists deckCardLists) { + session.updateDeck(tableId, deckCardLists); + } + + public static boolean emailAuthToken(Connection connection) { + return session.emailAuthToken(connection); + } + + public static boolean resetPassword(Connection connection) { + return session.resetPassword(connection); + } + + public static boolean register(Connection connection) { + return session.register(connection); + } } diff --git a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java index ce6051f0937..e1b407004b0 100644 --- a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java @@ -149,7 +149,7 @@ public class CardGrid extends javax.swing.JLayeredPane implements MouseListener, int numColumns = maxWidth / cardDimension.width; int curColumn = 0; int curRow = 0; - if (cards.size() > 0) { + if (!cards.isEmpty()) { Rectangle rectangle = new Rectangle(cardDimension.width, cardDimension.height); List sortedCards = new ArrayList<>(cards.values()); switch (sortSetting.getSortBy()) { diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java index 55742aff309..266562a8d88 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java @@ -958,7 +958,7 @@ class UpdateDeckTask extends SwingWorker { @Override protected Void doInBackground() throws Exception { while (!isCancelled()) { - session.updateDeck(tableId, deck.getDeckCardLists()); + SessionHandler.updateDeck(tableId, deck.getDeckCardLists()); Thread.sleep(5000); } return null; diff --git a/Mage.Client/src/main/java/mage/client/dialog/RegisterUserDialog.java b/Mage.Client/src/main/java/mage/client/dialog/RegisterUserDialog.java index 54096eeb626..44449e8db10 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/RegisterUserDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/RegisterUserDialog.java @@ -6,10 +6,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import javax.swing.SwingWorker; import mage.client.MageFrame; +import mage.client.SessionHandler; import mage.client.preference.MagePreferences; import mage.remote.Connection; -import mage.remote.Session; -import mage.remote.SessionImpl; import org.apache.log4j.Logger; public class RegisterUserDialog extends MageDialog { @@ -18,7 +17,6 @@ public class RegisterUserDialog extends MageDialog { private ConnectDialog connectDialog; private Connection connection; private ConnectTask task; - private Session session; /** * Creates new form RegisterUserDialog @@ -226,8 +224,7 @@ public class RegisterUserDialog extends MageDialog { protected Boolean doInBackground() throws Exception { lblStatus.setText("Connecting..."); btnRegister.setEnabled(false); - session = new SessionImpl(MageFrame.getInstance()); - result = session.register(connection); + result = SessionHandler.register(connection); return result; } diff --git a/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.java index 868ee2818e9..e1c2cd65a73 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/ResetPasswordDialog.java @@ -6,10 +6,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import javax.swing.SwingWorker; import mage.client.MageFrame; +import mage.client.SessionHandler; import mage.client.preference.MagePreferences; import mage.remote.Connection; -import mage.remote.Session; -import mage.remote.SessionImpl; import org.apache.log4j.Logger; public class ResetPasswordDialog extends MageDialog { @@ -17,7 +16,6 @@ public class ResetPasswordDialog extends MageDialog { private static final Logger logger = Logger.getLogger(ResetPasswordDialog.class); private ConnectDialog connectDialog; private Connection connection; - private Session session; private GetAuthTokenTask getAuthTokenTask; private ResetPasswordTask resetPasswordTask; @@ -328,8 +326,7 @@ public class ResetPasswordDialog extends MageDialog { protected Boolean doInBackground() throws Exception { lblStatus.setText("Connecting..."); disableButtons(); - session = new SessionImpl(MageFrame.getInstance()); - result = session.emailAuthToken(connection); + result = SessionHandler.emailAuthToken(connection); return result; } @@ -371,8 +368,7 @@ public class ResetPasswordDialog extends MageDialog { protected Boolean doInBackground() throws Exception { lblStatus.setText("Connecting..."); disableButtons(); - session = new SessionImpl(MageFrame.getInstance()); - result = session.resetPassword(connection); + result = SessionHandler.resetPassword(connection); return result; } diff --git a/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java b/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java index a2565bf717f..90c0d5c4113 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java @@ -432,7 +432,7 @@ class UpdateSeatsTask extends SwingWorker { @Override protected Void doInBackground() throws Exception { while (!isCancelled()) { - this.publish(session.getTable(roomId, tableId)); + this.publish(SessionHandler.getTable(roomId, tableId)); Thread.sleep(1000); } return null; diff --git a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java index 01ed13a76a4..98554d35183 100644 --- a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java +++ b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java @@ -746,7 +746,7 @@ class UpdateTournamentTask extends SwingWorker { @Override protected void process(List view) { - if (view != null && view.size() > 0) { // if user disconnects, view can be null for a short time + if (view != null && !view.isEmpty()) { // if user disconnects, view can be null for a short time panel.update(view.get(0)); } }