summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/jrummikub/JRummikub.java24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/jrummikub/JRummikub.java b/src/jrummikub/JRummikub.java
index cf0c73f..7d3ee28 100644
--- a/src/jrummikub/JRummikub.java
+++ b/src/jrummikub/JRummikub.java
@@ -58,14 +58,14 @@ public class JRummikub {
// stones on the board
Map<Stone, Position> stones = new HashMap<Stone, Position>();
- stones.put(new Stone(1, StoneColor.ORANGE, false), new Position(0, 0));
- stones.put(new Stone(10, StoneColor.BLUE, false), new Position(1, 0));
- stones.put(new Stone(9, StoneColor.RED, false), new Position(0.5f, 1));
- stones.put(new Stone(7, StoneColor.BLACK, false), new Position(1.75f, 1));
+ stones.put(new Stone(1, StoneColor.ORANGE), new Position(0, 0));
+ stones.put(new Stone(10, StoneColor.BLUE), new Position(1, 0));
+ stones.put(new Stone(9, StoneColor.RED), new Position(0.5f, 1));
+ stones.put(new Stone(7, StoneColor.BLACK), new Position(1.75f, 1));
- Stone stoneJoker = new Stone(0, StoneColor.RED, true);
+ Stone stoneJoker = new Stone(StoneColor.RED);
stones.put(stoneJoker, new Position(2.5f, 0));
- stones.put(new Stone(0, StoneColor.BLACK, true), new Position(3.5f, 0));
+ stones.put(new Stone(StoneColor.BLACK), new Position(3.5f, 0));
view.getPlayerPanel().getBoard().setStones(stones);
@@ -154,16 +154,16 @@ public class JRummikub {
// stoneSets on the table
Map<StoneSet, Position> stoneSets = new HashMap<StoneSet, Position>();
- stoneSets.put(new StoneSet(new Stone(5, StoneColor.ORANGE, false)),
- new Position(0.5f, 1));
+ stoneSets.put(new StoneSet(new Stone(5, StoneColor.ORANGE)), new Position(
+ 0.5f, 1));
List<Stone> stoneList = new ArrayList<Stone>();
- stoneList.add(new Stone(7, StoneColor.BLACK, false));
- Stone stone8 = new Stone(8, StoneColor.BLACK, false);
+ stoneList.add(new Stone(7, StoneColor.BLACK));
+ Stone stone8 = new Stone(8, StoneColor.BLACK);
stoneList.add(stone8);
- stoneList.add(new Stone(9, StoneColor.BLACK, false));
- stoneList.add(new Stone(10, StoneColor.BLACK, false));
+ stoneList.add(new Stone(9, StoneColor.BLACK));
+ stoneList.add(new Stone(10, StoneColor.BLACK));
stoneSets.put(new StoneSet(stoneList), new Position(3.5f, 4));