summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/model/Hand.java
diff options
context:
space:
mode:
authorIda Massow <massow@informatik.uni-luebeck.de>2011-06-06 19:53:45 +0200
committerIda Massow <massow@informatik.uni-luebeck.de>2011-06-06 19:53:45 +0200
commit682357b5841f7853212e354199d1a46589663364 (patch)
tree7a383625543dbfdedf297a97c927a518a38b30d3 /src/jrummikub/model/Hand.java
parent41786cb8423167fe5488931c695404f2b38b19f9 (diff)
downloadJRummikub-682357b5841f7853212e354199d1a46589663364.tar
JRummikub-682357b5841f7853212e354199d1a46589663364.zip
Double ist das neue float
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@377 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/model/Hand.java')
-rw-r--r--src/jrummikub/model/Hand.java20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/jrummikub/model/Hand.java b/src/jrummikub/model/Hand.java
index b6d9eb4..812a4e4 100644
--- a/src/jrummikub/model/Hand.java
+++ b/src/jrummikub/model/Hand.java
@@ -43,10 +43,10 @@ public class Hand extends StoneTray<Stone> implements IHand {
}
@Override
- protected Pair<Position, Direction> fixInvalidDrop(Stone stone, Position pos,
- Direction dir) {
- float x = pos.getX();
- float y = pos.getY();
+ protected Pair<Position, Direction> fixInvalidDrop(Stone stone,
+ Position pos, Direction dir) {
+ double x = pos.getX();
+ double y = pos.getY();
if (x >= 0 && x <= WIDTH - 1) {
return null;
@@ -55,9 +55,11 @@ public class Hand extends StoneTray<Stone> implements IHand {
return new Pair<Position, Direction>(new Position(0, y), RIGHT);
} else {
if (getFreeRowSpace((int) y) == 0) {
- return new Pair<Position, Direction>(new Position(0, y + 1), RIGHT);
+ return new Pair<Position, Direction>(new Position(0, y + 1),
+ RIGHT);
} else {
- return new Pair<Position, Direction>(new Position(WIDTH - 1, y), LEFT);
+ return new Pair<Position, Direction>(
+ new Position(WIDTH - 1, y), LEFT);
}
}
}
@@ -83,7 +85,8 @@ public class Hand extends StoneTray<Stone> implements IHand {
List<Stone> stones = new ArrayList<Stone>();
- for (Iterator<Pair<Stone, Position>> iter = this.iterator(); iter.hasNext();) {
+ for (Iterator<Pair<Stone, Position>> iter = this.iterator(); iter
+ .hasNext();) {
stones.add(iter.next().getFirst());
}
@@ -101,7 +104,8 @@ public class Hand extends StoneTray<Stone> implements IHand {
public int getIdenticalStoneCount() {
List<Stone> stones = new ArrayList<Stone>();
- for (Iterator<Pair<Stone, Position>> iter = this.iterator(); iter.hasNext();) {
+ for (Iterator<Pair<Stone, Position>> iter = this.iterator(); iter
+ .hasNext();) {
stones.add(iter.next().getFirst());
}