summaryrefslogtreecommitdiffstats
path: root/mock
diff options
context:
space:
mode:
authorBennet Gerlach <bennet_gerlach@web.de>2011-06-20 03:06:46 +0200
committerBennet Gerlach <bennet_gerlach@web.de>2011-06-20 03:06:46 +0200
commit4df5c0e665991dd19a2f25ee513c3ff85a672c55 (patch)
tree1da402f1c8f98d1a67cfb887f66c2b17d008560a /mock
parentace7175f1a57f3dc88a861842969e84efacf65ad (diff)
downloadJRummikub-4df5c0e665991dd19a2f25ee513c3ff85a672c55.tar
JRummikub-4df5c0e665991dd19a2f25ee513c3ff85a672c55.zip
Implemented login error messages
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@500 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'mock')
-rw-r--r--mock/jrummikub/control/network/MockConnectionControl.java7
-rw-r--r--mock/jrummikub/view/MockView.java12
2 files changed, 16 insertions, 3 deletions
diff --git a/mock/jrummikub/control/network/MockConnectionControl.java b/mock/jrummikub/control/network/MockConnectionControl.java
index 924febb..d0bb1fa 100644
--- a/mock/jrummikub/control/network/MockConnectionControl.java
+++ b/mock/jrummikub/control/network/MockConnectionControl.java
@@ -12,6 +12,7 @@ import jrummikub.util.IEvent2;
import jrummikub.util.MockEvent;
import jrummikub.util.MockEvent1;
import jrummikub.util.MockEvent2;
+import jrummikub.view.LoginError;
/** */
public class MockConnectionControl implements IConnectionControl {
@@ -20,7 +21,7 @@ public class MockConnectionControl implements IConnectionControl {
/** */
public MockEvent connectedEvent = new MockEvent();
/** */
- public MockEvent connectionFailedEvent = new MockEvent();
+ public MockEvent1<LoginError> connectionFailedEvent = new MockEvent1<LoginError>();
/** */
public MockEvent1<GameData> gameOfferEvent = new MockEvent1<GameData>();
/** */
@@ -66,7 +67,7 @@ public class MockConnectionControl implements IConnectionControl {
@Override
public void connect() {
if (failOnConnect) {
- connectionFailedEvent.emit();
+ connectionFailedEvent.emit(LoginError.UNKNOWN_ERROR);
} else {
connected = true;
connectedEvent.emit();
@@ -84,7 +85,7 @@ public class MockConnectionControl implements IConnectionControl {
}
@Override
- public IEvent getConnectionFailedEvent() {
+ public IEvent1<LoginError> getConnectionFailedEvent() {
return connectionFailedEvent;
}
diff --git a/mock/jrummikub/view/MockView.java b/mock/jrummikub/view/MockView.java
index f283ebd..5440fc8 100644
--- a/mock/jrummikub/view/MockView.java
+++ b/mock/jrummikub/view/MockView.java
@@ -225,6 +225,12 @@ public class MockView implements IView {
}
@Override
+ public IConnectPanel getConnectPanel() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
public void setInitialMeldError(int points) {
// TODO Auto-generated method stub
@@ -295,4 +301,10 @@ public class MockView implements IView {
public void load() {
// TODO Auto-generated method stub
}
+
+ @Override
+ public void showConnectPanel(boolean show) {
+ // TODO Auto-generated method stub
+
+ }
}