summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/model
diff options
context:
space:
mode:
authorJannis Harder <harder@informatik.uni-luebeck.de>2011-05-10 01:39:32 +0200
committerJannis Harder <harder@informatik.uni-luebeck.de>2011-05-10 01:39:32 +0200
commitce982fcdaf1a15981419e7a88802bc225795e6a4 (patch)
treec473605663a262ab507cb9f02cc62f304df02266 /src/jrummikub/model
parent56b75e037ab2061d1f7462d2f71a83ca5a9353b6 (diff)
downloadJRummikub-ce982fcdaf1a15981419e7a88802bc225795e6a4.tar
JRummikub-ce982fcdaf1a15981419e7a88802bc225795e6a4.zip
Tests for dropping on hand
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@206 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/model')
-rw-r--r--src/jrummikub/model/IStoneTray.java2
-rw-r--r--src/jrummikub/model/StoneTray.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/jrummikub/model/IStoneTray.java b/src/jrummikub/model/IStoneTray.java
index bdf7f86..11fcbbb 100644
--- a/src/jrummikub/model/IStoneTray.java
+++ b/src/jrummikub/model/IStoneTray.java
@@ -33,7 +33,7 @@ public interface IStoneTray<E extends Sizeable> extends
*/
public Position getPosition(E object);
- public void pickUp(E object);
+ public boolean pickUp(E object);
public IStoneTray<E> clone();
diff --git a/src/jrummikub/model/StoneTray.java b/src/jrummikub/model/StoneTray.java
index 8b83371..3418aec 100644
--- a/src/jrummikub/model/StoneTray.java
+++ b/src/jrummikub/model/StoneTray.java
@@ -217,8 +217,8 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
* @see jrummikub.model.IStoneTray#pickUp(E)
*/
@Override
- public void pickUp(E object) {
- objects.remove(object);
+ public boolean pickUp(E object) {
+ return null != objects.remove(object);
}
/*