Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prefer invokeLater to invokeAndWait, controller sleeps for 10ms after each call to update to let the event dispatch thread update the GUI

master
melvin 2011-07-25 23:42:26 +08:00
parent 28fdf30224
commit 077d06f564
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/magarena.xml
View File

@ -18,7 +18,7 @@
<minVersion>1.6.0</minVersion>
<maxVersion></maxVersion>
<jdkPreference>preferJre</jdkPreference>
<initialHeapSize>64</initialHeapSize>
<initialHeapSize>256</initialHeapSize>
<maxHeapSize>256</maxHeapSize>
</jre>
<splash>

8
src/magic/model/choice/MagicPlayChoice.java
View File

@ -109,9 +109,9 @@ public class MagicPlayChoice extends MagicChoice {
if (game.isPhase(MagicPhaseType.CombatDamage)) {
if (!game.getStack().isEmpty()) {
try {
Thread.sleep(1000);
Thread.sleep(1500);
} catch (final Exception err) {
System.err.println("ERROR! Exception caught in MagicPlayChoice");
}
}
return PASS_CHOICE_RESULTS;
@ -139,12 +139,12 @@ public class MagicPlayChoice extends MagicChoice {
*/
if (skip) {
//if there is an item on the stack, pause for 1s
//if there is an item on the stack, pause for 1.5s
if (!game.getStack().isEmpty()) {
try {
Thread.sleep(1500);
} catch (final Exception err) {
System.err.println("ERROR! Exception caught in MagicPlayChoice");
}
}
return PASS_CHOICE_RESULTS;

21
src/magic/ui/GameController.java
View File

@ -241,7 +241,7 @@ public class GameController {
}
public void focusViewers(final int handGraveyard,final int stackCombat) {
invokeAndWait(new Runnable() {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
gamePanel.focusViewers(handGraveyard,stackCombat);
}
@ -254,7 +254,7 @@ public class GameController {
private void showValidChoices() {
try {
invokeAndWait(new Runnable() {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
for (final ChoiceViewer choiceViewer : choiceViewers) {
choiceViewer.showValidChoices(validChoices);
@ -262,7 +262,8 @@ public class GameController {
}
});
} catch (final Throwable th) {
//there will be an error if X windows is not present on Linux
//there will be an error if X windows is not present
System.err.println("ERROR! showValidChoices threw an exception/error");
}
}
@ -287,9 +288,8 @@ public class GameController {
}
public void update() {
invokeAndWait(new Runnable() {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
//hideInfo();
gamePanel.updateInfo();
gamePanel.update();
}
@ -319,7 +319,7 @@ public class GameController {
}
public void showMessage(final MagicSource source,final String message) {
invokeAndWait(new Runnable() {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
gameViewer.showMessage(getMessageWithSource(source,message));
}
@ -327,7 +327,7 @@ public class GameController {
}
public void showComponent(final JComponent content) {
invokeAndWait(new Runnable() {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
gameViewer.showComponent(content);
}
@ -439,7 +439,7 @@ public class GameController {
continue;
} else {
game.advanceTournament();
invokeAndWait(new Runnable() {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
gamePanel.close();
}
@ -470,6 +470,11 @@ public class GameController {
}
} else {
update();
try {
Thread.sleep(10);
} catch (final Exception ex) {
System.err.println("ERROR! Exception while controller thread sleeping.");
}
}
}
running.set(false);