Remove return value of Table.pickUpStone()

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

2 files changed, 9 insertions, 14 deletions

diff --git a/src/jrummikub/model/ITable.java b/src/jrummikub/model/ITable.java
index 3b0032f..49db963 100644
--- a/src/jrummikub/model/ITable.java
+++ b/src/jrummikub/model/ITable.java
@@ -1,7 +1,5 @@
 package jrummikub.model;

 

-import jrummikub.util.Pair;

-

 /**

  * Interface for the {@link Table} model

  */

@@ -11,10 +9,9 @@ public interface ITable extends IStoneTray<StoneSet> {
 	 * Removes {@link Stone} from the Table

 	 * 

 	 * @param stone

-	 *            stone to pick up

-	 * @return the stone sets that are created by taking pickung the the stone

+	 *          stone to pick up

 	 */

-	public Pair<StoneSet, StoneSet> pickUpStone(Stone stone);

+	public void pickUpStone(Stone stone);

 

 	/**

 	 * Tests the Table for rule conflicts by checking all the {@link StoneSet}

@@ -25,7 +22,9 @@ public interface ITable extends IStoneTray<StoneSet> {
 

 	/**

 	 * Finds the {@link StoneSet} containing the given {@link Stone}

-	 * @param stone stone whose set we're searching

+	 * 

+	 * @param stone

+	 *          stone whose set we're searching

 	 * @return the set containing the stone or null if no set was found

 	 */

 	StoneSet findStoneSet(Stone stone);

diff --git a/src/jrummikub/model/Table.java b/src/jrummikub/model/Table.java
index 4c84193..f134975 100644
--- a/src/jrummikub/model/Table.java
+++ b/src/jrummikub/model/Table.java
@@ -25,14 +25,12 @@ public class Table extends StoneTray<StoneSet> implements ITable {
 	 *          stone to pick up
 	 */
 	@Override
-	public Pair<StoneSet, StoneSet> pickUpStone(Stone stone) {
+	public void pickUpStone(Stone stone) {
 		StoneInfo info = findStoneInfo(stone);
 
-		if (info == null) {
-			return null;
+		if (info != null) {
+			splitSet(info.set, info.setPosition, info.stonePosition);
 		}
-
-		return splitSet(info.set, info.setPosition, info.stonePosition);
 	}
 
 	private StoneInfo findStoneInfo(Stone stone) {
@@ -71,7 +69,7 @@ public class Table extends StoneTray<StoneSet> implements ITable {
 		return info.set;
 	}
 
-	private Pair<StoneSet, StoneSet> splitSet(StoneSet set, Position setPosition,
+	private void splitSet(StoneSet set, Position setPosition,
 			int stonePosition) {
 		pickUp(set);
 
@@ -101,8 +99,6 @@ public class Table extends StoneTray<StoneSet> implements ITable {
 				drop(leftSet.join(rightSet), newPosition);
 			}
 		}
-
-		return new Pair<StoneSet, StoneSet>(leftSet, rightSet);
 	}
 
 	/** Tests the Table for rule conflicts by checking all the {@link StoneSet} */