Fix mock and tests

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@493 72836036-5685-4462-b002-a69064685172

1 files changed, 21 insertions, 9 deletions

diff --git a/mock/jrummikub/view/MockView.java b/mock/jrummikub/view/MockView.java
index 7c9b18e..f283ebd 100644
--- a/mock/jrummikub/view/MockView.java
+++ b/mock/jrummikub/view/MockView.java
@@ -30,6 +30,8 @@ public class MockView implements IView {
 	/** */
 	public MockGameListPanel gameListPanel = new MockGameListPanel();
 	/** */
+	public MockQuitWarningPanel quitWarningPanel = new MockQuitWarningPanel();
+	/** */
 	public boolean isSettingsPanelVisible = false;
 	/** */
 	public boolean isScorePanelVisible = false;
@@ -59,7 +61,7 @@ public class MockView implements IView {
 	/**	 */
 	public MockEvent menuQuitEvent = new MockEvent();
 	/**	 */
-	public MockEvent1<File> loadEvent = new MockEvent1<File>();
+	public MockEvent loadEvent = new MockEvent();
 	/**	 */
 	public MockEvent1<File> saveEvent = new MockEvent1<File>();
 	/**	 */
@@ -70,6 +72,8 @@ public class MockView implements IView {
 	public MockEvent networkGameEvent = new MockEvent();
 	/** */
 	public MockEvent acknowledgeInvalidEvent = new MockEvent();
+	/** */
+	public MockEvent1<File> loadFileEvent = new MockEvent1<File>();
 
 	@Override
 	public MockTablePanel getTablePanel() {
@@ -167,7 +171,7 @@ public class MockView implements IView {
 	}
 
 	@Override
-	public IEvent1<File> getLoadEvent() {
+	public IEvent getLoadEvent() {
 		return loadEvent;
 	}
 
@@ -247,13 +251,13 @@ public class MockView implements IView {
 	@Override
 	public void showLoadingError() {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	@Override
 	public void enableSave(boolean enable) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	@Override
@@ -264,23 +268,31 @@ public class MockView implements IView {
 	@Override
 	public void showSidePanel(boolean show) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	public void showQuitWarningPanel(boolean show) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	@Override
 	public IEvent getQuitEvent() {
-		// TODO Auto-generated method stub
-		return null;
+		return quitEvent;
 	}
 
 	@Override
 	public IQuitWarningPanel getQuitWarningPanel() {
+		return quitWarningPanel;
+	}
+
+	@Override
+	public IEvent1<File> getLoadFileEvent() {
+		return loadFileEvent;
+	}
+
+	@Override
+	public void load() {
 		// TODO Auto-generated method stub
-		return null;
 	}
 }