Rechtschreibfehler und überflüssige pickUp(position) Klasse gefixt

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

7 files changed, 27 insertions, 85 deletions

diff --git a/mock/jrummikub/model/MockHand.java b/mock/jrummikub/model/MockHand.java
index dc348c0..d262c87 100644
--- a/mock/jrummikub/model/MockHand.java
+++ b/mock/jrummikub/model/MockHand.java
@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Set;
 
 import jrummikub.util.Pair;
+
 /**
  * Mock class for {@link Hand}
  */
@@ -14,16 +15,11 @@ public class MockHand implements IHand {
 	/** */
 	public List<Pair<Stone, Position>> stones = new ArrayList<Pair<Stone, Position>>();
 	/** */
-	public Set<Stone> pickups = new HashSet<Stone>(); 
+	public Set<Stone> pickups = new HashSet<Stone>();
 	/** */
 	public Iterable<Pair<Stone, Position>> iterable;
 
 	@Override
-	public Stone pickUp(Position position) {
-		return null;
-	}
-
-	@Override
 	public void drop(Stone object, Position position) {
 		stones.add(new Pair<Stone, Position>(object, position));
 	}
@@ -36,7 +32,8 @@ public class MockHand implements IHand {
 
 	@Override
 	public boolean pickUp(Stone object) {
-		List<Pair<Stone, Position>> itList = new ArrayList<Pair<Stone, Position>>(stones);
+		List<Pair<Stone, Position>> itList = new ArrayList<Pair<Stone, Position>>(
+				stones);
 		for (Pair<Stone, Position> entry : itList) {
 			if (entry.getFirst() == object) {
 				stones.remove(entry);
diff --git a/mock/jrummikub/model/MockTable.java b/mock/jrummikub/model/MockTable.java
index 0ff041e..39535ec 100644
--- a/mock/jrummikub/model/MockTable.java
+++ b/mock/jrummikub/model/MockTable.java
@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import jrummikub.util.Pair;
+
 /**
  * Mock class for {@link Table}
  */
@@ -32,12 +33,6 @@ public class MockTable implements ITable {
 	}
 
 	@Override
-	public StoneSet pickUp(Position position) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
 	public void drop(StoneSet object, Position position) {
 		sets.add(new Pair<StoneSet, Position>(object, position));
 	}
diff --git a/src/jrummikub/model/GameState.java b/src/jrummikub/model/GameState.java
index 69c5570..5861a32 100644
--- a/src/jrummikub/model/GameState.java
+++ b/src/jrummikub/model/GameState.java
@@ -12,7 +12,7 @@ public class GameState implements IGameState {
 	private StoneHeap gameHeap;
 
 	/** 
-	 * Create a new GameState with an empty table and (currntly) 4 new players.
+	 * Create a new GameState with an empty table and (currently) 4 new players.
 	 */
 	public GameState() {
 		table = new Table();
diff --git a/src/jrummikub/model/IStoneTray.java b/src/jrummikub/model/IStoneTray.java
index c1ed05d..f9c9d88 100644
--- a/src/jrummikub/model/IStoneTray.java
+++ b/src/jrummikub/model/IStoneTray.java
@@ -12,15 +12,6 @@ public interface IStoneTray<E extends Sizeable> extends
 		Iterable<Pair<E, Position>>, Cloneable {

 

 	/**

-	 * Removes object from tray and returns it

-	 * 

-	 * @param position

-	 *            position of the object that will be removed

-	 * @return the picked up stone

-	 */

-	public E pickUp(Position position);

-

-	/**

 	 * Adds object to the tray

 	 * 

 	 * @param object

diff --git a/src/jrummikub/model/StoneHeap.java b/src/jrummikub/model/StoneHeap.java
index d9d754f..c013570 100644
--- a/src/jrummikub/model/StoneHeap.java
+++ b/src/jrummikub/model/StoneHeap.java
@@ -13,7 +13,7 @@ import java.util.Random;
 
 public class StoneHeap {
 	List<Stone> heap;
-	Random generator = new Random();
+	private Random generator = new Random();
 
 	/** Creates 106 Stones according to standard rules */
 	public StoneHeap() {
diff --git a/src/jrummikub/model/StoneTray.java b/src/jrummikub/model/StoneTray.java
index b9902e8..66b0be3 100644
--- a/src/jrummikub/model/StoneTray.java
+++ b/src/jrummikub/model/StoneTray.java
@@ -11,7 +11,7 @@ import jrummikub.util.Pair;
  * or {@link StoneSet}s.
  * 
  * @param <E>
- *          Type of positioned objects (must implement Sizeable)
+ *            Type of positioned objects (must implement Sizeable)
  */
 public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
 	protected HashMap<E, Pair<E, Position>> objects = new HashMap<E, Pair<E, Position>>();
@@ -23,31 +23,6 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
 	}
 
 	@Override
-	public E pickUp(Position position) {
-		for (Map.Entry<E, Pair<E, Position>> i : objects.entrySet()) {
-			Position currentPosition = i.getValue().getSecond();
-			E currentObject = i.getKey();
-			// Tests if position is left of, above ... the current object
-			if (position.getX() < currentPosition.getX()) {
-				continue;
-			}
-			if (position.getY() < currentPosition.getY()) {
-				continue;
-			}
-			if (position.getX() > currentPosition.getX() + currentObject.getWidth()) {
-				continue;
-			}
-			if (position.getY() > currentPosition.getY() + currentObject.getHeight()) {
-				continue;
-			}
-			// Position is inside the current object
-			objects.remove(i.getKey());
-			return currentObject;
-		}
-		return null;
-	}
-
-	@Override
 	public void drop(E object, Position position) {
 		if (object != null) {
 			drop(object, position, null);
@@ -75,7 +50,8 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
 			if (currentObject == object)
 				continue;
 			Position currentPosition = getPosition(currentObject);
-			if (!objectsOverlap(object, position, currentObject, currentPosition)) {
+			if (!objectsOverlap(object, position, currentObject,
+					currentPosition)) {
 				continue;
 			}
 			// Object would be placed inside the current object
@@ -86,16 +62,16 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
 			// Move object to avoid overlap
 			switch (newDirection) {
 			case TOP:
-				newPosition = new Position(currentPosition.getX(), position.getY()
-						- currentObject.getHeight());
+				newPosition = new Position(currentPosition.getX(),
+						position.getY() - currentObject.getHeight());
 				break;
 			case BOTTOM:
-				newPosition = new Position(currentPosition.getX(), position.getY()
-						+ object.getHeight());
+				newPosition = new Position(currentPosition.getX(),
+						position.getY() + object.getHeight());
 				break;
 			case LEFT:
-				newPosition = new Position(position.getX() - currentObject.getWidth(),
-						currentPosition.getY());
+				newPosition = new Position(position.getX()
+						- currentObject.getWidth(), currentPosition.getY());
 				break;
 			case RIGHT:
 				newPosition = new Position(position.getX() + object.getWidth(),
@@ -109,14 +85,14 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
 	}
 
 	/**
-	 * Checks whether the object may be placed on the given position, computes new
-	 * position if not
+	 * Checks whether the object may be placed on the given position, computes
+	 * new position if not
 	 * 
 	 * @param object
-	 *          to be dropped
+	 *            to be dropped
 	 * @param dir
 	 * @param p
-	 *          the object is dropped at
+	 *            the object is dropped at
 	 * @return null if the drop is valid, new position otherwise
 	 */
 	protected Pair<Position, Direction> fixInvalidDrop(E object, Position pos,
@@ -173,13 +149,15 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
 		float blockingRight = blocking.getSecond().getX()
 				+ blocking.getFirst().getWidth();
 		float overlapRight = Math.min(objectRight, blockingRight);
-		float overlapLeft = Math.max(position.getX(), blocking.getSecond().getX());
+		float overlapLeft = Math.max(position.getX(), blocking.getSecond()
+				.getX());
 		float overlapX = overlapRight - overlapLeft;
 		float objectBottom = position.getY() + object.getHeight();
 		float blockingBottom = blocking.getSecond().getY()
 				+ blocking.getFirst().getHeight();
 		float overlapBottom = Math.min(objectBottom, blockingBottom);
-		float overlapTop = Math.max(position.getY(), blocking.getSecond().getY());
+		float overlapTop = Math.max(position.getY(), blocking.getSecond()
+				.getY());
 		float overlapY = overlapBottom - overlapTop;
 		// vertical or horizontal Shift
 		// TODO magic factor
diff --git a/test/jrummikub/model/StoneTrayTest.java b/test/jrummikub/model/StoneTrayTest.java
index 84fc799..1ffcb8f 100644
--- a/test/jrummikub/model/StoneTrayTest.java
+++ b/test/jrummikub/model/StoneTrayTest.java
@@ -7,8 +7,9 @@ import jrummikub.util.Pair;
 
 import org.junit.*;
 import static org.junit.Assert.*;
+
 /**
- * Tests for {@link StoneTray} 
+ * Tests for {@link StoneTray}
  */
 public class StoneTrayTest {
 	class Thing implements Sizeable {
@@ -32,6 +33,7 @@ public class StoneTrayTest {
 	}
 
 	private StoneTray<Thing> testTray;
+
 	/** */
 	@Before
 	public void createTray() {
@@ -148,15 +150,6 @@ public class StoneTrayTest {
 
 	/** */
 	@Test
-	public void testWrongPickUp() {
-		Thing firstThing = new Thing(5, 5);
-		testTray.drop(firstThing, new Position(0, 0));
-		Position testPosition = new Position(-2, -2);
-		assertNull(testTray.pickUp(testPosition));
-	}
-
-	/** */
-	@Test
 	public void testPickUpByObject() {
 		Thing firstThing = new Thing(5, 5);
 		testTray.drop(firstThing, new Position(0, 0));
@@ -171,18 +164,6 @@ public class StoneTrayTest {
 
 	/** */
 	@Test
-	public void testRightPickUp() {
-		Thing firstThing = new Thing(5, 5);
-		testTray.drop(firstThing, new Position(0, 0));
-		Thing secondThing = new Thing(3, 3);
-		testTray.drop(secondThing, new Position(-5, -5));
-		Position testPosition = new Position(3, 3);
-		assertSame(testTray.pickUp(testPosition), firstThing);
-		assertNull(testTray.pickUp(testPosition));
-	}
-
-	/** */
-	@Test
 	public void testIterate() {
 		List<Thing> testThings = new ArrayList<Thing>();
 		List<Position> testPositions = new ArrayList<Position>();