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

Fix some bugs concerning the display of invalid sets

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@511 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-06-20 15:11:51 +02:00
parent 0c3eb9a283
commit 843b37aa80
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/jrummikub/control/RoundControl.java
View file

@ -1,6 +1,6 @@
package jrummikub.control; package jrummikub.control;
import static jrummikub.model.PlayerSettings.Type.HUMAN; import static jrummikub.model.PlayerSettings.Type.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -301,12 +301,15 @@ public class RoundControl {
if (lastTurnNotEnoughPoints) { if (lastTurnNotEnoughPoints) {
view.setInitialMeldError(roundState.getGameSettings() view.setInitialMeldError(roundState.getGameSettings()
.getInitialMeldThreshold()); .getInitialMeldThreshold());
view.getTablePanel().setStoneSets(newTable);
view.setInvalidStoneSets(tableSetDifference(oldTable, newTable)); view.setInvalidStoneSets(tableSetDifference(oldTable, newTable));
} else if (lastTurnMeldError) { } else if (lastTurnMeldError) {
view.setInitialMeldFirstError(); view.setInitialMeldFirstError();
view.getTablePanel().setStoneSets(newTable);
view.setInvalidStoneSets(touchedStoneSets(oldHand, oldTable, newTable)); view.setInvalidStoneSets(touchedStoneSets(oldHand, oldTable, newTable));
} else { } else {
view.setStoneCollectionHidden(true); view.setStoneCollectionHidden(true);
view.getTablePanel().setStoneSets(newTable);
view.setInvalidStoneSets(invalidStoneSets(newTable)); view.setInvalidStoneSets(invalidStoneSets(newTable));
} }
} }

2
src/jrummikub/model/StoneTray.java
View file

@ -198,7 +198,7 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
@Override @Override
public boolean contains(E object) { public boolean contains(E object) {
return objects.containsKey(objects); return objects.get(object) != null;
} }
@Override @Override