From 982c2e6e2baf20eace331c19f6aef91b29e3c773 Mon Sep 17 00:00:00 2001 From: Ida Massow Date: Tue, 10 May 2011 16:31:09 +0200 Subject: =?UTF-8?q?Rechtschreibfehler=20und=20=C3=BCberfl=C3=BCssige=20pic?= =?UTF-8?q?kUp(position)=20Klasse=20gefixt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@227 72836036-5685-4462-b002-a69064685172 --- mock/jrummikub/model/MockHand.java | 11 +++---- mock/jrummikub/model/MockTable.java | 7 +---- src/jrummikub/model/GameState.java | 2 +- src/jrummikub/model/IStoneTray.java | 9 ------ src/jrummikub/model/StoneHeap.java | 2 +- src/jrummikub/model/StoneTray.java | 56 ++++++++++----------------------- test/jrummikub/model/StoneTrayTest.java | 25 ++------------- 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,15 +15,10 @@ public class MockHand implements IHand { /** */ public List> stones = new ArrayList>(); /** */ - public Set pickups = new HashSet(); + public Set pickups = new HashSet(); /** */ public Iterable> iterable; - @Override - public Stone pickUp(Position position) { - return null; - } - @Override public void drop(Stone object, Position position) { stones.add(new Pair(object, position)); @@ -36,7 +32,8 @@ public class MockHand implements IHand { @Override public boolean pickUp(Stone object) { - List> itList = new ArrayList>(stones); + List> itList = new ArrayList>( + stones); for (Pair 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} */ @@ -31,12 +32,6 @@ public class MockTable implements ITable { return valid; } - @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(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 @@ -11,15 +11,6 @@ import jrummikub.util.Pair; public interface IStoneTray extends Iterable>, 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 * 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 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 - * Type of positioned objects (must implement Sizeable) + * Type of positioned objects (must implement Sizeable) */ public class StoneTray implements IStoneTray { protected HashMap> objects = new HashMap>(); @@ -22,31 +22,6 @@ public class StoneTray implements IStoneTray { LEFT, RIGHT, TOP, BOTTOM; } - @Override - public E pickUp(Position position) { - for (Map.Entry> 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) { @@ -75,7 +50,8 @@ public class StoneTray implements IStoneTray { 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 implements IStoneTray { // 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 implements IStoneTray { } /** - * 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 fixInvalidDrop(E object, Position pos, @@ -173,13 +149,15 @@ public class StoneTray implements IStoneTray { 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 testTray; + /** */ @Before public void createTray() { @@ -146,15 +148,6 @@ public class StoneTrayTest { assertEquals(1, thirdPosition.getY(), 0.00001); } - /** */ - @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() { @@ -169,18 +162,6 @@ public class StoneTrayTest { assertTrue(testTray.iterator().hasNext()); } - /** */ - @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() { -- cgit v1.2.3