From 682357b5841f7853212e354199d1a46589663364 Mon Sep 17 00:00:00 2001 From: Ida Massow Date: Mon, 6 Jun 2011 19:53:45 +0200 Subject: Double ist das neue float git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@377 72836036-5685-4462-b002-a69064685172 --- src/jrummikub/model/Hand.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/jrummikub/model/Hand.java') 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 implements IHand { } @Override - protected Pair fixInvalidDrop(Stone stone, Position pos, - Direction dir) { - float x = pos.getX(); - float y = pos.getY(); + protected Pair 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 implements IHand { return new Pair(new Position(0, y), RIGHT); } else { if (getFreeRowSpace((int) y) == 0) { - return new Pair(new Position(0, y + 1), RIGHT); + return new Pair(new Position(0, y + 1), + RIGHT); } else { - return new Pair(new Position(WIDTH - 1, y), LEFT); + return new Pair( + new Position(WIDTH - 1, y), LEFT); } } } @@ -83,7 +85,8 @@ public class Hand extends StoneTray implements IHand { List stones = new ArrayList(); - for (Iterator> iter = this.iterator(); iter.hasNext();) { + for (Iterator> iter = this.iterator(); iter + .hasNext();) { stones.add(iter.next().getFirst()); } @@ -101,7 +104,8 @@ public class Hand extends StoneTray implements IHand { public int getIdenticalStoneCount() { List stones = new ArrayList(); - for (Iterator> iter = this.iterator(); iter.hasNext();) { + for (Iterator> iter = this.iterator(); iter + .hasNext();) { stones.add(iter.next().getFirst()); } -- cgit v1.2.3