neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@227 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-05-10 16:31:09 +02:00
parent cdd0949db3
commit 982c2e6e2b
7 changed files with 27 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mock/jrummikub/model/MockHand.java
View file

@ -7,6 +7,7 @@ import java.util.List;
import java.util.Set;
import jrummikub.util.Pair;
/**
* Mock class for {@link Hand}
*/
@ -18,11 +19,6 @@ public class MockHand implements IHand {
/** */
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);

7
mock/jrummikub/model/MockTable.java
View file

@ -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<StoneSet, Position>(object, position));

2
src/jrummikub/model/GameState.java
View file

@ -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();

9
src/jrummikub/model/IStoneTray.java
View file

@ -11,15 +11,6 @@ import jrummikub.util.Pair;
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
*

2
src/jrummikub/model/StoneHeap.java
View file

@ -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() {

56
src/jrummikub/model/StoneTray.java
View file

@ -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>>();
@ -22,31 +22,6 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
LEFT, RIGHT, TOP, BOTTOM;
}
@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) {
@ -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

23
test/jrummikub/model/StoneTrayTest.java
View file

@ -7,6 +7,7 @@ import jrummikub.util.Pair;
import org.junit.*;
import static org.junit.Assert.*;
/**
* Tests for {@link StoneTray}
*/
@ -32,6 +33,7 @@ public class StoneTrayTest {
}
private StoneTray<Thing> 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() {