neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GameControl tests, temporary handler in SettingsControl and small

Browse source 
fixes

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@288 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Jannis Harder 2011-05-27 17:54:46 +02:00
parent 63397e2f5f
commit 2d198820a9
6 changed files with 169 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/jrummikub/view/impl/SettingsPanel.java
View file

@ -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