From 1c157a20aec4d4135e09a9f321adbdd8e9390fd1 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 3 Jul 2015 22:44:08 +0200 Subject: [PATCH] * Fixed a bug caused by now possible column order setting in tournament panel. --- .../main/java/mage/client/tournament/TournamentPanel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 1d76e09ae52..576bdbf4cf0 100644 --- a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java +++ b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java @@ -113,8 +113,8 @@ public class TournamentPanel extends javax.swing.JPanel { public void actionPerformed(ActionEvent e) { int modelRow = Integer.valueOf(e.getActionCommand()); - String state = (String) tableMatches.getValueAt(modelRow, 2); - String actionText = (String) tableMatches.getValueAt(modelRow, TournamentMatchesTableModel.ACTION_COLUMN); + String state = (String) tableMatches.getValueAt(modelRow, tableMatches.convertColumnIndexToView(2)); + String actionText = (String) tableMatches.getValueAt(modelRow, tableMatches.convertColumnIndexToView(TournamentMatchesTableModel.ACTION_COLUMN)); UUID tableId = UUID.fromString((String) matchesModel.getValueAt(modelRow, TournamentMatchesTableModel.ACTION_COLUMN + 1)); UUID gameId = UUID.fromString((String) matchesModel.getValueAt(modelRow, TournamentMatchesTableModel.ACTION_COLUMN + 3)); @@ -130,7 +130,7 @@ public class TournamentPanel extends javax.swing.JPanel { }; // action button, don't delete this - ButtonColumn buttonColumn = new ButtonColumn(tableMatches, action, TournamentMatchesTableModel.ACTION_COLUMN); + ButtonColumn buttonColumn = new ButtonColumn(tableMatches, action, tableMatches.convertColumnIndexToView(TournamentMatchesTableModel.ACTION_COLUMN)); }