diff options
Diffstat (limited to 'src/jrummikub/model/Hand.java')
| -rw-r--r-- | src/jrummikub/model/Hand.java | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/jrummikub/model/Hand.java b/src/jrummikub/model/Hand.java index 812a4e4..681241a 100644 --- a/src/jrummikub/model/Hand.java +++ b/src/jrummikub/model/Hand.java @@ -1,7 +1,6 @@ package jrummikub.model; -import static jrummikub.model.StoneTray.Direction.LEFT; -import static jrummikub.model.StoneTray.Direction.RIGHT; +import static jrummikub.model.StoneTray.Direction.*; import java.util.ArrayList; import java.util.Iterator; @@ -13,6 +12,8 @@ import jrummikub.util.Pair; /** Class managing a {@link Player}'s {@link Stone}s */ public class Hand extends StoneTray<Stone> implements IHand { + private static final long serialVersionUID = 192210056255744909L; + /** * The width of the hand */ @@ -43,8 +44,8 @@ public class Hand extends StoneTray<Stone> implements IHand { } @Override - protected Pair<Position, Direction> fixInvalidDrop(Stone stone, - Position pos, Direction dir) { + protected Pair<Position, Direction> fixInvalidDrop(Stone stone, Position pos, + Direction dir) { double x = pos.getX(); double y = pos.getY(); @@ -55,11 +56,9 @@ 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); } } } @@ -85,8 +84,7 @@ 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()); } @@ -104,8 +102,7 @@ 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()); } |