external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
drdev
2013-12-05 00:56:57 +00:00
parent e4adada542
commit 2f384c079c
1 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
forge-gui/src/main/java/forge/control/FControlGamePlayback.java
View File

@@ -28,7 +28,7 @@ public class FControlGamePlayback extends IGameEventVisitor.Base<Void> {
private final CyclicBarrier gameThreadPauser = new CyclicBarrier(2); private final CyclicBarrier gameThreadPauser = new CyclicBarrier(2);
public FControlGamePlayback(FControl fc ) { public FControlGamePlayback(FControl fc) {
this.fc = fc; this.fc = fc;
} }
@@ -51,14 +51,12 @@ public class FControlGamePlayback extends IGameEventVisitor.Base<Void> {
} }
} }
@Override @Override
public Void visit(GameEventBlockersDeclared event) { public Void visit(GameEventBlockersDeclared event) {
pauseForEvent(combatDelay); pauseForEvent(combatDelay);
return super.visit(event); return super.visit(event);
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see forge.game.event.IGameEventVisitor.Base#visit(forge.game.event.GameEventTurnPhase) * @see forge.game.event.IGameEventVisitor.Base#visit(forge.game.event.GameEventTurnPhase)
*/ */
@@ -70,19 +68,20 @@ public class FControlGamePlayback extends IGameEventVisitor.Base<Void> {
case COMBAT_END: case COMBAT_END:
case COMBAT_DECLARE_ATTACKERS: case COMBAT_DECLARE_ATTACKERS:
case COMBAT_DECLARE_BLOCKERS: case COMBAT_DECLARE_BLOCKERS:
if( fc.getObservedGame().getPhaseHandler().inCombat() ) if (fc.getObservedGame().getPhaseHandler().inCombat()) {
pauseForEvent(combatDelay); pauseForEvent(combatDelay);
}
break; break;
default: default:
if( isUiToStop ) if (isUiToStop) {
pauseForEvent(phasesDelay); pauseForEvent(phasesDelay);
}
break; break;
} }
return null; return null;
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see forge.game.event.IGameEventVisitor.Base#visit(forge.game.event.GameEventDuelFinished) * @see forge.game.event.IGameEventVisitor.Base#visit(forge.game.event.GameEventDuelFinished)
*/ */
@@ -92,7 +91,6 @@ public class FControlGamePlayback extends IGameEventVisitor.Base<Void> {
return null; return null;
} }
@Override @Override
public Void visit(GameEventGameStarted event) { public Void visit(GameEventGameStarted event) {
fc.getInputQueue().setInput(inputPlayback); fc.getInputQueue().setInput(inputPlayback);
@@ -127,7 +125,7 @@ public class FControlGamePlayback extends IGameEventVisitor.Base<Void> {
*/ */
@Override @Override
public Void visit(GameEventPlayerPriority event) { public Void visit(GameEventPlayerPriority event) {
if ( paused.get() ) { if (paused.get()) {
try { try {
inputPlayback.onGamePaused(); inputPlayback.onGamePaused();
gameThreadPauser.await(); gameThreadPauser.await();
@@ -141,17 +139,17 @@ public class FControlGamePlayback extends IGameEventVisitor.Base<Void> {
return null; return null;
} }
public void onGameStopRequested() { public void onGameStopRequested() {
paused.set(false); paused.set(false);
if ( gameThreadPauser.getNumberWaiting() != 0) if (gameThreadPauser.getNumberWaiting() != 0) {
releaseGameThread(); releaseGameThread();
}
} }
private void releaseGameThread() { private void releaseGameThread() {
// just need to run another thread through the barrier... not edt preferrably :) // just need to run another thread through the barrier... not edt preferrably :)
fc.getObservedGame().getAction().invoke( new Runnable() { fc.getObservedGame().getAction().invoke(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
@@ -170,7 +168,6 @@ public class FControlGamePlayback extends IGameEventVisitor.Base<Void> {
public void resume() { public void resume() {
paused.set(false); paused.set(false);
releaseGameThread(); releaseGameThread();
} }
public void pause() { public void pause() {