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

Tests für NetworkControl

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@473 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-06-19 00:28:23 +02:00
parent 80f0c0d43f
commit d47e291d19
6 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/jrummikub/control/ApplicationControl.java
View file

@ -1,5 +1,6 @@
package jrummikub.control;
import jrummikub.control.network.ConnectionControl;
import jrummikub.control.network.NetworkControl;
import jrummikub.model.GameSettings;
import jrummikub.model.GameState;
@ -71,7 +72,7 @@ public class ApplicationControl {
@Override
public void handle() {
abortControls();
loginControl = new LoginControl(view);
loginControl.getLoginEvent().add(new IListener1<LoginData>() {
@Override
@ -149,7 +150,8 @@ public class ApplicationControl {
}
private void createNetworkControl(LoginData loginData) {
networkControl = new NetworkControl(loginData, view);
ConnectionControl connectionControl = new ConnectionControl(loginData);
networkControl = new NetworkControl(loginData, connectionControl, view);
networkControl.getStopNetworkEvent().add(new IListener() {
@Override

4
src/jrummikub/control/network/ConnectionControl.java
View file

@ -32,7 +32,7 @@ import org.jivesoftware.smack.util.Base64;
import org.jivesoftware.smackx.muc.DiscussionHistory;
import org.jivesoftware.smackx.muc.MultiUserChat;
class ConnectionControl implements IConnectionControl {
public class ConnectionControl implements IConnectionControl {
private final static String ELEMENT_NAME = "rummikub";
private final static String NAMESPACE = "http://home.universe-factory.net/rummikub/";
@ -57,7 +57,7 @@ class ConnectionControl implements IConnectionControl {
private volatile GameData offeredGame;
ConnectionControl(LoginData loginData) {
public ConnectionControl(LoginData loginData) {
this.loginData = loginData;
}

12
src/jrummikub/control/network/NetworkControl.java
View file

@ -40,12 +40,13 @@ public class NetworkControl {
* @param view
* for events and handlers
*/
public NetworkControl(final LoginData loginData, final IView view) {
public NetworkControl(final LoginData loginData,
IConnectionControl connectionControl, final IView view) {
this.view = view;
connectionControl = new ConnectionControl(loginData);
this.connectionControl = connectionControl;
addConnectionSetupListeners(loginData, view);
addConnectionControlListeners(loginData, view);
addConnectionControlListeners(view);
connections.add(view.getGameListPanel().getJoinEvent().add(
new IListener1<GameData>() {
@ -81,13 +82,10 @@ public class NetworkControl {
/**
* Adds the listeners for connection control events
*
* @param loginData
* player's login data
* @param view
* view for events
*/
public void addConnectionControlListeners(final LoginData loginData,
final IView view) {
public void addConnectionControlListeners(final IView view) {
connections.add(connectionControl.getGameOfferEvent().add(
new IListener1<GameData>() {
@Override