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 868da4a12f6..db7f2df17eb 100644 --- a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java +++ b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java @@ -517,7 +517,7 @@ class TournamentMatchesTableModel extends AbstractTableModel { private boolean watchingAllowed; public void loadData(TournamentView tournament) { - List views = new ArrayList(); + List views = new ArrayList<>(); watchingAllowed = tournament.isWatchingAllowed(); for (RoundView round: tournament.getRounds()) { for (TournamentGameView game: round.getGames()) { diff --git a/Mage.Common/src/mage/view/TournamentPlayerView.java b/Mage.Common/src/mage/view/TournamentPlayerView.java index 812941885e1..658dc172452 100644 --- a/Mage.Common/src/mage/view/TournamentPlayerView.java +++ b/Mage.Common/src/mage/view/TournamentPlayerView.java @@ -36,7 +36,7 @@ import mage.game.tournament.TournamentPlayer; * * @author BetaSteward_at_googlemail.com */ -public class TournamentPlayerView implements Serializable { +public class TournamentPlayerView implements Serializable, Comparable{ private static final long serialVersionUID = 1L; private final String name; @@ -77,4 +77,9 @@ public class TournamentPlayerView implements Serializable { return quit; } + @Override + public int compareTo(Object t) { + return ((TournamentPlayerView) t).getPoints() - this.getPoints(); + } + } diff --git a/Mage.Common/src/mage/view/TournamentView.java b/Mage.Common/src/mage/view/TournamentView.java index 1442764001d..5dba991e2a0 100644 --- a/Mage.Common/src/mage/view/TournamentView.java +++ b/Mage.Common/src/mage/view/TournamentView.java @@ -30,6 +30,7 @@ package mage.view; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; import mage.game.tournament.Round; @@ -51,9 +52,10 @@ public class TournamentView implements Serializable { private final boolean watchingAllowed; - private final List rounds = new ArrayList(); - private final List players = new ArrayList(); + private final List rounds = new ArrayList<>(); + private final List players = new ArrayList<>(); + @SuppressWarnings("unchecked") public TournamentView(Tournament tournament) { tournamentName = tournament.getOptions().getName(); @@ -65,6 +67,7 @@ public class TournamentView implements Serializable { for (TournamentPlayer player: tournament.getPlayers()) { players.add(new TournamentPlayerView(player)); } + Collections.sort(players); for (Round round: tournament.getRounds()) { rounds.add(new RoundView(round)); } diff --git a/Mage/src/mage/game/tournament/TournamentImpl.java b/Mage/src/mage/game/tournament/TournamentImpl.java index 53a0658287f..3d7f168916a 100644 --- a/Mage/src/mage/game/tournament/TournamentImpl.java +++ b/Mage/src/mage/game/tournament/TournamentImpl.java @@ -59,13 +59,13 @@ import org.apache.log4j.Logger; public abstract class TournamentImpl implements Tournament { protected UUID id = UUID.randomUUID(); - protected List rounds = new CopyOnWriteArrayList(); - protected Map players = new HashMap(); + protected List rounds = new CopyOnWriteArrayList<>(); + protected Map players = new HashMap<>(); protected static Random rnd = new Random(); protected String matchName; protected TournamentOptions options; protected TournamentType tournamentType; - protected List sets = new ArrayList(); + protected List sets = new ArrayList<>(); protected String setsInfoShort; protected TableEventSource tableEventSource = new TableEventSource();