ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Last changes before deploying test queue to production server.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-07-04 10:23:45 +00:00
parent 7897e1bb8e
commit a1d260a2b0
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallInfoVisitor.java
View File

@@ -9,5 +9,5 @@ public interface HallInfoVisitor {
public void runningPlayerGame(String gameId); public void runningPlayerGame(String gameId);
public void visitTournamentQueue(String tournamentQueueKey, String collectionName, String formatName, String tournamentQueueName, int playerCount, boolean playerSignedUp); public void visitTournamentQueue(String tournamentQueueKey, int cost, String collectionName, String formatName, String tournamentQueueName, int playerCount, boolean playerSignedUp);
} }

6
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
View File

@@ -63,7 +63,7 @@ public class HallServer extends AbstractServer {
_runningTournaments.addAll(tournamentService.getLiveTournaments()); _runningTournaments.addAll(tournamentService.getLiveTournaments());
_tournamentQueues.put("fotr_queue", new SingleEliminationRecurringQueue(0, "fotr_block", _tournamentQueues.put("fotr_queue", new SingleEliminationRecurringQueue(0, "fotr_block",
new CollectionType("default", "All cards"), "fotrQueue-", "Fellowship Block 4-man", 2, new CollectionType("default", "All cards"), "fotrQueue-", "Test Fellowship Block 4-man", 4,
tournamentService)); tournamentService));
} }
@@ -280,7 +280,7 @@ public class HallServer extends AbstractServer {
for (Map.Entry<String, TournamentQueue> tournamentQueueEntry : _tournamentQueues.entrySet()) { for (Map.Entry<String, TournamentQueue> tournamentQueueEntry : _tournamentQueues.entrySet()) {
String tournamentQueueKey = tournamentQueueEntry.getKey(); String tournamentQueueKey = tournamentQueueEntry.getKey();
TournamentQueue tournamentQueue = tournamentQueueEntry.getValue(); TournamentQueue tournamentQueue = tournamentQueueEntry.getValue();
visitor.visitTournamentQueue(tournamentQueueKey, tournamentQueue.getCollectionType().getFullName(), visitor.visitTournamentQueue(tournamentQueueKey, tournamentQueue.getCost(), tournamentQueue.getCollectionType().getFullName(),
tournamentQueue.getFormat(), tournamentQueue.getTournamentQueueName(), tournamentQueue.getFormat(), tournamentQueue.getTournamentQueueName(),
tournamentQueue.getPlayerCount(), tournamentQueue.isPlayerSignedUp(player.getName())); tournamentQueue.getPlayerCount(), tournamentQueue.isPlayerSignedUp(player.getName()));
} }
@@ -538,7 +538,7 @@ public class HallServer extends AbstractServer {
@Override @Override
public void broadcastMessage(String message) { public void broadcastMessage(String message) {
_hallChat.sendMessage("System", message); _hallChat.sendMessage("TournamentSystem", message);
} }
} }
} }

5
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationRecurringQueue.java
View File

@@ -34,6 +34,11 @@ public class SingleEliminationRecurringQueue implements TournamentQueue {
_tournamentService = tournamentService; _tournamentService = tournamentService;
} }
@Override
public int getCost() {
return _cost;
}
@Override @Override
public String getFormat() { public String getFormat() {
return _format; return _format;

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TournamentQueue.java
View File

@@ -6,6 +6,8 @@ import com.gempukku.lotro.game.Player;
import com.gempukku.lotro.logic.vo.LotroDeck; import com.gempukku.lotro.logic.vo.LotroDeck;
public interface TournamentQueue { public interface TournamentQueue {
public int getCost();
public String getFormat(); public String getFormat();
public CollectionType getCollectionType(); public CollectionType getCollectionType();

3
gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/HallResource.java
View File

@@ -267,10 +267,11 @@ public class HallResource extends AbstractResource {
} }
@Override @Override
public void visitTournamentQueue(String tournamentQueueKey, String collectionName, String formatName, public void visitTournamentQueue(String tournamentQueueKey, int cost, String collectionName, String formatName,
String tournamentQueueName, int playerCount, boolean playerSignedUp) { String tournamentQueueName, int playerCount, boolean playerSignedUp) {
Element tournamentQueue = _doc.createElement("tournamentQueue"); Element tournamentQueue = _doc.createElement("tournamentQueue");
tournamentQueue.setAttribute("id", tournamentQueueKey); tournamentQueue.setAttribute("id", tournamentQueueKey);
tournamentQueue.setAttribute("cost", String.valueOf(cost));
tournamentQueue.setAttribute("tournament", tournamentQueueName); tournamentQueue.setAttribute("tournament", tournamentQueueName);
tournamentQueue.setAttribute("players", String.valueOf(playerCount)); tournamentQueue.setAttribute("players", String.valueOf(playerCount));
tournamentQueue.setAttribute("format", formatName); tournamentQueue.setAttribute("format", formatName);