summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/control/GameControl.java
diff options
context:
space:
mode:
authorIda Massow <massow@informatik.uni-luebeck.de>2011-06-08 17:46:44 +0200
committerIda Massow <massow@informatik.uni-luebeck.de>2011-06-08 17:46:44 +0200
commit70af06e1bff47a36de9d9106412388b2f5b91f15 (patch)
treee4c8bd5301210d0a9e1ca12f3343c5e7d8316a4d /src/jrummikub/control/GameControl.java
parent41fe3c93b3f0c880ce550fda4cd6ad6f30d3e99c (diff)
downloadJRummikub-70af06e1bff47a36de9d9106412388b2f5b91f15.tar
JRummikub-70af06e1bff47a36de9d9106412388b2f5b91f15.zip
LAden und Speichern geht jetzt immer sauber
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@388 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/control/GameControl.java')
-rw-r--r--src/jrummikub/control/GameControl.java16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/jrummikub/control/GameControl.java b/src/jrummikub/control/GameControl.java
index 985781a..194d0de 100644
--- a/src/jrummikub/control/GameControl.java
+++ b/src/jrummikub/control/GameControl.java
@@ -83,10 +83,14 @@ public class GameControl {
}
private void endGame() {
+ removeListeners();
+ endOfGameEvent.emit();
+ }
+
+ private void removeListeners() {
for (Connection c : connections) {
c.remove();
}
- endOfGameEvent.emit();
}
/**
@@ -106,6 +110,16 @@ public class GameControl {
}
}
+ public void abortGame() {
+ removeListeners();
+ if (roundControl != null) {
+ roundControl.abortRound();
+ roundControl = null;
+ }
+
+ view.clearView();
+ }
+
private void startRound() {
if (roundControl != null) {
return;