diff options
Diffstat (limited to 'src/jrummikub/view/impl/AbstractStonePanel.java')
| -rw-r--r-- | src/jrummikub/view/impl/AbstractStonePanel.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/jrummikub/view/impl/AbstractStonePanel.java b/src/jrummikub/view/impl/AbstractStonePanel.java index e858662..0c64305 100644 --- a/src/jrummikub/view/impl/AbstractStonePanel.java +++ b/src/jrummikub/view/impl/AbstractStonePanel.java @@ -5,7 +5,6 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.geom.Rectangle2D; import java.util.Collections; -import java.util.Map; import javax.swing.JPanel; @@ -30,7 +29,7 @@ abstract class AbstractStonePanel extends JPanel implements IStonePanel, private Event2<Stone, Boolean> rangeClickEvent = new Event2<Stone, Boolean>(); private Event2<Stone, Boolean> setClickEvent = new Event2<Stone, Boolean>(); - private Map<Stone, Position> stones = Collections.emptyMap(); + private Iterable<Pair<Stone, Position>> stones = Collections.emptySet(); /** * @return the stone painter @@ -98,9 +97,9 @@ abstract class AbstractStonePanel extends JPanel implements IStonePanel, } private Stone getStoneAt(Position pos) { - for (Map.Entry<Stone, Position> entry : stones.entrySet()) { - Stone stone = entry.getKey(); - Position p = entry.getValue(); + for (Pair<Stone, Position> entry : stones) { + Stone stone = entry.getFirst(); + Position p = entry.getSecond(); Rectangle2D rect = new Rectangle2D.Float(p.getX(), p.getY(), 1, 1); if (rect.contains(pos.getX(), pos.getY())) @@ -116,7 +115,7 @@ abstract class AbstractStonePanel extends JPanel implements IStonePanel, * @param stones * the stones and positions */ - protected void setStones(Map<Stone, Position> stones) { + protected void setStones(Iterable<Pair<Stone, Position>> stones) { this.stones = stones; } @@ -134,7 +133,7 @@ abstract class AbstractStonePanel extends JPanel implements IStonePanel, * * @return the stones */ - protected Map<Stone, Position> getStones() { + protected Iterable<Pair<Stone, Position>> getStones() { return stones; } |