From c88093d699dd63f2146131ec2ea8b70736b6b257 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 31 Mar 2013 20:13:04 +0200 Subject: [PATCH] The table list of current matches / tournaments shows now all names of players. --- .../java/mage/client/table/TablesPanel.java | 2 +- Mage.Common/src/mage/view/TableView.java | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java index 87299957b40..dfd93f255dc 100644 --- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java @@ -600,7 +600,7 @@ private void chkShowCompletedActionPerformed(java.awt.event.ActionEvent evt) {// } class TableTableModel extends AbstractTableModel { - private String[] columnNames = new String[]{"Match Name", "Owner", "Game Type", "Deck Type", "Info", "Status", "Created", "Action"}; + private String[] columnNames = new String[]{"Match Name", "Owner / Players", "Game Type", "Deck Type", "Info", "Status", "Created", "Action"}; private TableView[] tables = new TableView[0]; private static final DateFormat timeFormatter = SimpleDateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT); diff --git a/Mage.Common/src/mage/view/TableView.java b/Mage.Common/src/mage/view/TableView.java index 9d4ef14e825..ca81f247d5e 100644 --- a/Mage.Common/src/mage/view/TableView.java +++ b/Mage.Common/src/mage/view/TableView.java @@ -37,6 +37,8 @@ import mage.Constants.TableState; import mage.game.Game; import mage.game.Seat; import mage.game.Table; +import mage.game.match.MatchPlayer; +import mage.game.tournament.TournamentPlayer; /** * @@ -74,8 +76,22 @@ public class TableView implements Serializable { for (Game game: table.getMatch().getGames()) { games.add(game.getId()); } + StringBuilder sb = new StringBuilder(); + for(MatchPlayer matchPlayer: table.getMatch().getPlayers()) { + if (!matchPlayer.getPlayer().getName().equals(table.getControllerName())) { + sb.append(", ").append(matchPlayer.getPlayer().getName()); + } + } + this.controllerName += sb.toString(); } else { - StringBuilder sb = new StringBuilder("Seats: ").append(table.getTournament().getPlayers().size()).append("/").append(table.getNumberOfSeats()); + StringBuilder sb1 = new StringBuilder(); + for (TournamentPlayer tp: table.getTournament().getPlayers()) { + if (!tp.getPlayer().getName().equals(table.getControllerName())) { + sb1.append(", ").append(tp.getPlayer().getName()); + } + } + this.controllerName += sb1.toString(); + StringBuilder sb = new StringBuilder("Seats: ").append(table.getTournament().getPlayers().size()).append("/").append(table.getNumberOfSeats()); if (table.getState().equals(TableState.DUELING)) { sb.append(" - Running round: ").append(table.getTournament().getRounds().size()); }