neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove return value of Table.pickUpStone()

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@229 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-05-10 16:53:44 +02:00
parent fa00c661d5
commit 85b5470c05
7 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/jrummikub/model/ITable.java
View file

@ -1,7 +1,5 @@
package jrummikub.model;
import jrummikub.util.Pair;
/**
* Interface for the {@link Table} model
*/
@ -11,10 +9,9 @@ public interface ITable extends IStoneTray<StoneSet> {
* Removes {@link Stone} from the Table
*
* @param stone
* stone to pick up
* @return the stone sets that are created by taking pickung the the stone
* stone to pick up
*/
public Pair<StoneSet, StoneSet> pickUpStone(Stone stone);
public void pickUpStone(Stone stone);
/**
* Tests the Table for rule conflicts by checking all the {@link StoneSet}
@ -25,7 +22,9 @@ public interface ITable extends IStoneTray<StoneSet> {
/**
* Finds the {@link StoneSet} containing the given {@link Stone}
* @param stone stone whose set we're searching
*
* @param stone
* stone whose set we're searching
* @return the set containing the stone or null if no set was found
*/
StoneSet findStoneSet(Stone stone);

12
src/jrummikub/model/Table.java
View file

@ -25,14 +25,12 @@ public class Table extends StoneTray<StoneSet> implements ITable {
* stone to pick up
*/
@Override
public Pair<StoneSet, StoneSet> pickUpStone(Stone stone) {
public void pickUpStone(Stone stone) {
StoneInfo info = findStoneInfo(stone);
if (info == null) {
return null;
if (info != null) {
splitSet(info.set, info.setPosition, info.stonePosition);
}
return splitSet(info.set, info.setPosition, info.stonePosition);
}
private StoneInfo findStoneInfo(Stone stone) {
@ -71,7 +69,7 @@ public class Table extends StoneTray<StoneSet> implements ITable {
return info.set;
}
private Pair<StoneSet, StoneSet> splitSet(StoneSet set, Position setPosition,
private void splitSet(StoneSet set, Position setPosition,
int stonePosition) {
pickUp(set);
@ -101,8 +99,6 @@ public class Table extends StoneTray<StoneSet> implements ITable {
drop(leftSet.join(rightSet), newPosition);
}
}
return new Pair<StoneSet, StoneSet>(leftSet, rightSet);
}
/** Tests the Table for rule conflicts by checking all the {@link StoneSet} */

2
src/jrummikub/view/impl/WinPanel.java
View file

@ -18,7 +18,7 @@ import jrummikub.util.IEvent;
* A panel that is displayed when a player has won
*/
@SuppressWarnings("serial")
public class WinPanel extends JPanel {
class WinPanel extends JPanel {
private final static int PANEL_INSET = 15;
private final static int PANEL_SEPARATOR = 10;
private final static float PANEL_FIRST_LINE_HEIGHT = 0.375f;