From 8e3ebed11f9ca98da4652b0c03b5bf19e2bc26e8 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 27 Mar 2013 17:24:51 +0100 Subject: [PATCH] [minor] formatting --- .../main/java/mage/server/SessionManager.java | 13 ++-- .../java/mage/server/TableController.java | 42 ++++++---- .../main/java/mage/server/TableManager.java | 77 ++++++++++++------- .../src/main/java/mage/server/User.java | 15 ++-- .../main/java/mage/server/UserManager.java | 11 +-- .../server/challenge/ChallengeManager.java | 5 +- .../mage/server/draft/DraftController.java | 6 +- .../java/mage/server/draft/DraftSession.java | 6 +- .../tournament/TournamentController.java | 12 +-- .../server/tournament/TournamentFactory.java | 2 +- .../server/tournament/TournamentSession.java | 6 +- 11 files changed, 118 insertions(+), 77 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/SessionManager.java b/Mage.Server/src/main/java/mage/server/SessionManager.java index 7d3e00de4fa..fd2a3303da3 100644 --- a/Mage.Server/src/main/java/mage/server/SessionManager.java +++ b/Mage.Server/src/main/java/mage/server/SessionManager.java @@ -28,6 +28,9 @@ package mage.server; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import mage.MageException; import mage.server.services.LogKeys; import mage.server.services.impl.LogServiceImpl; @@ -35,9 +38,6 @@ import mage.view.UserDataView; import org.apache.log4j.Logger; import org.jboss.remoting.callback.InvokerCallbackHandler; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; /** * @@ -55,7 +55,9 @@ public class SessionManager { private ConcurrentHashMap sessions = new ConcurrentHashMap(); public Session getSession(String sessionId) { - if (sessions == null || sessionId == null) return null; + if (sessions == null || sessionId == null) { + return null; + } return sessions.get(sessionId); } @@ -135,8 +137,9 @@ public class SessionManager { } public boolean isValidSession(String sessionId) { - if (sessions.containsKey(sessionId)) + if (sessions.containsKey(sessionId)) { return true; + } return false; } diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java index 19edfcd5f98..a2c3a242f7a 100644 --- a/Mage.Server/src/main/java/mage/server/TableController.java +++ b/Mage.Server/src/main/java/mage/server/TableController.java @@ -28,6 +28,12 @@ package mage.server; +import java.util.Map.Entry; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; import mage.Constants.RangeOfInfluence; import mage.Constants.TableState; import mage.MageException; @@ -59,12 +65,6 @@ import mage.server.util.ServerMessagesUtil; import mage.server.util.ThreadExecutor; import org.apache.log4j.Logger; -import java.util.Map.Entry; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; /** * @@ -95,8 +95,9 @@ public class TableController { User user = UserManager.getInstance().getUser(userId); controllerName = user.getName(); } - else + else { controllerName = "System"; + } table = new Table(roomId, options.getGameType(), options.getName(), controllerName, DeckValidatorFactory.getInstance().createDeckValidator(options.getDeckType()), options.getPlayerTypes(), match); init(); } @@ -109,8 +110,9 @@ public class TableController { User user = UserManager.getInstance().getUser(userId); controllerName = user.getName(); } - else + else { controllerName = "System"; + } table = new Table(roomId, options.getTournamentType(), options.getName(), controllerName, DeckValidatorFactory.getInstance().createDeckValidator(options.getMatchOptions().getDeckType()), options.getPlayerTypes(), tournament); } @@ -265,8 +267,9 @@ public class TableController { else { player = PlayerFactory.getInstance().createPlayer(playerType, name, options.getRange(), skill); } - if (player != null) + if (player != null) { logger.info("Player created " + player.getId()); + } return player; } @@ -276,8 +279,9 @@ public class TableController { } public synchronized void leaveTable(UUID userId) { - if (table.getState() == TableState.WAITING || table.getState() == TableState.STARTING) + if (table.getState() == TableState.WAITING || table.getState() == TableState.STARTING) { table.leaveTable(userPlayerMap.get(userId)); + } } public synchronized void startMatch(UUID userId) { @@ -292,9 +296,9 @@ public class TableController { match.startMatch(); match.startGame(); table.initGame(); - GameOptions options = new GameOptions(); - options.testMode = true; -// match.getGame().setGameOptions(options); + GameOptions gameOptions = new GameOptions(); + gameOptions.testMode = true; +// match.getGame().setGameOptions(gameOptions); GameManager.getInstance().createGameSession(match.getGame(), userPlayerMap, table.getId(), null); ChallengeManager.getInstance().prepareChallenge(getPlayerId(), match); for (Entry entry: userPlayerMap.entrySet()) { @@ -312,8 +316,9 @@ public class TableController { playerId = entry.getValue(); break; } - if (playerId == null) + if (playerId == null) { throw new GameException("Couldn't find a player in challenge mode."); + } return playerId; } @@ -397,8 +402,9 @@ public class TableController { if (entry.getValue().equals(playerId)) { User user = UserManager.getInstance().getUser(entry.getKey()); int remaining = (int) futureTimeout.getDelay(TimeUnit.SECONDS); - if (user != null) + if (user != null) { user.sideboard(deck, table.getId(), remaining, options.isLimited()); + } break; } } @@ -464,8 +470,9 @@ public class TableController { private void autoSideboard() { for (MatchPlayer player: match.getPlayers()) { - if (!player.isDoneSideboarding()) + if (!player.isDoneSideboarding()) { match.submitDeck(player.getPlayer().getId(), player.generateDeck()); + } } } @@ -494,8 +501,9 @@ public class TableController { } public boolean isOwner(UUID userId) { - if (userId == null) + if (userId == null) { return false; + } return userId.equals(this.userId); } diff --git a/Mage.Server/src/main/java/mage/server/TableManager.java b/Mage.Server/src/main/java/mage/server/TableManager.java index 3dbf1c22152..d1ad2b37e71 100644 --- a/Mage.Server/src/main/java/mage/server/TableManager.java +++ b/Mage.Server/src/main/java/mage/server/TableManager.java @@ -28,6 +28,12 @@ package mage.server; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import mage.Constants; import mage.MageException; import mage.cards.decks.Deck; import mage.cards.decks.DeckCardLists; @@ -36,19 +42,13 @@ import mage.game.Table; import mage.game.draft.Draft; import mage.game.match.Match; import mage.game.match.MatchOptions; +import mage.game.match.MatchPlayer; import mage.game.tournament.Tournament; import mage.game.tournament.TournamentOptions; import mage.players.Player; import mage.server.game.GamesRoomManager; import org.apache.log4j.Logger; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import mage.Constants; -import mage.game.match.MatchPlayer; /** * @@ -124,8 +124,9 @@ public class TableManager { } public Match getMatch(UUID tableId) { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { return controllers.get(tableId).getMatch(); + } return null; } @@ -138,26 +139,30 @@ public class TableManager { } public boolean joinTable(UUID userId, UUID tableId, String name, String playerType, int skill, DeckCardLists deckList) throws MageException { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { return controllers.get(tableId).joinTable(userId, name, playerType, skill, deckList); + } return false; } public boolean joinTournament(UUID userId, UUID tableId, String name, String playerType, int skill) throws GameException { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { return controllers.get(tableId).joinTournament(userId, name, playerType, skill); + } return false; } public boolean submitDeck(UUID userId, UUID tableId, DeckCardLists deckList) throws MageException { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { return controllers.get(tableId).submitDeck(userId, deckList); + } return false; } public void updateDeck(UUID userId, UUID tableId, DeckCardLists deckList) throws MageException { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { controllers.get(tableId).updateDeck(userId, deckList); + } } public void removeSession(UUID userId) { @@ -167,8 +172,9 @@ public class TableManager { } public boolean isTableOwner(UUID tableId, UUID userId) { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { return controllers.get(tableId).isOwner(userId); + } return false; } @@ -181,66 +187,78 @@ public class TableManager { } public void leaveTable(UUID userId, UUID tableId) { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { controllers.get(tableId).leaveTable(userId); + } } public UUID getChatId(UUID tableId) { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { return controllers.get(tableId).getChatId(); + } return null; } public void startMatch(UUID userId, UUID roomId, UUID tableId) { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { controllers.get(tableId).startMatch(userId); + } } public void startMatch(UUID roomId, UUID tableId) { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { controllers.get(tableId).startMatch(); + } } public void startChallenge(UUID userId, UUID roomId, UUID tableId, UUID challengeId) { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { controllers.get(tableId).startChallenge(userId, challengeId); + } } public void startTournament(UUID userId, UUID roomId, UUID tableId) { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { controllers.get(tableId).startTournament(userId); + } } public void startDraft(UUID tableId, Draft draft) { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { controllers.get(tableId).startDraft(draft); + } } public boolean watchTable(UUID userId, UUID tableId) { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { return controllers.get(tableId).watchTable(userId); + } return false; } public boolean replayTable(UUID userId, UUID tableId) { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { return controllers.get(tableId).replayTable(userId); + } return false; } public void endGame(UUID tableId) { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { controllers.get(tableId).endGame(); + } } public void endDraft(UUID tableId, Draft draft) { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { controllers.get(tableId).endDraft(draft); + } } public void endTournament(UUID tableId, Tournament tournament) { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { controllers.get(tableId).endTournament(tournament); + } } public void swapSeats(UUID tableId, UUID userId, int seatNum1, int seatNum2) { @@ -250,13 +268,15 @@ public class TableManager { } public void construct(UUID tableId) { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { controllers.get(tableId).construct(); + } } public void addPlayer(UUID userId, UUID tableId, Player player, String playerType, Deck deck) throws GameException { - if (controllers.containsKey(tableId)) + if (controllers.containsKey(tableId)) { controllers.get(tableId).addPlayer(userId, player, playerType, deck); + } } public void removeTable(UUID tableId) { @@ -265,8 +285,9 @@ public class TableManager { controllers.remove(tableId); tables.remove(tableId); GamesRoomManager.getInstance().removeTable(tableId); - if (table.getMatch() != null && table.getMatch().getGame() != null) + if (table.getMatch() != null && table.getMatch().getGame() != null) { table.getMatch().getGame().end(); + } } } diff --git a/Mage.Server/src/main/java/mage/server/User.java b/Mage.Server/src/main/java/mage/server/User.java index f2ccb22c78f..43c3f6cd03e 100644 --- a/Mage.Server/src/main/java/mage/server/User.java +++ b/Mage.Server/src/main/java/mage/server/User.java @@ -27,6 +27,11 @@ */ package mage.server; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.UUID; import mage.cards.decks.Deck; import mage.game.Table; import mage.interfaces.callback.ClientCallback; @@ -38,11 +43,6 @@ import mage.server.tournament.TournamentSession; import mage.view.TableClientMessage; import org.apache.log4j.Logger; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; /** * @@ -120,8 +120,9 @@ public class User { public synchronized void fireCallback(final ClientCallback call) { if (isConnected()) { Session session = SessionManager.getInstance().getSession(sessionId); - if (session != null) - session.fireCallback(call); + if (session != null) { + session.fireCallback(call); + } } } diff --git a/Mage.Server/src/main/java/mage/server/UserManager.java b/Mage.Server/src/main/java/mage/server/UserManager.java index 7adf437540b..6c3ad94ea0d 100644 --- a/Mage.Server/src/main/java/mage/server/UserManager.java +++ b/Mage.Server/src/main/java/mage/server/UserManager.java @@ -27,9 +27,6 @@ */ package mage.server; -import mage.view.ChatMessage.MessageColor; -import org.apache.log4j.Logger; - import java.util.Calendar; import java.util.Collection; import java.util.UUID; @@ -37,6 +34,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import mage.view.ChatMessage.MessageColor; +import org.apache.log4j.Logger; /** * @@ -68,8 +67,9 @@ public class UserManager { private ConcurrentHashMap users = new ConcurrentHashMap(); public User createUser(String userName, String host) { - if (findUser(userName) != null) + if (findUser(userName) != null) { return null; //user already exists + } User user = new User(userName, host); users.put(user.getId(), user); return user; @@ -81,8 +81,9 @@ public class UserManager { public User findUser(String userName) { for (User user: users.values()) { - if (user.getName().equals(userName)) + if (user.getName().equals(userName)) { return user; + } } return null; } diff --git a/Mage.Server/src/main/java/mage/server/challenge/ChallengeManager.java b/Mage.Server/src/main/java/mage/server/challenge/ChallengeManager.java index 14311e7ba76..cdc0ad1c695 100644 --- a/Mage.Server/src/main/java/mage/server/challenge/ChallengeManager.java +++ b/Mage.Server/src/main/java/mage/server/challenge/ChallengeManager.java @@ -1,11 +1,10 @@ package mage.server.challenge; -import mage.Constants; -import mage.game.match.Match; - import java.util.HashMap; import java.util.Map; import java.util.UUID; +import mage.Constants; +import mage.game.match.Match; /** * Loads challenges from scenarios. diff --git a/Mage.Server/src/main/java/mage/server/draft/DraftController.java b/Mage.Server/src/main/java/mage/server/draft/DraftController.java index e9883dbf147..20c804c304a 100644 --- a/Mage.Server/src/main/java/mage/server/draft/DraftController.java +++ b/Mage.Server/src/main/java/mage/server/draft/DraftController.java @@ -153,8 +153,9 @@ public class DraftController { } private boolean allJoined() { - if (!draft.allJoined()) + if (!draft.allJoined()) { return false; + } for (DraftPlayer player: draft.getPlayers()) { if (player.getPlayer().isHuman() && draftSessions.get(player.getPlayer().getId()) == null) { return false; @@ -206,8 +207,9 @@ public class DraftController { } private synchronized void pickCard(UUID playerId, int timeout) throws MageException { - if (draftSessions.containsKey(playerId)) + if (draftSessions.containsKey(playerId)) { draftSessions.get(playerId).pickCard(timeout); + } } } diff --git a/Mage.Server/src/main/java/mage/server/draft/DraftSession.java b/Mage.Server/src/main/java/mage/server/draft/DraftSession.java index f539b4e0179..ca1337eda39 100644 --- a/Mage.Server/src/main/java/mage/server/draft/DraftSession.java +++ b/Mage.Server/src/main/java/mage/server/draft/DraftSession.java @@ -148,15 +148,17 @@ public class DraftSession { public DraftPickView sendCardPick(UUID cardId) { cancelTimeout(); - if (draft.addPick(playerId, cardId)) + if (draft.addPick(playerId, cardId)) { return getDraftPickView(0); + } return null; } public void removeDraft() { User user = UserManager.getInstance().getUser(userId); - if (user != null) + if (user != null) { user.removeDraft(playerId); + } } private DraftView getDraftView() { diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java index 1e72f21ebec..2a03b42ad20 100644 --- a/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java +++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java @@ -28,6 +28,9 @@ package mage.server.tournament; +import java.util.Map.Entry; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import mage.MageException; import mage.cards.decks.Deck; import mage.game.GameException; @@ -49,9 +52,6 @@ import mage.view.ChatMessage.MessageColor; import mage.view.TournamentView; import org.apache.log4j.Logger; -import java.util.Map.Entry; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; /** * @@ -156,8 +156,9 @@ public class TournamentController { } private boolean allJoined() { - if (!tournament.allJoined()) + if (!tournament.allJoined()) { return false; + } for (TournamentPlayer player: tournament.getPlayers()) { if (player.getPlayer().isHuman() && tournamentSessions.get(player.getPlayer().getId()) == null) { return false; @@ -263,8 +264,9 @@ public class TournamentController { private UUID getPlayerSessionId(UUID playerId) { for (Entry entry: userPlayerMap.entrySet()) { - if (entry.getValue().equals(playerId)) + if (entry.getValue().equals(playerId)) { return entry.getKey(); + } } return null; } diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java index 50d387f38c2..0653106d4c3 100644 --- a/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java +++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java @@ -33,10 +33,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import mage.cards.Sets; import mage.game.tournament.Tournament; import mage.game.tournament.TournamentOptions; import mage.game.tournament.TournamentType; -import mage.cards.Sets; import mage.view.TournamentTypeView; import org.apache.log4j.Logger; diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java index 6b171a85779..8d2cf601d30 100644 --- a/Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java +++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java @@ -124,8 +124,9 @@ public class TournamentSession { } private synchronized void setupTimeout(int seconds) { - if (futureTimeout != null && !futureTimeout.isDone()) + if (futureTimeout != null && !futureTimeout.isDone()) { return; + } cancelTimeout(); if (seconds > 0) { futureTimeout = timeoutExecutor.schedule( @@ -148,8 +149,9 @@ public class TournamentSession { public void removeTournament() { User user = UserManager.getInstance().getUser(userId); - if (user != null) + if (user != null) { user.removeTournament(playerId); + } } private TournamentView getTournamentView() {