github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Showing used sets also for finished tournaments, showing start time of match or tournament in table view creation time column as the match or tournament is started.

Browse source
This commit is contained in:
LevelX2 2013-10-09 17:10:19 +02:00
parent d34779fa68
commit a26b8947d0
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Common/src/mage/view/MatchView.java
View file

@ -86,7 +86,7 @@ public class MatchView implements Serializable {
this.matchId = table.getTournament().getId();
this.matchName = table.getName();
this.gameType = table.getGameType();
this.deckType = table.getDeckType();
this.deckType = new StringBuilder(table.getDeckType()).append(" ").append(table.getTournament().getSetsFormatedShort()).toString();
StringBuilder sb1 = new StringBuilder();
for (TournamentPlayer tPlayer : table.getTournament().getPlayers()) {

10
Mage.Common/src/mage/view/TableView.java
View file

@ -66,8 +66,16 @@ public class TableView implements Serializable {
this.gameType = table.getGameType();
this.tableName = table.getName();
this.controllerName = table.getControllerName();
this.createTime = table.getCreateTime();
this.tableState = table.getState();
if (table.getState().equals(TableState.WAITING) || table.getState().equals(TableState.WAITING)) {
this.createTime = table.getCreateTime();
} else {
if (table.isTournament()) {
this.createTime = table.getTournament().getStartTime();
} else {
this.createTime = table.getMatch().getStartTime();
}
}
this.isTournament = table.isTournament();
for (Seat seat: table.getSeats()) {
seats.add(new SeatView(seat));