summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/view
diff options
context:
space:
mode:
authorJannis Harder <harder@informatik.uni-luebeck.de>2011-05-27 17:54:46 +0200
committerJannis Harder <harder@informatik.uni-luebeck.de>2011-05-27 17:54:46 +0200
commit2d198820a9634c30d62c77f6f310aa227ee29733 (patch)
tree5096eaf907f64343b9997abea3f51ee4c070cb00 /src/jrummikub/view
parent63397e2f5fc62c7d1fc2efbe8f4c686b2343e471 (diff)
downloadJRummikub-2d198820a9634c30d62c77f6f310aa227ee29733.tar
JRummikub-2d198820a9634c30d62c77f6f310aa227ee29733.zip
GameControl tests, temporary handler in SettingsControl and small
fixes git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@288 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/view')
-rw-r--r--src/jrummikub/view/impl/SettingsPanel.java16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/jrummikub/view/impl/SettingsPanel.java b/src/jrummikub/view/impl/SettingsPanel.java
index 03cfd4c..7200a16 100644
--- a/src/jrummikub/view/impl/SettingsPanel.java
+++ b/src/jrummikub/view/impl/SettingsPanel.java
@@ -31,6 +31,7 @@ import javax.swing.event.DocumentListener;
import jrummikub.model.GameSettings;
import jrummikub.model.PlayerSettings;
+import jrummikub.util.Event;
import jrummikub.util.Event1;
import jrummikub.util.IEvent;
import jrummikub.util.IEvent1;
@@ -66,15 +67,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
private LinkedList<PlayerSettingsPanel> playerSettingsPanels = new LinkedList<PlayerSettingsPanel>();
private Event1<GameSettings> settingsChangeEvent = new Event1<GameSettings>();
- private Event1<GameSettings> startGameEvent = new Event1<GameSettings>();
-
- /*
- * @Override public IEvent1<GameSettings> getSettingsChangeEvent() { return
- * settingsChangeEvent; }
- *
- * @Override public IEvent1<GameSettings> getStartGameEvent() { return
- * startGameEvent; }
- */
+ private Event startGameEvent = new Event();
private void addPlayerSettings() {
// Find unused player name
@@ -177,7 +170,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
startButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- startGameEvent.emit(gameSettings);
+ startGameEvent.emit();
}
});
add(startButton, c);
@@ -392,8 +385,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
@Override
public IEvent getStartGameEvent() {
- // TODO Auto-generated method stub
- return null;
+ return startGameEvent;
}
@Override