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

Adding format name to table.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-10-05 11:11:34 +00:00
parent 198082263e
commit 6810c69ee5
5 changed files with 25 additions and 8 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

@@ -5,7 +5,7 @@ import java.util.Set;
public interface HallInfoVisitor {
public void playerIsWaiting(boolean waiting);
public void visitTable(String tableId, String gameId, String tableStatus, Set<String> playerIds);
public void visitTable(String tableId, String gameId, String tableStatus, String formatName, Set<String> playerIds);
public void runningPlayerGame(String gameId);
}

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

@@ -23,9 +23,12 @@ public class HallServer extends AbstractServer {
private Map<String, String> _supportedFormatNames = new HashMap<String, String>();
private Map<String, LotroFormat> _supportedFormats = new HashMap<String, LotroFormat>();
private Map<String, String> _formatCollectionIds = new HashMap<String, String>();
// TODO Reading/writing from/to these maps is done in multiple threads
private Map<String, AwaitingTable> _awaitingTables = new ConcurrentHashMap<String, AwaitingTable>();
private Map<String, String> _runningTables = new ConcurrentHashMap<String, String>();
private Map<String, String> _runningTableFormatNames = new ConcurrentHashMap<String, String>();
private int _nextTableId = 1;
private final int _playerInactivityPeriod = 1000 * 10; // 10 seconds
@@ -41,9 +44,11 @@ public class HallServer extends AbstractServer {
_supportedFormatNames.put("fotr_block", "FotR Block");
_supportedFormats.put("fotr_block", new FotRBlockFormat(_lotroServer.getLotroCardBlueprintLibrary()));
_formatCollectionIds.put("fotr_block", "default");
if (test) {
_supportedFormatNames.put("m_fotr_block", "Modified FotR Block");
_supportedFormats.put("m_fotr_block", new ModifiedFotRBlockFormat(_lotroServer.getLotroCardBlueprintLibrary()));
_formatCollectionIds.put("m_fotr_block", "default");
}
}
@@ -96,7 +101,7 @@ public class HallServer extends AbstractServer {
}
Player player = _lotroServer.getPlayerDao().getPlayer(playerId);
CardCollection collection = _collectionDao.getCollectionForPlayer(player, type);
CardCollection collection = _collectionDao.getCollectionForPlayer(player, _formatCollectionIds.get(type));
// TODO check that player has cards in collection
return lotroDeck;
@@ -131,6 +136,7 @@ public class HallServer extends AbstractServer {
LotroGameMediator lotroGameMediator = _lotroServer.getGameById(gameId);
lotroGameMediator.startGame();
_runningTables.put(tableId, gameId);
_runningTableFormatNames.put(tableId, awaitingTable.getFormatName());
_awaitingTables.remove(tableId);
}
@@ -158,13 +164,13 @@ public class HallServer extends AbstractServer {
Map<String, AwaitingTable> copy = new HashMap<String, AwaitingTable>(_awaitingTables);
for (Map.Entry<String, AwaitingTable> table : copy.entrySet())
visitor.visitTable(table.getKey(), null, "Waiting", table.getValue().getPlayerNames());
visitor.visitTable(table.getKey(), null, "Waiting", table.getValue().getFormatName(), table.getValue().getPlayerNames());
Map<String, String> runningCopy = new LinkedHashMap<String, String>(_runningTables);
for (Map.Entry<String, String> runningGame : runningCopy.entrySet()) {
LotroGameMediator lotroGameMediator = _lotroServer.getGameById(runningGame.getValue());
if (lotroGameMediator != null)
visitor.visitTable(runningGame.getKey(), runningGame.getValue(), lotroGameMediator.getGameStatus(), lotroGameMediator.getPlayersPlaying());
visitor.visitTable(runningGame.getKey(), runningGame.getValue(), lotroGameMediator.getGameStatus(), _runningTableFormatNames.get(runningGame.getKey()), lotroGameMediator.getPlayersPlaying());
}
String playerTable = getNonFinishedPlayerTable(participantId);
@@ -213,8 +219,10 @@ public class HallServer extends AbstractServer {
// Remove finished games
HashMap<String, String> copy = new HashMap<String, String>(_runningTables);
for (Map.Entry<String, String> runningTable : copy.entrySet()) {
if (_lotroServer.getGameById(runningTable.getValue()) == null)
if (_lotroServer.getGameById(runningTable.getValue()) == null) {
_runningTables.remove(runningTable.getKey());
_runningTableFormatNames.remove(runningTable.getKey());
}
}
long currentTime = System.currentTimeMillis();

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

@@ -594,12 +594,13 @@ public class ServerResource {
}
@Override
public void visitTable(String tableId, String gameId, String tableStatus, Set<String> playerIds) {
public void visitTable(String tableId, String gameId, String tableStatus, String formatName, Set<String> playerIds) {
Element table = _doc.createElement("table");
table.setAttribute("id", tableId);
if (gameId != null)
table.setAttribute("gameId", gameId);
table.setAttribute("status", tableStatus);
table.setAttribute("format", formatName);
table.setAttribute("players", mergeStrings(playerIds));
_hall.appendChild(table);
}

6
gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
View File

@@ -12,6 +12,12 @@
background-color: #000000;
}
.tableFormatName {
text-align: center;
font-style: oblique;
font-size: 120%;
}
.tableStatus {
text-align: center;
font-style: italic;

6
gemp-lotr/gemp-lotr-web/src/main/webapp/js/hallUi.js
View File

@@ -102,11 +102,12 @@ var GempLotrHallUI = Class.extend({
var gameId = table.getAttribute("gameId");
var status = table.getAttribute("status");
var playersAttr = table.getAttribute("players");
var formatName = table.getAttribute("format");
var players = new Array();
if (playersAttr.length > 0)
players = playersAttr.split(",");
var tableDiv = this.createTableDiv(id, gameId, status, players, waiting);
var tableDiv = this.createTableDiv(id, gameId, status, formatName, players, waiting);
this.tablesDiv.append(tableDiv);
}
@@ -148,9 +149,10 @@ var GempLotrHallUI = Class.extend({
}
},
createTableDiv: function(id, gameId, status, players, waiting) {
createTableDiv: function(id, gameId, status, formatName, players, waiting) {
var tableDiv = $("<div></div>");
tableDiv.css({ display: "inline-block", width: "120px", height: "120px", margin: "5px", "background-color": "#333300", color: "#ffffff"});
tableDiv.append("<div class='tableFormatName'>" + formatName + "</div>");
tableDiv.append("<div class='tableStatus'>" + status + "</div>");
tableDiv.append("Players:<br/>");
for (var i = 0; i < players.length; i++)