diff options
author | Jannis Harder <harder@informatik.uni-luebeck.de> | 2011-05-03 17:13:12 +0200 |
---|---|---|
committer | Jannis Harder <harder@informatik.uni-luebeck.de> | 2011-05-03 17:13:12 +0200 |
commit | 7edb66d4ff069a40471258a66ef56dac36598665 (patch) | |
tree | 5ecc06ec6c15c25f3aa3c9b3c7204034bb9331bd | |
parent | 2b09ff6ec52037f73060849b6627a8cda53e7ea0 (diff) | |
download | JRummikub-7edb66d4ff069a40471258a66ef56dac36598665.tar JRummikub-7edb66d4ff069a40471258a66ef56dac36598665.zip |
Removed deprecated Stone constructor
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@79 72836036-5685-4462-b002-a69064685172
-rw-r--r-- | src/jrummikub/model/Stone.java | 7 | ||||
-rw-r--r-- | test/jrummikub/model/StoneSetTest.java | 8 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/jrummikub/model/Stone.java b/src/jrummikub/model/Stone.java index 6c2fd54..da8052b 100644 --- a/src/jrummikub/model/Stone.java +++ b/src/jrummikub/model/Stone.java @@ -34,13 +34,6 @@ public class Stone implements Sizeable { this.joker = false; } - @Deprecated - public Stone(int value, StoneColor color, boolean joker) { - this.value = value; - this.color = color; - this.joker = joker; - } - /** * Returns the color of the stone. * diff --git a/test/jrummikub/model/StoneSetTest.java b/test/jrummikub/model/StoneSetTest.java index 1b4e062..196090e 100644 --- a/test/jrummikub/model/StoneSetTest.java +++ b/test/jrummikub/model/StoneSetTest.java @@ -123,9 +123,9 @@ public class StoneSetTest { private StoneSet createTestSet() { List<Stone> stones = new ArrayList<Stone>(); - stones.add(new Stone(1, BLUE, false)); - stones.add(new Stone(1, RED, false)); - stones.add(new Stone(1, BLACK, false)); + stones.add(new Stone(1, BLUE)); + stones.add(new Stone(1, RED)); + stones.add(new Stone(1, BLACK)); StoneSet testSet = new StoneSet(stones); return testSet; } @@ -134,7 +134,7 @@ public class StoneSetTest { @Test public void testJoin() { StoneSet testSet = createTestSet(); - StoneSet secondSet = new StoneSet(new Stone(2, BLUE, false)); + StoneSet secondSet = new StoneSet(new Stone(2, BLUE)); StoneSet joinedSet = testSet.join(secondSet); // Sets have right size assertEquals(4, joinedSet.size()); |