summaryrefslogtreecommitdiffstats
path: root/mock
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-06-07 21:51:20 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-06-07 21:51:20 +0200
commit8b763a817b21aff45d704940ad2e17799dc7bb43 (patch)
treedc797106eff544419b3be18df01e7335f3a1ffb0 /mock
parent244abb7e7320355d0c4aad4a7ba267f11d358563 (diff)
downloadJRummikub-8b763a817b21aff45d704940ad2e17799dc7bb43.tar
JRummikub-8b763a817b21aff45d704940ad2e17799dc7bb43.zip
Saving is working
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@382 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'mock')
-rw-r--r--mock/jrummikub/model/MockHand.java1
-rw-r--r--mock/jrummikub/model/MockPlayer.java1
-rw-r--r--mock/jrummikub/model/MockRoundState.java1
-rw-r--r--mock/jrummikub/model/MockTable.java1
-rw-r--r--mock/jrummikub/view/MockView.java21
5 files changed, 16 insertions, 9 deletions
diff --git a/mock/jrummikub/model/MockHand.java b/mock/jrummikub/model/MockHand.java
index ab949d0..13f6450 100644
--- a/mock/jrummikub/model/MockHand.java
+++ b/mock/jrummikub/model/MockHand.java
@@ -11,6 +11,7 @@ import jrummikub.util.Pair;
/**
* Mock class for {@link Hand}
*/
+@SuppressWarnings("serial")
public class MockHand implements IHand {
/** */
public List<Pair<Stone, Position>> stones = new ArrayList<Pair<Stone, Position>>();
diff --git a/mock/jrummikub/model/MockPlayer.java b/mock/jrummikub/model/MockPlayer.java
index 0f83528..f7baee8 100644
--- a/mock/jrummikub/model/MockPlayer.java
+++ b/mock/jrummikub/model/MockPlayer.java
@@ -3,6 +3,7 @@ package jrummikub.model;
/**
* Mock class for {@link Player}
*/
+@SuppressWarnings("serial")
public class MockPlayer implements IPlayer {
/** */
public IHand hand;
diff --git a/mock/jrummikub/model/MockRoundState.java b/mock/jrummikub/model/MockRoundState.java
index 3f64d53..c387396 100644
--- a/mock/jrummikub/model/MockRoundState.java
+++ b/mock/jrummikub/model/MockRoundState.java
@@ -7,6 +7,7 @@ import java.util.List;
/**
* Mock class for {@link RoundState}
*/
+@SuppressWarnings("serial")
public class MockRoundState implements IRoundState {
/** */
public MockTable table;
diff --git a/mock/jrummikub/model/MockTable.java b/mock/jrummikub/model/MockTable.java
index b077b7f..295321c 100644
--- a/mock/jrummikub/model/MockTable.java
+++ b/mock/jrummikub/model/MockTable.java
@@ -11,6 +11,7 @@ import jrummikub.util.Pair;
/**
* Mock class for {@link Table}
*/
+@SuppressWarnings("serial")
public class MockTable implements ITable {
/** */
public Map<Stone, StoneSet> findStoneSet = new HashMap<Stone, StoneSet>();
diff --git a/mock/jrummikub/view/MockView.java b/mock/jrummikub/view/MockView.java
index 044e52f..80240a9 100644
--- a/mock/jrummikub/view/MockView.java
+++ b/mock/jrummikub/view/MockView.java
@@ -1,11 +1,14 @@
package jrummikub.view;
import java.awt.Color;
+import java.io.File;
import java.util.Collection;
import jrummikub.model.Stone;
import jrummikub.util.IEvent;
+import jrummikub.util.IEvent1;
import jrummikub.util.MockEvent;
+import jrummikub.util.MockEvent1;
/**
* Mock class for View
@@ -41,11 +44,11 @@ public class MockView implements IView {
/** */
public MockEvent menuNewGameEvent = new MockEvent();
/** */
- public MockEvent menuLoadEvent = new MockEvent();
+ public MockEvent menuQuitEvent = new MockEvent();
/** */
- public MockEvent menuSaveEvent = new MockEvent();
+ public MockEvent1<File> loadEvent = new MockEvent1<File>();
/** */
- public MockEvent menuQuitEvent = new MockEvent();
+ public MockEvent1<File> saveEvent = new MockEvent1<File>();
@Override
public MockTablePanel getTablePanel() {
@@ -137,17 +140,17 @@ public class MockView implements IView {
}
@Override
- public IEvent getMenuLoadEvent() {
- return menuLoadEvent;
+ public IEvent getMenuQuitEvent() {
+ return menuQuitEvent;
}
@Override
- public IEvent getMenuSaveEvent() {
- return menuSaveEvent;
+ public IEvent1<File> getLoadEvent() {
+ return loadEvent;
}
@Override
- public IEvent getMenuQuitEvent() {
- return menuQuitEvent;
+ public IEvent1<File> getSaveEvent() {
+ return saveEvent;
}
}