From 479384d6bfeea0c225af829cbc1cac730d87c844 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 19 Jun 2011 00:14:27 +0200
Subject: Correctly show invalid sets

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@471 72836036-5685-4462-b002-a69064685172
---
 src/jrummikub/model/IStoneTray.java |  2 ++
 src/jrummikub/model/StoneTray.java  | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/jrummikub/model')

diff --git a/src/jrummikub/model/IStoneTray.java b/src/jrummikub/model/IStoneTray.java
index d411c9e..437ecda 100644
--- a/src/jrummikub/model/IStoneTray.java
+++ b/src/jrummikub/model/IStoneTray.java
@@ -55,4 +55,6 @@ public interface IStoneTray<E extends Sizeable> extends
 	 */
 	public int getSize();
 
+	public boolean contains(E object);
+
 }
\ No newline at end of file
diff --git a/src/jrummikub/model/StoneTray.java b/src/jrummikub/model/StoneTray.java
index aaedaad..9148934 100644
--- a/src/jrummikub/model/StoneTray.java
+++ b/src/jrummikub/model/StoneTray.java
@@ -189,7 +189,16 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
 	 */
 	@Override
 	public Position getPosition(E object) {
-		return objects.get(object).getSecond();
+		Pair<E, Position> entry = objects.get(object);
+		if (entry == null) {
+			return null;
+		}
+		return entry.getSecond();
+	}
+
+	@Override
+	public boolean contains(E object) {
+		return objects.containsKey(objects);
 	}
 
 	@Override
-- 
cgit v1.2.3