summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/JRummikub.java
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-04-30 21:16:42 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-04-30 21:16:42 +0200
commit482d7e7f86ed0343c0a4102562a82bd65dd52f37 (patch)
treebb5fb7ef9f84e4165b2b6eb956ce098139ac5eca /src/jrummikub/JRummikub.java
parentf9b396875add92f9cfc64ee74c82d3275e4d7dd6 (diff)
downloadJRummikub-482d7e7f86ed0343c0a4102562a82bd65dd52f37.tar
JRummikub-482d7e7f86ed0343c0a4102562a82bd65dd52f37.zip
Paint stones on table
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@32 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/JRummikub.java')
-rw-r--r--src/jrummikub/JRummikub.java21
1 files changed, 20 insertions, 1 deletions
diff --git a/src/jrummikub/JRummikub.java b/src/jrummikub/JRummikub.java
index 1990fda..e4820bc 100644
--- a/src/jrummikub/JRummikub.java
+++ b/src/jrummikub/JRummikub.java
@@ -1,6 +1,8 @@
package jrummikub;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import javax.swing.UIManager;
@@ -8,6 +10,7 @@ import javax.swing.UIManager;
import jrummikub.model.Position;
import jrummikub.model.Stone;
import jrummikub.model.StoneColor;
+import jrummikub.model.StoneSet;
import jrummikub.util.IListener;
import jrummikub.util.IListener1;
import jrummikub.view.IView;
@@ -49,6 +52,7 @@ public class JRummikub {
System.out.println("'End turn' fired");
}});
+ //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));
@@ -66,7 +70,22 @@ public class JRummikub {
System.out.println("Board clicked at "+value);
}});
-
+
+ //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));
+
+ List<Stone> stoneList = new ArrayList<Stone>();
+
+ stoneList.add(new Stone(7, StoneColor.BLACK, false));
+ stoneList.add(new Stone(8, StoneColor.BLACK, false));
+ stoneList.add(new Stone(9, StoneColor.BLACK, false));
+ stoneList.add(new Stone(10, StoneColor.BLACK, false));
+
+ stoneSets.put(new StoneSet(stoneList), new Position(3.5f, 4));
+
+ view.getTable().setStoneSets(stoneSets);
}