forked from External/mage
[app-wiring-refactor]: Apply review comments:
- Add reference to original library in `FluentBuilder`. - Change `I<Name>` notation to `<Name>Impl` notation. - Move error config to test resources - Add comment with config instruction - Add config to the documentation
This commit is contained in:
parent
e8bb8ae24b
commit
6e3750d50a
41 changed files with 171 additions and 146 deletions
|
|
@ -5,7 +5,7 @@ import mage.constants.ManaType;
|
|||
import mage.constants.PlayerAction;
|
||||
import mage.game.Game;
|
||||
import mage.game.GameOptions;
|
||||
import mage.server.managers.IGameManager;
|
||||
import mage.server.managers.GameManager;
|
||||
import mage.server.managers.ManagerFactory;
|
||||
import mage.view.GameView;
|
||||
|
||||
|
|
@ -22,13 +22,13 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
|
|||
/**
|
||||
* @author BetaSteward_at_googlemail.com
|
||||
*/
|
||||
public class GameManager implements IGameManager {
|
||||
public class GameManagerImpl implements GameManager {
|
||||
|
||||
private final ManagerFactory managerFactory;
|
||||
private final ConcurrentMap<UUID, GameController> gameControllers = new ConcurrentHashMap<>();
|
||||
private final ReadWriteLock gameControllersLock = new ReentrantReadWriteLock();
|
||||
|
||||
public GameManager(ManagerFactory managerFactory) {
|
||||
public GameManagerImpl(ManagerFactory managerFactory) {
|
||||
this.managerFactory = managerFactory;
|
||||
}
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ import mage.interfaces.callback.ClientCallback;
|
|||
import mage.interfaces.callback.ClientCallbackMethod;
|
||||
import mage.players.Player;
|
||||
import mage.server.User;
|
||||
import mage.server.managers.IUserManager;
|
||||
import mage.server.managers.UserManager;
|
||||
import mage.server.managers.ManagerFactory;
|
||||
import mage.view.*;
|
||||
import org.apache.log4j.Logger;
|
||||
|
|
@ -28,7 +28,7 @@ public class GameSessionPlayer extends GameSessionWatcher {
|
|||
|
||||
private static final Logger logger = Logger.getLogger(GameSessionPlayer.class);
|
||||
|
||||
private final IUserManager userManager;
|
||||
private final UserManager userManager;
|
||||
private final UUID playerId;
|
||||
|
||||
private final ExecutorService callExecutor;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import mage.interfaces.callback.ClientCallback;
|
|||
import mage.interfaces.callback.ClientCallbackMethod;
|
||||
import mage.players.Player;
|
||||
import mage.server.User;
|
||||
import mage.server.managers.IUserManager;
|
||||
import mage.server.managers.UserManager;
|
||||
import mage.view.GameClientMessage;
|
||||
import mage.view.GameEndView;
|
||||
import mage.view.GameView;
|
||||
|
|
@ -25,13 +25,13 @@ public class GameSessionWatcher {
|
|||
|
||||
protected static final Logger logger = Logger.getLogger(GameSessionWatcher.class);
|
||||
|
||||
private final IUserManager userManager;
|
||||
private final UserManager userManager;
|
||||
protected final UUID userId;
|
||||
protected final Game game;
|
||||
protected boolean killed = false;
|
||||
protected final boolean isPlayer;
|
||||
|
||||
public GameSessionWatcher(IUserManager userManager, UUID userId, Game game, boolean isPlayer) {
|
||||
public GameSessionWatcher(UserManager userManager, UUID userId, Game game, boolean isPlayer) {
|
||||
this.userManager = userManager;
|
||||
this.userId = userId;
|
||||
this.game = game;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package mage.server.game;
|
||||
|
||||
import mage.server.managers.IGamesRoomManager;
|
||||
import mage.server.managers.GamesRoomManager;
|
||||
import mage.server.managers.ManagerFactory;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
|
|
@ -11,16 +11,16 @@ import java.util.concurrent.ConcurrentHashMap;
|
|||
/**
|
||||
* @author BetaSteward_at_googlemail.com
|
||||
*/
|
||||
public class GamesRoomManager implements IGamesRoomManager {
|
||||
public class GamesRoomManagerImpl implements GamesRoomManager {
|
||||
|
||||
private final ManagerFactory managerFactory;
|
||||
private final ConcurrentHashMap<UUID, GamesRoom> rooms = new ConcurrentHashMap<>();
|
||||
private UUID mainRoomId;
|
||||
private UUID mainChatId;
|
||||
private static final Logger logger = Logger.getLogger(GamesRoomManager.class);
|
||||
private static final Logger logger = Logger.getLogger(GamesRoomManagerImpl.class);
|
||||
|
||||
|
||||
public GamesRoomManager(ManagerFactory managerFactory) {
|
||||
public GamesRoomManagerImpl(ManagerFactory managerFactory) {
|
||||
this.managerFactory = managerFactory;
|
||||
}
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package mage.server.game;
|
||||
|
||||
import mage.server.managers.IReplayManager;
|
||||
import mage.server.managers.ReplayManager;
|
||||
import mage.server.managers.ManagerFactory;
|
||||
|
||||
import java.util.UUID;
|
||||
|
|
@ -9,12 +9,12 @@ import java.util.concurrent.ConcurrentHashMap;
|
|||
/**
|
||||
* @author BetaSteward_at_googlemail.com
|
||||
*/
|
||||
public class ReplayManager implements IReplayManager {
|
||||
public class ReplayManagerImpl implements ReplayManager {
|
||||
|
||||
private final ConcurrentHashMap<String, ReplaySession> replaySessions = new ConcurrentHashMap<>();
|
||||
private final ManagerFactory managerFactory;
|
||||
|
||||
public ReplayManager(ManagerFactory managerFactory) {
|
||||
public ReplayManagerImpl(ManagerFactory managerFactory) {
|
||||
this.managerFactory = managerFactory;
|
||||
}
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue