Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Big refactoring (server)

Browse source 
I used Intellij IDEA to automatically refactor code to achive 3 goals.
1) get rid of anonymouse classes, and replace the with lamba to get more readeable and clean code (like in TableWaitingDialog).
2) make effectively final  variables actually final to avoid inadvertent changes on it in further releases and keep objects as immutable, as possible.
3)  Get rid of unused imports (most of the changes) in whole project classes.
This commit is contained in:
vraskulin 2017-01-09 19:47:03 +03:00
parent 076840df53
commit 46d369c8ed
31 changed files with 510 additions and 822 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Server/src/main/java/mage/server/draft/CubeFactory.java
View file

@ -44,7 +44,7 @@ public class CubeFactory {
private static final CubeFactory INSTANCE = new CubeFactory();
private static final Logger logger = Logger.getLogger(CubeFactory.class);
private Map<String, Class> draftCubes = new LinkedHashMap<String, Class>();
private final Map<String, Class> draftCubes = new LinkedHashMap<String, Class>();
public static CubeFactory getInstance() {
return INSTANCE;
@ -57,8 +57,8 @@ public class CubeFactory {
DraftCube draftCube;
Constructor<?> con;
try {
con = draftCubes.get(draftCubeName).getConstructor(new Class[]{});
draftCube = (DraftCube)con.newInstance(new Object[] {});
con = draftCubes.get(draftCubeName).getConstructor();
draftCube = (DraftCube)con.newInstance();
} catch (Exception ex) {
logger.fatal("CubeFactory error", ex);
return null;
@ -73,8 +73,8 @@ public class CubeFactory {
DraftCube draftCube;
Constructor<?> con;
try {
con = draftCubes.get(draftCubeName).getConstructor(new Class[]{Deck.class});
draftCube = (DraftCube)con.newInstance(new Object[] {cubeFromDeck});
con = draftCubes.get(draftCubeName).getConstructor(Deck.class);
draftCube = (DraftCube)con.newInstance(cubeFromDeck);
} catch (Exception ex) {
logger.fatal("CubeFactory error", ex);
return null;

17
Mage.Server/src/main/java/mage/server/draft/DraftController.java
View file

@ -74,9 +74,7 @@ public class DraftController {
private void init() {
draft.addTableEventListener(
new Listener<TableEvent> () {
@Override
public void event(TableEvent event) {
(Listener<TableEvent>) event -> {
try {
switch (event.getEventType()) {
case UPDATE:
@ -91,12 +89,9 @@ public class DraftController {
logger.fatal("Table event listener error", ex);
}
}
}
);
draft.addPlayerQueryEventListener(
new Listener<PlayerQueryEvent> () {
@Override
public void event(PlayerQueryEvent event) {
(Listener<PlayerQueryEvent>) event -> {
try {
switch (event.getQueryType()) {
case PICK_CARD:
@ -108,7 +103,6 @@ public class DraftController {
logger.fatal("Table event listener error", ex);
}
}
}
);
for (DraftPlayer player: draft.getPlayers()) {
if (!player.getPlayer().isHuman()) {
@ -156,12 +150,7 @@ public class DraftController {
if (!draft.isStarted() && allJoined()) {
draft.setStarted();
ThreadExecutor.getInstance().getCallExecutor().execute(
new Runnable() {
@Override
public void run() {
startDraft();
}
});
() -> startDraft());
}
}

15
Mage.Server/src/main/java/mage/server/draft/DraftSession.java
View file

@ -52,14 +52,14 @@ public class DraftSession {
protected final static Logger logger = Logger.getLogger(DraftSession.class);
protected UUID userId;
protected UUID playerId;
protected Draft draft;
protected final UUID userId;
protected final UUID playerId;
protected final Draft draft;
protected boolean killed = false;
protected UUID markedCard;
private ScheduledFuture<?> futureTimeout;
protected static ScheduledExecutorService timeoutExecutor = ThreadExecutor.getInstance().getTimeoutExecutor();
protected static final ScheduledExecutorService timeoutExecutor = ThreadExecutor.getInstance().getTimeoutExecutor();
public DraftSession(Draft draft, UUID userId, UUID playerId) {
this.userId = userId;
@ -125,12 +125,7 @@ public class DraftSession {
cancelTimeout();
if (seconds > 0) {
futureTimeout = timeoutExecutor.schedule(
new Runnable() {
@Override
public void run() {
DraftManager.getInstance().timeout(draft.getId(), userId);
}
},
() -> DraftManager.getInstance().timeout(draft.getId(), userId),
seconds, TimeUnit.SECONDS
);
}