From 843b37aa801c8627f8dd3ffcbe234153d8eebc84 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 20 Jun 2011 15:11:51 +0200 Subject: Fix some bugs concerning the display of invalid sets git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@511 72836036-5685-4462-b002-a69064685172 --- src/jrummikub/control/RoundControl.java | 5 ++++- src/jrummikub/model/StoneTray.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/jrummikub/control/RoundControl.java b/src/jrummikub/control/RoundControl.java index 63ec1a2..778c3d0 100644 --- a/src/jrummikub/control/RoundControl.java +++ b/src/jrummikub/control/RoundControl.java @@ -1,6 +1,6 @@ package jrummikub.control; -import static jrummikub.model.PlayerSettings.Type.HUMAN; +import static jrummikub.model.PlayerSettings.Type.*; import java.util.ArrayList; import java.util.Collections; @@ -301,12 +301,15 @@ public class RoundControl { if (lastTurnNotEnoughPoints) { view.setInitialMeldError(roundState.getGameSettings() .getInitialMeldThreshold()); + view.getTablePanel().setStoneSets(newTable); view.setInvalidStoneSets(tableSetDifference(oldTable, newTable)); } else if (lastTurnMeldError) { view.setInitialMeldFirstError(); + view.getTablePanel().setStoneSets(newTable); view.setInvalidStoneSets(touchedStoneSets(oldHand, oldTable, newTable)); } else { view.setStoneCollectionHidden(true); + view.getTablePanel().setStoneSets(newTable); view.setInvalidStoneSets(invalidStoneSets(newTable)); } } diff --git a/src/jrummikub/model/StoneTray.java b/src/jrummikub/model/StoneTray.java index 9148934..a5f023d 100644 --- a/src/jrummikub/model/StoneTray.java +++ b/src/jrummikub/model/StoneTray.java @@ -198,7 +198,7 @@ public class StoneTray implements IStoneTray { @Override public boolean contains(E object) { - return objects.containsKey(objects); + return objects.get(object) != null; } @Override -- cgit v1.2.3